Merge branch 'develop' into enchance-reporting

Pazus · web-flow · commit 7d42cae53d9d · 2017-03-13T09:13:36.000+03:00
diff --git a/.gitattributes b/.gitattributes
@@ -1,9 +1,10 @@
-
-.gitattributes export-ignore
-.gitignore     export-ignore
-.gitmodules    export-ignore
-.travis.yml    export-ignore
-
-.travis export-ignore
-
-^docs/* linguist-documentation
+.gitattributes            export-ignore
+.gitignore                export-ignore
+.gitmodules               export-ignore
+.travis.yml               export-ignore
+mkdocs.yml                export-ignore
+.travis                   export-ignore
+sonar-project.properties  export-ignore
+^tests/*                  export-ignore
+^development/*            export-ignore
+^docs/*        linguist-documentation
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,7 @@
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 # User-specific stuff:
 .idea/
+.sonar/
 site/
 pages/
 release/
diff --git a/client_source/sqlplus/ut_run.sql b/client_source/sqlplus/ut_run.sql
@@ -143,20 +143,23 @@ declare
   function is_reporter(a_reporter_name varchar2) return varchar2 is
     l_reporter_name varchar2(4000);
     l_dummy         integer;
-    e_invalid_reporter exception;
-    pragma exception_init (e_invalid_reporter,-44002);
+    l_owner         varchar2(4000);
+    e_invalid_object   exception;
+    e_not_a_reporter   exception;
+    pragma exception_init (e_invalid_object,-44002);
+    pragma exception_init (e_not_a_reporter,-6550);
   begin
-    l_reporter_name := dbms_assert.simple_sql_name(a_reporter_name);
-    select 1
-      into l_dummy
-      from all_types
-     where connect_by_isleaf = 1
-       and type_name = 'UT_REPORTER_BASE'
-     connect by type_name = prior supertype_name
-     start with type_name = upper(l_reporter_name);
+    l_reporter_name := upper(dbms_assert.simple_sql_name(a_reporter_name));
+    -- a report is a valid reporter if it can be assigned as element of ut_reporters collection
+    execute immediate
+     'declare
+        r ut_reporters;
+      begin
+        r := ut_reporters('||l_reporter_name||'());
+      end;';
     return l_reporter_name;
   exception
-    when no_data_found or e_invalid_reporter then
+    when e_not_a_reporter or e_invalid_object then
       raise_application_error(-20000, 'Invalid reporter name specified: '||a_reporter_name);
   end;
 
diff --git a/source/core/coverage/ut_coverage.pkb b/source/core/coverage/ut_coverage.pkb
@@ -253,7 +253,9 @@ create or replace package body ut_coverage is
 
     if not ut_coverage_helper.is_develop_mode() then
       --skip all the utplsql framework objects and all the unit test packages that could potentially be reported by coverage.
-      l_skipped_objects := ut_utils.get_utplsql_objects_list() multiset union all g_unit_test_packages multiset union all g_exclude_list;
+      l_skipped_objects := ut_utils.get_utplsql_objects_list()
+                           multiset union all g_unit_test_packages
+                           multiset union all coalesce(g_exclude_list, ut_object_names());
     end if;
 
     --prepare global temp table with sources
