Merge branch 'develop' into feature/cleanup_code_and_tests_a_bit

Pavel Kaplya · Pavel Kaplya · commit 0e0d2dcb2105 · 2018-07-18T10:36:53.000+03:00
# Conflicts:
#	source/api/ut_runner.pkb
#	test/api/test_ut_run.pks
diff --git a/.travis.yml b/.travis.yml
@@ -5,9 +5,9 @@ addons:
   apt:
     packages:
       - unzip
-      # Java8 Required for Sonar and SQLCL
-      - oracle-java8-installer
-      - oracle-java8-set-default
+      # Java9 Required for Sonar and SQLCL
+      - oracle-java9-installer
+      - oracle-java9-set-default
   sonarcloud:
     organization: utplsql
     token:
diff --git a/.travis/run_sonar_scanner.sh b/.travis/run_sonar_scanner.sh
@@ -30,7 +30,7 @@ else
 fi   
 
 
-#Are we running on develop branch ?
+#Are we running on utPLSQL repo and not an external PR?
 echo "Check if we running from develop or on branch"
 if [ "${TRAVIS_REPO_SLUG}" = "${UTPLSQL_REPO}" ] && [[ ! "${BRANCH}" =~ ^(release/v[0-9]+\.[0-9]+\.[0-9]+.*|"${MAIN_DEV_BRANCH}")$ ]]; then
     
@@ -39,12 +39,14 @@ if [ "${TRAVIS_REPO_SLUG}" = "${UTPLSQL_REPO}" ] && [[ ! "${BRANCH}" =~ ^(releas
         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}" 
-     else
+     elif [ "${TRAVIS_PULL_REQUEST_SLUG}" = "${TRAVIS_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"
diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md
@@ -93,8 +93,26 @@ end;
 ```
 Executes all tests from package _hr.test_apply_bonus_ and all tests from schema _cust_.
 
+```sql
+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
+begin
+  ut.run('hr.test_apply_bonus,cust');
+end;
+```
+
+Executes all tests from package _hr.test_apply_bonus_ and all tests from schema _cust_.
+
 Using a list of items to execute allows you to execute a fine-grained set of tests.
 
+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.
+
 
 **Note:**
 
diff --git a/source/api/ut_runner.pkb b/source/api/ut_runner.pkb
@@ -89,14 +89,17 @@ create or replace package body ut_runner is
     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;
+    l_paths                 ut_varchar2_list := ut_varchar2_list();                 
   begin
     ut_event_manager.initialize();
     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
-      l_paths := a_paths;
+      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
       ut_expectation_processor.reset_invalidation_exception();
       ut_utils.save_dbms_output_to_cache();
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.2.2101-develop';
+  gc_version                 constant varchar2(50) := 'v3.1.2.2122-develop';
 
   /* Constants: Event names */
   subtype t_event_name           is varchar2(30);
diff --git a/test/api/test_ut_run.pkb b/test/api/test_ut_run.pkb
@@ -718,7 +718,7 @@ Failures:%
   begin
     execute immediate 'drop package invalid_pckag_that_revalidates';
     execute immediate 'drop package parent_specs';
-  end;
-
+  end;  
+  
 end;
 /
diff --git a/test/api/test_ut_runner.pkb b/test/api/test_ut_runner.pkb
@@ -361,5 +361,175 @@ end;';
       ut.expect(dbms_utility.format_error_stack||dbms_utility.format_error_backtrace).not_to_be_like('%ORA-02055%');
   end;
 
+  procedure create_test_csl_packages is
+    pragma autonomous_transaction;
+  begin
+    execute immediate q'[
+      create or replace package test_csl_names1 as
+        --%suite
+        --%suitepath(test_csl_names)
+
+        --%test
+        procedure one_is_one;
+        
+        --%test
+        procedure two_is_two;
+
+      end;
+    ]';
+    
+    execute immediate q'{
+    create or replace package body test_csl_names1 as
+
+      procedure one_is_one is
+      begin
+        ut3.ut.expect(1).to_equal(1);
+      end;
+      
+      procedure two_is_two is
+      begin
+        ut3.ut.expect(2).to_equal(2);
+      end;
+      
+    end;
+    }';
+
+    execute immediate q'[
+      create or replace package test_csl_names2 as
+        --%suite
+        --%suitepath(test_csl_names)
+
+        --%test
+        procedure one_is_one;
+        
+        --%test
+        procedure two_is_two;
+
+      end;
+    ]';
+    
+    execute immediate q'{
+    create or replace package body test_csl_names2 as
+
+      procedure one_is_one is
+      begin
+        ut3.ut.expect(1).to_equal(1);
+      end;
+      
+      procedure two_is_two is
+      begin
+        ut3.ut.expect(2).to_equal(2);
+      end;
+      
+    end;
+    }';
+    
+  end;
+  
+  procedure drop_test_csl_packages is
+    pragma autonomous_transaction;
+  begin
+    execute immediate 'drop package test_csl_names1';
+    execute immediate 'drop package test_csl_names2';
+  end;
+
+  procedure pass_varchar2_name_list is
+    l_results   ut3.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')));
+    
+    l_actual := ut3.ut_utils.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;
+ 
+  procedure pass_varchar2_name is
+    l_results   ut3.ut_varchar2_list;
+    l_actual    clob;
+  begin
+    select *
+      bulk collect into l_results
+    from table(ut3.ut.run('test_csl_names1'));
+    
+    l_actual := ut3.ut_utils.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;
+  
+  procedure pass_varchar2_suite_csl is
+    l_results   ut3.ut_varchar2_list;
+    l_actual    clob;
+  begin
+    select *
+      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);
+    ut.expect(l_actual).to_be_like('%Finished in % seconds
+%4 tests, 0 failed, 0 errored, 0 disabled, 0 warning(s)%'); 
+  end;
+
+  procedure pass_varchar2_test_csl is
+    l_results   ut3.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'));
+    
+    l_actual := ut3.ut_utils.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;
+
+  procedure pass_varch_test_csl_spc is
+    l_results   ut3.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'));
+    
+    l_actual := ut3.ut_utils.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;
+  
+  procedure pass_csl_with_srcfile is
+    l_results   ut3.ut_varchar2_list;
+    l_actual    clob;
+  begin
+  
+    select *
+      bulk collect into l_results
+      from table(
+        ut3.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')
+        )
+      );
+    
+    l_actual := ut3.ut_utils.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;
+
+  procedure pass_csl_within_var2list is
+    l_results   ut3.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')));
+    
+    l_actual := ut3.ut_utils.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;
+  
 end;
 /
diff --git a/test/api/test_ut_runner.pks b/test/api/test_ut_runner.pks
@@ -61,5 +61,35 @@ create or replace package test_ut_runner is
   --%aftertest(db_link_cleanup)
   procedure raises_20213_on_fail_link;
 
+  procedure create_test_csl_packages;
+  procedure drop_test_csl_packages;
+  
+  --%context(ut_run_coma_sep_list)
+  --%beforeall(create_test_csl_packages)
+  --%afterall(drop_test_csl_packages)
+  
+  --%test( Pass name of tests as varchar2_list )  
+  procedure pass_varchar2_name_list;
+ 
+  --%test( Pass single test name as varchar2 ) 
+  procedure pass_varchar2_name;
+  
+  --%test( Pass coma separated list of suite names )
+  procedure pass_varchar2_suite_csl;
+
+  --%test( Pass coma separated list of test names )
+  procedure pass_varchar2_test_csl;
+
+  --%test( Pass coma separated list of test names with spaces )
+  procedure pass_varch_test_csl_spc;
+
+  --%test( Pass coma separated list and source and test files )
+  procedure pass_csl_with_srcfile;
+ 
+  --%test( Pass coma separated list in varchar2list )
+  procedure pass_csl_within_var2list; 
+  
+  --%endcontext
+
 end;
 /

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ create or replace package ut_utils authid definer is`
`21`	`21`	`*`
`22`	`22`	`*/`
`23`	`23`
`24`		`- gc_version constant varchar2(50) := 'v3.1.2.2101-develop';`
	`24`	`+ gc_version constant varchar2(50) := 'v3.1.2.2122-develop';`
`25`	`25`
`26`	`26`	`/* Constants: Event names */`
`27`	`27`	`subtype t_event_name is varchar2(30);`