Fixed invalid suitepath in core package.

jgebal · jgebal · commit b56d27adfcd2 · 2019-04-03T09:45:47.000+01:00
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)
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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,19 +286,21 @@ 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;
 
   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
@@ -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;
