utPLSQL · jgebal · Nov 20, 2018 · Jul 22, 2018 · Jul 22, 2018 · Jul 22, 2018
diff --git a/.gitignore b/.gitignore
@@ -15,4 +15,15 @@ node_modules/
 utPLSQL_latest_release/
 utPLSQL-cli/
 development/env.sh
+development/*.jar
 *.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
diff --git a/.travis.yml b/.travis.yml
@@ -49,18 +49,23 @@ 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}"  CONNECTION_STR='127.0.0.1:1521/ORCLPDB1' DOCKER_OPTIONS="-v /dev/pdbs:/opt/oracle/oradata/pdbs"
-    - ORACLE_VERSION="${DOCKER_TAG_12C2:-12c-r2-se2}" CONNECTION_STR='127.0.0.1:1521/ORCLPDB1' DOCKER_OPTIONS="-v /dev/pdbs:/opt/oracle/oradata/pdbs"
+    - 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"
 
 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
@@ -79,9 +84,7 @@ install:
   - bash .travis/install_sqlcl.sh
   - sudo mkdir -p /dev/pdbs
   - sudo chmod -R 777 /dev/pdbs
-  - df -h
   - if [[ ! $TRAVIS_TAG ]]; then bash .travis/start_db.sh; fi
-  - df -h
 
 before_script:
   - if [[ ! $TRAVIS_TAG ]]; then bash .travis/install.sh; fi
@@ -92,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:

diff --git 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
@@ -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-4.2.0.17.073.1038-no-jre.zip"
-    outputFile=sqlcl-4.2.0.17.073.1038-no-jre.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.sh b/.travis/install.sh
@@ -2,60 +2,66 @@
 
 cd source
 set -ev
+
 #install core of utplsql
-"$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL
+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
 
-#uninstall core of utplsql
-"$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL
-set feedback off
-set verify off
-
-@uninstall_all.sql $UT3_OWNER
-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'
-    );
-  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;
-/
+#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
+
+    #test install/uninstall process
+    time "$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL
+    set feedback off
+    set verify off
+
+    @uninstall_all.sql $UT3_OWNER
+    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'
+        );
+      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
 
-#reinstall core of utplsql
-"$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL
-set feedback off
-set verify off
+    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)';
-@install.sql $UT3_OWNER
+    alter session set plsql_optimize_level=0;
+    @install.sql $UT3_OWNER
 SQL
 
+fi
+
 #additional privileges to run scripted tests
-"$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL
+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;
-
-conn $UT3_OWNER/$UT3_OWNER_PASSWORD@//$CONNECTION_STR
-@../development/utplsql_style_check.sql
 SQL
 
-#Create additional users
-"$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL
+#Create user that will own the tests
+time "$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL
 set feedback off
 @create_utplsql_owner.sql $UT3_TESTER $UT3_TESTER_PASSWORD $UT3_TABLESPACE
 
@@ -70,29 +76,11 @@ grant create job to $UT3_TESTER;
 exit
 SQL
 
-#additional privileges to run tests
-"$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;
-
-exit
-SQL
-
-#Create additional users
-"$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL
+#Create additional UT3$USER# to test for special characters
+time "$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL
 set feedback off
 @create_utplsql_owner.sql $UT3_USER $UT3_USER_PASSWORD $UT3_TABLESPACE
-
-exit
-SQL
-
-#Grant UT3 framework to UT3$USER#
-"$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL
-set feedback off
+--Grant UT3 framework to UT3$USER#
 @create_user_grants.sql $UT3_OWNER $UT3_USER
-
 exit
 SQL
diff --git a/.travis/install_sqlcl.sh b/.travis/install_sqlcl.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 
-SQLCL_FILE=sqlcl-4.2.0.17.073.1038-no-jre.zip
+SQLCL_FILE=sqlcl-18.3.0.259.2029.zip
 cd .travis
 
 # Download if not present on cache dir.

diff --git 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 <<SQL
-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_RELEASE_VERSION_SCHEMA}
 exit
 SQL

diff --git a/.travis/start_db.sh b/.travis/start_db.sh
@@ -10,6 +10,9 @@ else
     mkdir -p $HOME/.docker && cp $CACHE_DIR/.docker/config.json $HOME/.docker/
 fi
 
-docker pull $DOCKHER_HUB_REPO:$ORACLE_VERSION
+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 logs -f $ORACLE_VERSION | grep -m 1 "DATABASE IS READY TO USE!" --line-buffered
+time docker logs -f $ORACLE_VERSION | grep -m 1 "DATABASE IS READY TO USE!" --line-buffered
+df -h
diff --git 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
 
@@ -175,6 +179,7 @@ We are using private docker images to test utPLSQL for our Travis CI builds. The
 * 11g XE R2
 * 12c SE R1
 * 12c SE R2
+* 18c SE
 
 These images are based on the slimmed versions [official dockerfiles released by Oracle](https://github.com/utPLSQL/docker-scripts), but due to licensing restrictions, we can't make the images public.
 You can build your own and use it locally, or push to a private docker repository.

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-v3.1.2
+v3.1.3
diff --git 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/
diff --git 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/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"

diff --git 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/annotations.md b/docs/userguide/annotations.md
@@ -19,7 +19,7 @@ We strongly recommend putting package level annotations at the very top of packa
 | --- | --- | --- |
 | `--%suite(<description>)` | Package | Mandatory. Marks package as a test suite. Optional suite description can be provided (see `displayname`). |
 | `--%suitepath(<path>)` | Package | Similar to java package. The annotation allows logical grouping of suites into hierarchies. |
-| `--%displayname(<description>)` | Package/procedure | Human-readable and meaningful description of a suite/test. `%displayname(Name of the suite/test)`. The annotation is provided for flexibility and convenience only. It has exactly the same meaning as `<description>` in `test` and `suite` annotations. If description is provided using both `suite`/`test` and `displayname`, then the one defined as last takes precedence. |
+| `--%displayname(<description>)` | 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 `<description>` provided with `suite`/`test`. |
 | `--%test(<description>)` | Procedure | Denotes that the annotated procedure is a unit test procedure.  Optional test description can by provided (see `displayname`). |
 | `--%throws(<exception>[,...])`| 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. |
 | `--%beforeall` | Procedure | Denotes that the annotated procedure should be executed once before all elements of the suite. |
@@ -1089,7 +1089,7 @@ create or replace package test_rooms_management is
 
 
   --%context(remove_rooms_by_name)
-  --%description(Remove rooms by name)
+  --%displayname(Remove rooms by name)
 
     --%test(Removes a room without content in it)
     procedure remove_empty_room;
@@ -1102,7 +1102,7 @@ create or replace package test_rooms_management is
 
 
   --%context(add_rooms_content)
-  --%description(Add content to a room)
+  --%displayname(Add content to a room)
 
     --%test(Fails when room name is not valid)
     --%throws(no_data_found)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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/