Merge branch 'develop' of github.com:utPLSQL/utPLSQL into feature/introduce_testing_with_accurate_grants

lwasylow · lwasylow · commit 13f772a03fc8 · 2019-03-24T15:47:48.000Z
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-v3.1.5-develop
+v3.1.6-develop
diff --git a/development/releasing.md b/development/releasing.md
@@ -10,7 +10,10 @@ 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.
+   - 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
diff --git 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.6.2728--develop-blue.svg)
 
 ### utPLSQL v3 Major Contributors 
 
diff --git 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.6.2728--develop-blue.svg)
 
 # Version Information
 
diff --git 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.6.2728--develop-blue.svg)
 
 # utPLSQL Project Details
 
diff --git 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.6.2728--develop-blue.svg)
 
 # How to get support
 
diff --git 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.6.2728--develop-blue.svg)
 
 # Introduction to utPLSQL
 
diff --git 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.6.2728--develop-blue.svg)
 
 # Advanced data comparison
 
diff --git 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.6.2728--develop-blue.svg)
 
 # Annotations
 
diff --git 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.6.2728--develop-blue.svg)
 
 # Best Practices
 
diff --git 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.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
@@ -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.6.2728--develop-blue.svg)
 
 # Exception handling and reporting
 
diff --git 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.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
@@ -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.6.2728--develop-blue.svg)
 
 # Getting started with TDD and utPLSQL
 
diff --git 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.6.2728--develop-blue.svg)
 
 # Downloading latest version of utPLSQL
 
diff --git 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.6.2728--develop-blue.svg)
 
 # Qyerying for test suites
 
diff --git 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.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
@@ -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.6.2728--develop-blue.svg)
 
 # Running tests
 
diff --git 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.6.2728--develop-blue.svg)
 
 # Upgrading from version 2
 
diff --git 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
@@ -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.6.2728-develop';
 
   subtype t_executable_type      is varchar2(30);
   gc_before_all                  constant t_executable_type := 'beforeall';
diff --git 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
@@ -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
@@ -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;
diff --git 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 ',
@@ -591,11 +594,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
diff --git 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
@@ -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;
diff --git a/test/ut3_user/expectations/test_expectations_cursor.pkb b/test/ut3_user/expectations/test_expectations_cursor.pkb
@@ -1008,8 +1008,8 @@ Rows: [ 4 differences ]
     l_expected sys_refcursor;
   begin
     --Arrange
-    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;
+    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);
 
@@ -2198,10 +2198,10 @@ Diff:%
   begin
     --Arrange
     open l_actual for
-      select owner, object_name,object_type from all_objects where owner = user
+      select rownum owner, rownum||'name' object_name,'PACKAGE' object_type from dual connect by level < 20
       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;
+      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();
@@ -2216,10 +2216,8 @@ Diff:%
     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;
+    open l_actual for select rownum owner,rownum  object_name, 'PACKAGE' object_type from dual connect by level < 5;
+    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);

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-![version](https://img.shields.io/badge/version-v3.1.5.2711--develop-blue.svg)`
	`1`	`+![version](https://img.shields.io/badge/version-v3.1.6.2728--develop-blue.svg)`
`2`	`2`
`3`	`3`	`### utPLSQL v3 Major Contributors`
`4`	`4`