diff --git a/.github/scripts/get_project_build_version.sh b/.github/scripts/get_project_build_version.sh
deleted file mode 100755
index 838523b05..000000000
--- a/.github/scripts/get_project_build_version.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/usr/bin/env bash
-echo `sed -E "s/(v?[0-9]+\.)([0-9]+\.)([0-9]+)(-.*)?/\1\2\3\.${UTPLSQL_BUILD_NO}\4/" <<< "${UTPLSQL_VERSION}"`
diff --git a/.github/scripts/get_project_version.sh b/.github/scripts/get_project_version.sh
index 60fc0a796..54a30a562 100755
--- a/.github/scripts/get_project_version.sh
+++ b/.github/scripts/get_project_version.sh
@@ -1,14 +1,7 @@
#!/usr/bin/env bash
-
-#When building a new version from a release branch, the version is taken from release branch name
-if [[ "${CI_ACTION_REF_NAME}" =~ ^release/v[0-9]+\.[0-9]+\.[0-9]+.*$ ]]; then
- version=${CI_ACTION_REF_NAME#release\/}
-else
- #Otherwise, version is taken from the VERSION file
- version=`cat VERSION`
- #When on develop branch, add "-develop" to the version text
- if [[ "${CI_ACTION_REF_NAME}" == "develop" ]]; then
+version=`cat VERSION`
+#When on develop branch, add "-develop" to the version text
+if [[ "${CI_ACTION_REF_NAME}" == "develop" ]]; then
version=`sed -E "s/(v?[0-9]+\.[0-9]+\.[0-9]+).*/\1-develop/" <<< "${version}"`
- fi
fi
echo ${version}
diff --git a/.github/scripts/set_release_version_numbers_env.sh b/.github/scripts/set_release_version_numbers_env.sh
new file mode 100755
index 000000000..a43843508
--- /dev/null
+++ b/.github/scripts/set_release_version_numbers_env.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+build_no=$(cat BUILD_NO)
+version=${CI_ACTION_REF_NAME}
+
+echo "UTPLSQL_BUILD_NO=${build_no}" >> $GITHUB_ENV
+echo "UTPLSQL_VERSION=${version}" >> $GITHUB_ENV
+echo UTPLSQL_BUILD_VERSION=$(echo ${version} | sed -E "s/(v?[0-9]+\.)([0-9]+\.)([0-9]+)(-.*)?/\1\2\3\.${build_no}\4/") >> $GITHUB_ENV
+
diff --git a/.github/scripts/set_version_numbers_env.sh b/.github/scripts/set_version_numbers_env.sh
index 10529a1bf..c61639bf9 100755
--- a/.github/scripts/set_version_numbers_env.sh
+++ b/.github/scripts/set_version_numbers_env.sh
@@ -1,10 +1,8 @@
#!/bin/bash
-UTPLSQL_BUILD_NO=$( expr ${GITHUB_RUN_NUMBER} + ${UTPLSQL_BUILD_NO_OFFSET} )
-UTPLSQL_VERSION=$(.github/scripts/get_project_version.sh)
+build_no=$( expr ${GITHUB_RUN_NUMBER} + ${UTPLSQL_BUILD_NO_OFFSET} )
+version=$(.github/scripts/get_project_version.sh)
-echo "UTPLSQL_BUILD_NO=${UTPLSQL_BUILD_NO}" >> $GITHUB_ENV
-echo "UTPLSQL_VERSION=${UTPLSQL_VERSION}" >> $GITHUB_ENV
-echo UTPLSQL_BUILD_VERSION=$(echo ${UTPLSQL_VERSION} | sed -E "s/(v?[0-9]+\.)([0-9]+\.)([0-9]+)(-.*)?/\1\2\3\.${UTPLSQL_BUILD_NO}\4/") >> $GITHUB_ENV
-
-echo "CURRENT_BRANCH=${CI_ACTION_REF_NAME}" >> $GITHUB_ENV
+echo "UTPLSQL_BUILD_NO=${build_no}" >> $GITHUB_ENV
+echo "UTPLSQL_VERSION=${version}" >> $GITHUB_ENV
+echo UTPLSQL_BUILD_VERSION=$(echo ${version} | sed -E "s/(v?[0-9]+\.)([0-9]+\.)([0-9]+)(-.*)?/\1\2\3\.${build_no}\4/") >> $GITHUB_ENV
diff --git a/.github/scripts/update_project_version.sh b/.github/scripts/update_project_version.sh
index 586cb5b64..66e45125a 100755
--- a/.github/scripts/update_project_version.sh
+++ b/.github/scripts/update_project_version.sh
@@ -16,4 +16,5 @@ sed -i -r "s/(sonar\.projectVersion=).*?/\1${UTPLSQL_VERSION}/" sonar-project.pr
echo Update VERSION file
echo ${UTPLSQL_VERSION} > VERSION
+echo ${UTPLSQL_BUILD_NO} > BUILD_NO
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0ec37efe2..668f1e5a4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -58,6 +58,11 @@ jobs:
oracle-sid: 'XE'
oracle-version: "gvenzl/oracle-xe:21-slim"
oracle-base: '/opt/oracle'
+ - id: 7
+ db_version_name: '23free'
+ oracle-sid: 'FREEPDB1'
+ oracle-version: "gvenzl/oracle-free:23-slim"
+ oracle-base: '/opt/oracle'
services:
html_checker:
@@ -240,7 +245,7 @@ jobs:
- name: Push version update to repository
id: push-version-number-update
run: |
- git add sonar-project.properties VERSION source/* docs/*
+ git add sonar-project.properties VERSION BUILD_NO source/* docs/*
git commit -m 'Updated project version after build [skip ci]'
git push --quiet origin HEAD:${CI_ACTION_REF_NAME}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a748d1cbd..0e29bd5c1 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -25,7 +25,7 @@ jobs:
- uses: FranzDiebold/github-env-vars-action@v2 #https://github.com/marketplace/actions/github-environment-variables-action
- name: Set build version number env variables
- run: .github/scripts/set_version_numbers_env.sh
+ run: .github/scripts/set_release_version_numbers_env.sh
- name: Update project version & build number in source code and documentation
run: .github/scripts/update_project_version.sh
diff --git a/BUILD_NO b/BUILD_NO
new file mode 100644
index 000000000..26de2ed80
--- /dev/null
+++ b/BUILD_NO
@@ -0,0 +1 @@
+4197
diff --git a/VERSION b/VERSION
index ecbc73caf..5fcdcb942 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-v3.1.13
+v3.1.14-develop
diff --git a/development/refresh_sources.sh b/development/refresh_sources.sh
index b6ef51ef9..83518d7cc 100755
--- a/development/refresh_sources.sh
+++ b/development/refresh_sources.sh
@@ -12,7 +12,7 @@ git clone --depth=1 --branch=${SELFTESTING_BRANCH:-main} https://github.com/utPL
rm -rf utPLSQL-cli/*
# download latest release version of utPLSQL-cli
-curl -Lk -o utPLSQL-cli.zip https://github.com/utPLSQL/utPLSQL-cli/releases/download/v${UTPLSQL_CLI_VERSION}/utPLSQL-cli.zip
+curl -Lk -o utPLSQL-cli.zip https://github.com/utPLSQL/utPLSQL-cli/releases/download/${UTPLSQL_CLI_VERSION}/utPLSQL-cli.zip
# unzip utPLSQL-cli and remove the zip file
unzip utPLSQL-cli.zip && chmod u+x utPLSQL-cli/bin/utplsql && rm utPLSQL-cli.zip
diff --git a/development/releasing.md b/development/releasing.md
index 4b9e2f7f9..c1e49184d 100644
--- a/development/releasing.md
+++ b/development/releasing.md
@@ -3,25 +3,25 @@
To create a release follow the below steps
## Release preparation
- - Create a **draft** of a Release with version number `vX.Y.X` sourced from the `main` 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+)
+ - Create a **draft** of a Release with a new tag number `vX.Y.X` sourced from the `develop` branch on [github releases page](https://github.com/utPLSQL/utPLSQL/releases)
+ - Populate release description using the `Generate release notes` button
+ - Review the auto-generated release notes and update tem if needed
+ - Split the default `## What's Changed` list into `## New features`, `## Enhancements`, `## Bug fixes`. See previous release notes for details
## Performing a release
- - create the release branch from `develop` branch and make sure to name the release branch: `release/vX.Y.Z`
- - update, commit and push at least one file change in the release branch, to kick off a build on [GithubActions](https://github.com/utPLSQL/utPLSQL/actions) or kick-off a build manually for that branch after it was created on github.
- - wait for the build to complete successfully as it will update the version to be release number (without develop)
- - merge the release branch to `main` branch and publish [the previously prepared](#release-preparation) release draft.
+ - Publish [the previously prepared](#release-preparation) release draft.
- Wait for the [Github Actions `Release`](https://github.com/utPLSQL/utPLSQL/actions/workflows/release.yml) process to complete successfully. The process will upload release artifacts (`zip` and `tar.gz` files along with `md5`)
- - After Release build was completed successfully, merge the `main` branch back into `develop` branch. At this point, main branch and release tag should be at the same commit version and artifacts should be uploaded into Github release.
- - After develop branch was built, increase the 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.
+ - After Release build was completed successfully, merge the `develop` branch into `main` branch. At this point, main branch and release tag should be at the same commit version and artifacts should be uploaded into Github release.
+ - Increase the version number in the `VERSION` file on `develop` branch to open start next release version.
+ - Clone `utplsql.githug.io` project and:
+ - Add a new announcement about next version being released in `docs/_posts`. Use previous announcements as a template. Make sure to set date, time and post title properly.
+ - Add the post to list in `mkdocs.yml` file in root directory of that repository.
+ - Add the link to the post at the beginning of the `docs/index.md` file.
+ - Send the announcement on Twitter(X) accoiunt abut utPLSQL release.
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
- - changes to those two files are committed and pushed back to release branch
- - when a Github release is published, a new tag is added in on the repository and a release build is executed
- - With Release build, the documentation for new release is published on `utplsql.github.io` and installation archives are added to the release.
+ - When a Github release is published, a new tag is added in on the repository and a release build is executed
+ - With Release action, the documentation for new release is published on `utplsql.github.io` and installation archives are added to the release.
# Note:
The utPLSQL installation files are uploaded by the release build process as release artifacts (separate `zip` and `tar.gz` files).
diff --git a/docs/about/authors.md b/docs/about/authors.md
index bb8b46bb2..203d450d1 100644
--- a/docs/about/authors.md
+++ b/docs/about/authors.md
@@ -1,4 +1,4 @@
-
+
### utPLSQL v3 Major Contributors
diff --git a/docs/about/license.md b/docs/about/license.md
index 1381a7d43..28aea5fed 100644
--- a/docs/about/license.md
+++ b/docs/about/license.md
@@ -1,4 +1,4 @@
-
+
# Version Information
diff --git a/docs/about/project-details.md b/docs/about/project-details.md
index b241fedd7..8e6730847 100644
--- a/docs/about/project-details.md
+++ b/docs/about/project-details.md
@@ -1,4 +1,4 @@
-
+
# utPLSQL Project Details
diff --git a/docs/about/support.md b/docs/about/support.md
index 06d113450..0748fd479 100644
--- a/docs/about/support.md
+++ b/docs/about/support.md
@@ -1,4 +1,4 @@
-
+
# How to get support
diff --git a/docs/index.md b/docs/index.md
index 26e95ff2f..320784892 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -1,4 +1,4 @@
-
+
## What is utPLSQL
diff --git a/docs/userguide/advanced_data_comparison.md b/docs/userguide/advanced_data_comparison.md
index 629ef4237..34b4eddcc 100644
--- a/docs/userguide/advanced_data_comparison.md
+++ b/docs/userguide/advanced_data_comparison.md
@@ -1,4 +1,4 @@
-
+
# Advanced data comparison
diff --git a/docs/userguide/annotations.md b/docs/userguide/annotations.md
index a21fa7292..b3602ef10 100644
--- a/docs/userguide/annotations.md
+++ b/docs/userguide/annotations.md
@@ -1,4 +1,4 @@
-
+
Annotations are used to configure tests and suites in a declarative way similar to modern OOP languages. This way, test configuration is stored along with the test logic inside the test package.
No additional configuration files or tables are needed for test cases. The annotation names are based on popular testing frameworks such as JUnit.
@@ -1616,93 +1616,25 @@ or
Tags are defined as a comma separated list within the `--%tags` annotation.
-When executing a test run with tag filter applied, the framework will find all tests associated with the given tags and execute them.
-The framework applies `OR` logic to all specified tags so any test / suite that matches at least one tag will be included in the test run.
-
-When a suite/context is tagged, all of its children will automatically inherit the tag and get executed along with the parent. Parent suite tests are not executed, but a suitepath hierarchy is kept.
-
-
-Sample test suite package with tags.
-```sql linenums="1"
-create or replace package ut_sample_test is
-
- --%suite(Sample Test Suite)
- --%tags(api)
-
- --%test(Compare Ref Cursors)
- --%tags(complex,fast)
- procedure ut_refcursors1;
-
- --%test(Run equality test)
- --%tags(simple,fast)
- procedure ut_test;
-
-end ut_sample_test;
-/
-
-create or replace package body ut_sample_test is
-
- procedure ut_refcursors1 is
- v_actual sys_refcursor;
- v_expected sys_refcursor;
- begin
- open v_expected for select 1 as test from dual;
- open v_actual for select 2 as test from dual;
-
- ut.expect(v_actual).to_equal(v_expected);
- end;
-
- procedure ut_test is
- begin
- ut.expect(1).to_equal(0);
- end;
-
-end ut_sample_test;
-/
-```
-
-Execution of the test is done by using the parameter `a_tags`
-
-```sql linenums="1"
-select * from table(ut.run(a_path => 'ut_sample_test',a_tags => 'api'));
-```
-The above call will execute all tests from `ut_sample_test` package as the whole suite is tagged with `api`
-
-```sql linenums="1"
-select * from table(ut.run(a_tags => 'complex'));
-```
-The above call will execute only the `ut_sample_test.ut_refcursors1` test, as only the test `ut_refcursors1` is tagged with `complex`
-
-```sql linenums="1"
-select * from table(ut.run(a_tags => 'fast'));
-```
-The above call will execute both `ut_sample_test.ut_refcursors1` and `ut_sample_test.ut_test` tests, as both tests are tagged with `fast`
+When a suite/context is tagged, all of its children will automatically inherit the tag and get executed along with the parent, unless they are excluded explicitly at runtime with a negated tag expression.
+See [running unit tests](running-unit-tests.md) for more information on using tags to filter test suites that are to be executed.
#### Tag naming convention
Tags must follow the below naming convention:
- tag is case sensitive
-- tag can contain special characters like `$#/\?-!` etc.
-- tag cannot be an empty string
+- tag must not contain any of the following reserved characters:
+ - comma (,)
+ - left or right parenthesis ((, ))
+ - ampersand (&)
+ - vertical bar (|)
+ - exclamation point (!)
+- tag cannot be null or blank
- tag cannot start with a dash, e.g. `-some-stuff` is **not** a valid tag
- tag cannot contain spaces, e.g. `test of batch`. To create a multi-word tag use underscores or dashes, e.g. `test_of_batch`, `test-of-batch`
- leading and trailing spaces are ignored in tag name, e.g. `--%tags( tag1 , tag2 )` becomes `tag1` and `tag2` tag names
-
-
-#### Excluding tests/suites by tags
-
-It is possible to exclude parts of test suites with tags.
-In order to do so, prefix the tag name to exclude with a `-` (dash) sign when invoking the test run.
-
-Examples (based on above sample test suite)
-
-```sql linenums="1"
-select * from table(ut.run(a_tags => 'api,fast,-complex'));
-```
-The above call will execute all suites/contexts/tests that are marked with any of tags `api` or `fast` except those suites/contexts/tests that are marked as `complex`.
-Given the above example package `ut_sample_test`, only `ut_sample_test.ut_test` will be executed.
-
+- tag cannot be one of two reserved words: `none` and `any`. `none` and `any` as a tag will be treated as no tag
### Suitepath
diff --git a/docs/userguide/best-practices.md b/docs/userguide/best-practices.md
index a5a9c40b6..379024e73 100644
--- a/docs/userguide/best-practices.md
+++ b/docs/userguide/best-practices.md
@@ -1,4 +1,4 @@
-
+
The following are best practices we at utPLSQL have learned about PL/SQL and Unit Testing.
@@ -15,9 +15,9 @@ The following are best practices we at utPLSQL have learned about PL/SQL and Uni
- Tests should not mimic / duplicate the logic of tested code
- Tests should contain zero logic (or as close to zero as possible)
- The 3A rule:
- - Arrange (setup inputs/data/environment for the tested code)
- - Act (execute code under test)
- - Assert (validate the outcomes of the execution)
+ - Arrange (setup inputs/data/environment for the tested code)
+ - Act (execute code under test)
+ - Assert (validate the outcomes of the execution)
- Each tested procedure/function/trigger (code block) should have more than one test
- Each test should check only one behavior (one requirement) of the code block under test
- Tests should be maintained as thoroughly as production code
diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md
index 2220807ae..24855cbb5 100644
--- a/docs/userguide/coverage.md
+++ b/docs/userguide/coverage.md
@@ -1,4 +1,4 @@
-
+
utPLSQL comes with a built-in coverage reporting engine. The code coverage reporting uses package DBMS_PROFILER (and DBMS_PLSQL_CODE_COVERAGE on Oracle database version 12.2 and above) provided with Oracle database.
Code coverage is gathered for the following source types:
diff --git a/docs/userguide/exception-reporting.md b/docs/userguide/exception-reporting.md
index f585ad14d..e2a8bc7da 100644
--- a/docs/userguide/exception-reporting.md
+++ b/docs/userguide/exception-reporting.md
@@ -1,4 +1,4 @@
-
+
utPLSQL is responsible for handling exceptions wherever they occur in the test run. The framework is trapping most of the exceptions so that the test execution is not affected by individual tests or test packages throwing an exception.
The framework provides a full stacktrace for every exception that was thrown. The reported stacktrace does not include any utPLSQL library calls in it.
diff --git a/docs/userguide/expectations.md b/docs/userguide/expectations.md
index 128b05b7b..472c9654e 100644
--- a/docs/userguide/expectations.md
+++ b/docs/userguide/expectations.md
@@ -1,4 +1,4 @@
-
+
## Expectation concepts
diff --git a/docs/userguide/getting-started.md b/docs/userguide/getting-started.md
index 60b3f54b7..9c4d8813a 100644
--- a/docs/userguide/getting-started.md
+++ b/docs/userguide/getting-started.md
@@ -1,4 +1,4 @@
-
+
# Getting started with TDD and utPLSQL
diff --git a/docs/userguide/install.md b/docs/userguide/install.md
index 3ac993327..c322639df 100644
--- a/docs/userguide/install.md
+++ b/docs/userguide/install.md
@@ -1,4 +1,4 @@
-
+
## Supported database versions
@@ -121,7 +121,7 @@ The headless scripts accept three optional parameters that define:
The scripts need to be executed by `SYSDBA`, in order to grant access to `DBMS_LOCK` and `DBMS_CRYPTO` system packages.
!!! warning "Important"
- - Grant on `DBMS_LOCK` is required only for installation on Oracle versions below 18c. For versions 18c and above, utPLSQL uses `DBMS_SESSION.SLEEP` so access to `DBMS_LOCK` package is no longer needed.
+ - `DBMS_LOCK` is required for session synchronization between main session and session consuming realtime reports.
- The user performing the installation must have the `ADMINISTER DATABASE TRIGGER` privilege. This is required for installation of trigger that is responsible for parsing annotations at at compile-time of a package.
- When installed with DDL trigger, utPLSQL will not be registering unit tests for any of oracle-maintained schemas.
- For Oracle 11g following users are excluded:
diff --git a/docs/userguide/querying_suites.md b/docs/userguide/querying_suites.md
index 913abf783..463bcef97 100644
--- a/docs/userguide/querying_suites.md
+++ b/docs/userguide/querying_suites.md
@@ -1,4 +1,4 @@
-
+
## Obtaining information about suites
diff --git a/docs/userguide/reporters.md b/docs/userguide/reporters.md
index b7a516a87..41468a3a5 100644
--- a/docs/userguide/reporters.md
+++ b/docs/userguide/reporters.md
@@ -1,4 +1,4 @@
-
+
utPLSQL provides several reporting formats. The sections below describe most of them.
diff --git a/docs/userguide/running-unit-tests.md b/docs/userguide/running-unit-tests.md
index 84a71c0f1..502bd49bd 100644
--- a/docs/userguide/running-unit-tests.md
+++ b/docs/userguide/running-unit-tests.md
@@ -1,4 +1,4 @@
-
+
utPLSQL framework provides two main entry points to run unit tests from within the database:
@@ -118,16 +118,17 @@ 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_.
+Executes all tests from package _hr.test_apply_bonus_ and all tests from schema _cust_ (passing individual items to be executed as elements of the ut_varchar2_list table type).
+
```sql linenums="1"
set serveroutput on
begin
- ut.run(ut_varchar2_list('hr.test_apply_bonus,cust)');
+ 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_ (passing all items as a comma-separated-list of values into a single element of the ut_varchar2_list table type).
-Executes all tests from package _hr.test_apply_bonus_ and all tests from schema _cust_.
```sql linenums="1"
set serveroutput on
@@ -136,7 +137,7 @@ begin
end;
```
-Executes all tests from package _hr.test_apply_bonus_ and all tests from schema _cust_.
+Executes all tests from package _hr.test_apply_bonus_ and all tests from schema _cust_ (no explicit ut_varchar2_list table type).
Using a list of items to execute allows you to execute a fine-grained set of tests.
@@ -319,23 +320,219 @@ select * from table(ut.run('hr.test_apply_bonus', a_random_test_order_seed => 30
In addition to the path, you can filter the tests to be run by specifying tags. Tags are defined in the test / context / suite with the `--%tags`-annotation ([Read more](annotations.md#tags)).
Multiple tags are separated by comma.
-The framework applies `OR` logic to all specified tags so any test / suite that matches at least one tag will be included in the test run.
+
+
+### Tag Expressions
+
+Tag expressions are boolean expressions created by combining tags with the `!`, `&`, `|` operators. Tag expressions can be grouped using `(` and `)` braces. Grouping tag expressions affects operator precedence.
+
+Two reserved keywords, `any` and `none`, can be used when creating a tag expression to run tests.
+- `any` keyword represents tests and suites with any tags
+- `none` keyword represents tests and suites without tags
+
+These keywords may be combined with other expressions just like normal tags.
+
+!!! note
+ When specifying `none`, be aware that it will exclude any tests/suites/contexts contained within a tagged suite.
+
+| Operator | Meaning |
+| -------- | --------|
+| ! | not |
+| & | and |
+| \| | or |
+
+If you are tagging your tests across multiple dimensions, tag expressions help you to select which tests to execute. When tagging by test type (e.g., micro, integration, end-to-end) and feature (e.g., product, catalog, shipping), the following tag expressions can be useful.
+
+
+| Tag Expression | Selection |
+| -------- | --------|
+| product | all tests for product |
+| catalog \| shipping | all tests for catalog plus all tests for shipping |
+| catalog & shipping | all tests that are tagged with both `catalog` and `shipping` tags |
+| product & !end-to-end | all tests tagged `product`, except the tests tagged `end-to-end` |
+| (micro \| integration) & (product \| shipping) | all micro or integration tests for product or shipping |
+
+
+Taking the last expression above `(micro | integration) & (product | shipping)`
+
+| --%tags |included in run |
+| -------- | --------|
+| micro | no |
+| integration | no |
+| micro | no |
+| product | no |
+| shipping | no |
+| micro | no |
+| micro, integration | no |
+| product, shipping | no |
+| micro, product | yes |
+| micro, shipping | yes |
+| integration, product | yes |
+| integration, shipping | yes |
+| integration, micro, shipping | yes |
+| integration, micro, product | yes |
+| integration, shipping ,product | yes |
+| micro, shipping ,product | yes |
+| integration, micro, shipping ,product | yes |
+
+
+### Sample execution of test with tags.
+
+Execution of the test with tag expressions is done using the parameter `a_tags`.
+Given a test package `ut_sample_test` defined below
```sql linenums="1"
-begin
- ut.run('hr.test_apply_bonus', a_tags => 'test1,test2');
-end;
+create or replace package ut_sample_test is
+
+ --%suite(Sample Test Suite)
+ --%tags(api)
+
+ --%test(Compare Ref Cursors)
+ --%tags(complex,fast)
+ procedure ut_refcursors1;
+
+ --%test(Run equality test)
+ --%tags(simple,fast)
+ procedure ut_test;
+
+end ut_sample_test;
+/
+
+create or replace package body ut_sample_test is
+
+ procedure ut_refcursors1 is
+ v_actual sys_refcursor;
+ v_expected sys_refcursor;
+ begin
+ open v_expected for select 1 as test from dual;
+ open v_actual for select 2 as test from dual;
+
+ ut.expect(v_actual).to_equal(v_expected);
+ end;
+
+ procedure ut_test is
+ begin
+ ut.expect(1).to_equal(0);
+ end;
+
+end ut_sample_test;
+/
+```
+
+```sql linenums="1"
+select * from table(ut.run(a_path => 'ut_sample_test',a_tags => 'api'));
+```
+The above call will execute all tests from `ut_sample_test` package as the whole suite is tagged with `api`
+
+```sql linenums="1"
+select * from table(ut.run(a_tags => 'fast&complex'));
+```
+The above call will execute only the `ut_sample_test.ut_refcursors1` test, as only the test `ut_refcursors1` is tagged with `complex` and `fast`
+
+```sql linenums="1"
+select * from table(ut.run(a_tags => 'fast'));
+```
+The above call will execute both `ut_sample_test.ut_refcursors1` and `ut_sample_test.ut_test` tests, as both tests are tagged with `fast`
+
+### Excluding tests/suites by tags
+
+It is possible to exclude parts of test suites with tags.
+In order to do so, prefix the tag name to exclude with a `!` (exclamation) sign when invoking the test run which is equivalent of `-` (dash) in legacy notation.
+Examples (based on above sample test suite)
+
+```sql linenums="1"
+select * from table(ut.run(a_tags => '(api|fast)&!complex'));
```
+
+or
+
```sql linenums="1"
-select * from table(ut.run('hr.test_apply_bonus', a_tags => 'suite1'))
+select * from table(ut.run(a_tags => '(api|fast)&!complex&!test1'));
```
-You can also exclude specific tags by adding a `-` (dash) in front of the tag
+which is equivalent of exclusion on whole expression
+
+```sql linenums="1"
+select * from table(ut.run(a_tags => '(api|fast)&!(complex|test1)'));
+```
+
+The above calls will execute all suites/contexts/tests that are marked with any of tags `api` or `fast` except those suites/contexts/tests that are marked as `complex` and except those suites/contexts/tests that are marked as `test1`.
+Given the above example package `ut_sample_test`, only `ut_sample_test.ut_test` will be executed.
+
+
+### Sample execution with `any` and `none`
+
+Given a sample test package:
```sql linenums="1"
-select * from table(ut.run('hr.test_apply_bonus', a_tags => '-suite1'))
+create or replace package ut_sample_test is
+
+ --%suite(Sample Test Suite)
+
+ --%test(Compare Ref Cursors)
+ --%tags(complex,fast)
+ procedure ut_refcursors1;
+
+ --%test(Run equality test)
+ --%tags(simple,fast)
+ procedure ut_test;
+
+ --%test(Run equality test no tag)
+ procedure ut_test_no_tag;
+
+end ut_sample_test;
+/
+
+create or replace package body ut_sample_test is
+
+ procedure ut_refcursors1 is
+ v_actual sys_refcursor;
+ v_expected sys_refcursor;
+ begin
+ open v_expected for select 1 as test from dual;
+ open v_actual for select 2 as test from dual;
+
+ ut.expect(v_actual).to_equal(v_expected);
+ end;
+
+ procedure ut_test is
+ begin
+ ut.expect(1).to_equal(0);
+ end;
+
+ procedure ut_test_no_tag is
+ begin
+ ut.expect(1).to_equal(0);
+ end;
+
+end ut_sample_test;
+/
```
+```sql linenums="1"
+select * from table(ut.run(a_path => 'ut_sample_test',a_tags => 'none'));
+```
+
+The above call will execute tests `ut_test_no_tag`
+
+```sql linenums="1"
+select * from table(ut.run(a_path => 'ut_sample_test',a_tags => 'any'));
+```
+
+The above call will execute tests `ut_test` and `ut_refcursors1`
+
+```sql linenums="1"
+select * from table(ut.run(a_path => 'ut_sample_test',a_tags => 'none|simple'));
+```
+
+The above call will execute tests `ut_test_no_tag` and `ut_test`
+
+```sql linenums="1"
+select * from table(ut.run(a_tags => 'none|!simple'));
+```
+
+The above call will execute tests `ut_test_no_tag` and `ut_refcursors1`
+
## Keeping uncommitted data after test-run
utPLSQL by default runs tests in autonomous transaction and performs automatic rollback to assure that tests do not impact one-another and do not have impact on the current session in your IDE.
@@ -370,4 +567,4 @@ Example call with characterset provided:
begin
ut.run('hr.test_apply_bonus', ut_junit_reporter(), a_client_character_set => 'Windows-1251');
end;
-```
\ No newline at end of file
+```
diff --git a/docs/userguide/upgrade.md b/docs/userguide/upgrade.md
index a081a0a1b..cb49a0424 100644
--- a/docs/userguide/upgrade.md
+++ b/docs/userguide/upgrade.md
@@ -1,4 +1,4 @@
-
+
# Upgrading from version 2
diff --git a/examples/developer_examples/RunExampleTestSuiteWithCompositeReporter.sql b/examples/developer_examples/RunExampleTestSuiteWithCompositeReporter.sql
index 468d176ed..e713fa02d 100644
--- a/examples/developer_examples/RunExampleTestSuiteWithCompositeReporter.sql
+++ b/examples/developer_examples/RunExampleTestSuiteWithCompositeReporter.sql
@@ -20,6 +20,7 @@ begin
ut_event_manager.initialize();
ut_event_manager.add_listener(l_doc_reporter);
ut_event_manager.add_listener(l_tc_reporter);
+ ut_event_manager.trigger_event(ut_event_manager.gc_initialize, l_run);
l_suite := ut_suite(user, 'ut_exampletest',a_line_no=>1);
l_suite.description := 'Test Suite Name';
diff --git a/sonar-project.properties b/sonar-project.properties
index 77cc387a8..d088e9ccb 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -3,7 +3,7 @@ sonar.organization=utplsql
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.13
+sonar.projectVersion=v3.1.14-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/api/ut.pkb b/source/api/ut.pkb
index 5c91e54d4..cff35b771 100644
--- a/source/api/ut.pkb
+++ b/source/api/ut.pkb
@@ -222,10 +222,15 @@ create or replace package body ut is
raise_if_packages_invalidated();
raise no_data_found;
end if;
- g_result_lines := ut_utils.clob_to_table(l_clob, ut_utils.gc_max_storage_varchar2_len);
- g_result_line_no := g_result_lines.first;
+ if l_clob is not null and l_clob != empty_clob() then
+ if length(l_clob) > ut_utils.gc_max_storage_varchar2_len then
+ g_result_lines := ut_utils.clob_to_table(l_clob, ut_utils.gc_max_storage_varchar2_len);
+ else
+ g_result_lines := ut_varchar2_list(l_clob);
+ end if;
+ g_result_line_no := g_result_lines.first;
+ end if;
end if;
-
if g_result_line_no is not null then
l_result := g_result_lines(g_result_line_no);
g_result_line_no := g_result_lines.next(g_result_line_no);
@@ -273,6 +278,7 @@ create or replace package body ut is
);
if l_reporter is of (ut_output_reporter_base) then
l_results := treat(l_reporter as ut_output_reporter_base).get_lines_cursor();
+ g_result_lines := ut_varchar2_list();
loop
pipe row( get_report_outputs( l_results ) );
end loop;
@@ -320,6 +326,7 @@ create or replace package body ut is
);
if l_reporter is of (ut_output_reporter_base) then
l_results := treat(l_reporter as ut_output_reporter_base).get_lines_cursor();
+ g_result_lines := ut_varchar2_list();
loop
pipe row( get_report_outputs( l_results ) );
end loop;
@@ -368,6 +375,7 @@ create or replace package body ut is
);
if l_reporter is of (ut_output_reporter_base) then
l_results := treat(l_reporter as ut_output_reporter_base).get_lines_cursor();
+ g_result_lines := ut_varchar2_list();
loop
pipe row( get_report_outputs( l_results ) );
end loop;
@@ -416,6 +424,7 @@ create or replace package body ut is
);
if l_reporter is of (ut_output_reporter_base) then
l_results := treat(l_reporter as ut_output_reporter_base).get_lines_cursor();
+ g_result_lines := ut_varchar2_list();
loop
pipe row( get_report_outputs( l_results ) );
end loop;
@@ -464,6 +473,7 @@ create or replace package body ut is
);
if l_reporter is of (ut_output_reporter_base) then
l_results := treat(l_reporter as ut_output_reporter_base).get_lines_cursor();
+ g_result_lines := ut_varchar2_list();
loop
pipe row( get_report_outputs( l_results ) );
end loop;
@@ -512,6 +522,7 @@ create or replace package body ut is
);
if l_reporter is of (ut_output_reporter_base) then
l_results := treat(l_reporter as ut_output_reporter_base).get_lines_cursor();
+ g_result_lines := ut_varchar2_list();
loop
pipe row( get_report_outputs( l_results ) );
end loop;
diff --git a/source/api/ut_runner.pkb b/source/api/ut_runner.pkb
index b69a51a04..3ec2a5393 100644
--- a/source/api/ut_runner.pkb
+++ b/source/api/ut_runner.pkb
@@ -78,8 +78,7 @@ create or replace package body ut_runner is
l_run ut_run;
l_coverage_schema_names ut_varchar2_rows;
l_paths ut_varchar2_list;
- l_random_test_order_seed positive;
- l_tags ut_varchar2_rows := ut_varchar2_rows();
+ l_random_test_order_seed positive;
begin
ut_event_manager.initialize();
if a_reporters is not empty then
@@ -118,12 +117,6 @@ create or replace package body ut_runner is
l_coverage_schema_names := ut_suite_manager.get_schema_names(l_paths);
end if;
-
- if a_tags is not null then
- l_tags := l_tags multiset union distinct ut_utils.convert_collection(
- ut_utils.trim_list_elements(ut_utils.filter_list(ut_utils.string_to_table(a_tags,','),ut_utils.gc_word_no_space))
- );
- end if;
l_run := ut_run(
a_run_paths => l_paths,
a_coverage_options => ut_coverage_options(
@@ -140,10 +133,10 @@ create or replace package body ut_runner is
a_test_file_mappings => set(a_test_file_mappings),
a_client_character_set => a_client_character_set,
a_random_test_order_seed => l_random_test_order_seed,
- a_run_tags => l_tags
+ a_run_tags => a_tags
);
- ut_suite_manager.configure_execution_by_path(l_paths, l_run.items, l_random_test_order_seed, l_tags);
+ ut_suite_manager.configure_execution_by_path(l_paths, l_run.items, l_random_test_order_seed, a_tags);
if a_force_manual_rollback then
l_run.set_rollback_type( a_rollback_type => ut_utils.gc_rollback_manual, a_force => true );
end if;
diff --git a/source/core/annotations/ut_annotation_manager.pkb b/source/core/annotations/ut_annotation_manager.pkb
index 16923bc23..65f7b3e40 100644
--- a/source/core/annotations/ut_annotation_manager.pkb
+++ b/source/core/annotations/ut_annotation_manager.pkb
@@ -246,7 +246,7 @@ create or replace package body ut_annotation_manager as
l_sql_clob := regexp_replace(l_sql_clob, '^(.*?\s*create(\s+or\s+replace)?(\s+(editionable|noneditionable))?\s+?)((package|type).*)', '\5', 1, 1, 'ni');
-- remove "OWNER." from create or replace statement.
-- Owner is not supported along with AUTHID - see issue https://github.com/utPLSQL/utPLSQL/issues/1088
- l_sql_clob := regexp_replace(l_sql_clob, '^(package|type)\s+("?[a-zA-Z][a-zA-Z0-9#_$]*"?\.)(.*)', '\1 \3', 1, 1, 'ni');
+ l_sql_clob := regexp_replace(l_sql_clob, '^(package|type)\s+("?[[:alpha:]][[:alnum:]$#_]*"?\.)(.*)', '\1 \3', 1, 1, 'ni');
l_sql_lines := ut_utils.convert_collection( ut_utils.clob_to_table(l_sql_clob) );
end if;
open l_result for
diff --git a/source/core/annotations/ut_annotation_parser.pkb b/source/core/annotations/ut_annotation_parser.pkb
index f0271c957..10bb76b3c 100644
--- a/source/core/annotations/ut_annotation_parser.pkb
+++ b/source/core/annotations/ut_annotation_parser.pkb
@@ -25,7 +25,7 @@ create or replace package body ut_annotation_parser as
gc_annot_comment_pattern constant varchar2(30) := '^( |'||chr(09)||')*-- *('||gc_annotation_qualifier||'.*?)$'; -- chr(09) is a tab character
gc_comment_replacer_patter constant varchar2(50) := '{COMMENT#%N%}';
gc_comment_replacer_regex_ptrn constant varchar2(25) := '{COMMENT#(\d+)}';
- gc_regexp_identifier constant varchar2(50) := '[a-zA-Z][a-zA-Z0-9#_$]*';
+ gc_regexp_identifier constant varchar2(50) := '[[:alpha:]][[:alnum:]$#_]*';
gc_annotation_block_pattern constant varchar2(200) := '(({COMMENT#.+}'||chr(10)||')+)( |'||chr(09)||')*(procedure|function)\s+(' ||
gc_regexp_identifier || ')';
gc_annotation_pattern constant varchar2(50) := gc_annotation_qualifier || gc_regexp_identifier || '[ '||chr(9)||']*(\(.*?\)\s*?$)?';
diff --git a/source/core/coverage/ut_coverage_reporter_base.tpb b/source/core/coverage/ut_coverage_reporter_base.tpb
index aff4e6560..da2bd27ad 100644
--- a/source/core/coverage/ut_coverage_reporter_base.tpb
+++ b/source/core/coverage/ut_coverage_reporter_base.tpb
@@ -92,7 +92,6 @@ create or replace type body ut_coverage_reporter_base is
ut_coverage_helper.cleanup_tmp_table();
(l_reporter as ut_output_reporter_base).before_calling_run(null);
l_reporter.after_calling_run( ut_run( a_coverage_options => a_coverage_options, a_client_character_set => a_client_character_set ) );
- l_reporter.on_finalize(null);
for i in (select /*+ no_parallel */ x.text from table(l_reporter.get_lines(1, 1)) x ) loop
pipe row (i.text);
end loop;
@@ -106,7 +105,6 @@ create or replace type body ut_coverage_reporter_base is
ut_coverage_helper.cleanup_tmp_table();
(l_reporter as ut_output_reporter_base).before_calling_run(null);
l_reporter.after_calling_run( ut_run( a_coverage_options => a_coverage_options, a_client_character_set => a_client_character_set ) );
- l_reporter.on_finalize(null);
open l_result for select /*+ no_parallel */ x.text from table(l_reporter.get_lines(1, 1)) x;
return l_result;
end;
diff --git a/source/core/output_buffers/ut_output_buffer_base.tpb b/source/core/output_buffers/ut_output_buffer_base.tpb
index 6d7964150..20cec335e 100644
--- a/source/core/output_buffers/ut_output_buffer_base.tpb
+++ b/source/core/output_buffers/ut_output_buffer_base.tpb
@@ -24,7 +24,6 @@ create or replace type body ut_output_buffer_base is
self.self_type := coalesce(a_self_type,self.self_type);
self.output_id := coalesce(a_output_id, self.output_id, sys_guid());
self.start_date := coalesce(self.start_date, sysdate);
- self.last_message_id := 0;
select /*+ no_parallel */ count(*) into l_exists from ut_output_buffer_info_tmp where output_id = self.output_id;
if ( l_exists > 0 ) then
update /*+ no_parallel */ ut_output_buffer_info_tmp set start_date = self.start_date where output_id = self.output_id;
@@ -32,10 +31,86 @@ create or replace type body ut_output_buffer_base is
insert /*+ no_parallel */ into ut_output_buffer_info_tmp(output_id, start_date) values (self.output_id, self.start_date);
end if;
commit;
+ dbms_lock.allocate_unique( self.output_id, self.lock_handle);
self.is_closed := 0;
end;
- member function get_lines_cursor(a_initial_timeout natural := null, a_timeout_sec natural := null) return sys_refcursor is
+ member procedure lock_buffer(a_timeout_sec number := null) is
+ l_status integer;
+ begin
+ l_status := dbms_lock.request( self.lock_handle, dbms_lock.x_mode, 5, false );
+ if l_status != 0 then
+ raise_application_error(-20000, 'Cannot allocate lock for output buffer of reporter. lock request status = '||l_status||', lock handle = '||self.lock_handle||', self.output_id ='||self.output_id);
+ end if;
+ end;
+
+ member procedure close(self in out nocopy ut_output_buffer_base) is
+ l_status integer;
+ begin
+ l_status := dbms_lock.release( self.lock_handle );
+ if l_status != 0 then
+ raise_application_error(-20000, 'Cannot release lock for output buffer of reporter. Lock_handle = '||self.lock_handle||' status = '||l_status);
+ end if;
+ self.is_closed := 1;
+ end;
+
+
+ member procedure remove_buffer_info(self in ut_output_buffer_base) is
+ pragma autonomous_transaction;
+ begin
+ delete from ut_output_buffer_info_tmp a
+ where a.output_id = self.output_id;
+ commit;
+ end;
+
+ member function timeout_producer_not_started( a_producer_started boolean, a_already_waited_sec number, a_init_wait_sec number ) return boolean
+ is
+ l_result boolean := false;
+ begin
+ if not a_producer_started and a_already_waited_sec >= a_init_wait_sec then
+ if a_init_wait_sec > 0 then
+ self.remove_buffer_info();
+ raise_application_error(
+ ut_utils.gc_out_buffer_timeout,
+ 'Timeout occurred while waiting for report data producer to start. Waited for: '||ut_utils.to_string( a_already_waited_sec )||' seconds.'
+ );
+ else
+ l_result := true;
+ end if;
+ end if;
+ return l_result;
+ end;
+
+ member function timeout_producer_not_finished(a_producer_finished boolean, a_already_waited_sec number, a_timeout_sec number) return boolean
+ is
+ l_result boolean := false;
+ begin
+ if not a_producer_finished and a_timeout_sec is not null and a_already_waited_sec >= a_timeout_sec then
+ if a_timeout_sec > 0 then
+ self.remove_buffer_info();
+ raise_application_error(
+ ut_utils.gc_out_buffer_timeout,
+ 'Timeout occurred while waiting for more data from producer. Waited for: '||ut_utils.to_string( a_already_waited_sec )||' seconds.'
+ );
+ else
+ l_result := true;
+ end if;
+ end if;
+ return l_result;
+ end;
+
+ member function get_lock_status return integer is
+ l_result integer;
+ l_release_status integer;
+ begin
+ l_result := dbms_lock.request( self.lock_handle, dbms_lock.s_mode, 0, false );
+ if l_result = 0 then
+ l_release_status := dbms_lock.release( self.lock_handle );
+ end if;
+ return l_result;
+ end;
+
+ member function get_lines_cursor(a_initial_timeout number := null, a_timeout_sec number := null) return sys_refcursor is
l_lines sys_refcursor;
begin
open l_lines for
@@ -44,7 +119,7 @@ create or replace type body ut_output_buffer_base is
return l_lines;
end;
- member procedure lines_to_dbms_output(self in ut_output_buffer_base, a_initial_timeout natural := null, a_timeout_sec natural := null) is
+ member procedure lines_to_dbms_output(self in ut_output_buffer_base, a_initial_timeout number := null, a_timeout_sec number := null) is
l_data sys_refcursor;
l_clob clob;
l_item_type varchar2(32767);
@@ -54,16 +129,20 @@ create or replace type body ut_output_buffer_base is
loop
fetch l_data into l_clob, l_item_type;
exit when l_data%notfound;
- l_lines := ut_utils.clob_to_table(l_clob);
- for i in 1 .. l_lines.count loop
- dbms_output.put_line(l_lines(i));
- end loop;
+ if dbms_lob.getlength(l_clob) > 32767 then
+ l_lines := ut_utils.clob_to_table(l_clob);
+ for i in 1 .. l_lines.count loop
+ dbms_output.put_line(l_lines(i));
+ end loop;
+ else
+ dbms_output.put_line(l_clob);
+ end if;
end loop;
close l_data;
end;
member procedure cleanup_buffer(self in ut_output_buffer_base, a_retention_time_sec natural := null) is
- gc_buffer_retention_sec constant naturaln := coalesce(a_retention_time_sec, 60 * 60 * 24); -- 24 hours
+ gc_buffer_retention_sec constant naturaln := coalesce(a_retention_time_sec, 60 * 60 * 24 * 5); -- 5 days
l_retention_days number := gc_buffer_retention_sec / (60 * 60 * 24);
l_max_retention_date date := sysdate - l_retention_days;
pragma autonomous_transaction;
diff --git a/source/core/output_buffers/ut_output_buffer_base.tps b/source/core/output_buffers/ut_output_buffer_base.tps
index 98a6847cd..f2d9ec686 100644
--- a/source/core/output_buffers/ut_output_buffer_base.tps
+++ b/source/core/output_buffers/ut_output_buffer_base.tps
@@ -19,16 +19,21 @@ create or replace type ut_output_buffer_base force authid definer as object(
output_id raw(32),
is_closed number(1,0),
start_date date,
- last_message_id number(38,0),
+ lock_handle varchar2(30 byte),
self_type varchar2(250 byte),
member procedure init(self in out nocopy ut_output_buffer_base, a_output_id raw := null, a_self_type varchar2 := null),
- member function get_lines_cursor(a_initial_timeout natural := null, a_timeout_sec natural := null) return sys_refcursor,
- member procedure lines_to_dbms_output(self in ut_output_buffer_base, a_initial_timeout natural := null, a_timeout_sec natural := null),
+ member procedure lock_buffer(a_timeout_sec number := null),
+ member function timeout_producer_not_started( a_producer_started boolean, a_already_waited_sec number, a_init_wait_sec number ) return boolean,
+ member function timeout_producer_not_finished(a_producer_finished boolean, a_already_waited_sec number, a_timeout_sec number) return boolean,
+ member function get_lock_status return integer,
+ member function get_lines_cursor(a_initial_timeout number := null, a_timeout_sec number := null) return sys_refcursor,
+ member procedure lines_to_dbms_output(self in ut_output_buffer_base, a_initial_timeout number := null, a_timeout_sec number := null),
member procedure cleanup_buffer(self in ut_output_buffer_base, a_retention_time_sec natural := null),
- not instantiable member procedure close(self in out nocopy ut_output_buffer_base),
+ member procedure remove_buffer_info(self in ut_output_buffer_base),
+ member procedure close(self in out nocopy ut_output_buffer_base),
not instantiable member procedure send_line(self in out nocopy ut_output_buffer_base, a_text varchar2, a_item_type varchar2 := null),
not instantiable member procedure send_lines(self in out nocopy ut_output_buffer_base, a_text_list ut_varchar2_rows, a_item_type varchar2 := null),
not instantiable member procedure send_clob(self in out nocopy ut_output_buffer_base, a_text clob, a_item_type varchar2 := null),
- not instantiable member function get_lines(a_initial_timeout natural := null, a_timeout_sec natural := null) return ut_output_data_rows pipelined
+ not instantiable member function get_lines(a_initial_timeout number := null, a_timeout_sec number := null) return ut_output_data_rows pipelined
) not final not instantiable
/
diff --git a/source/core/output_buffers/ut_output_buffer_tmp.sql b/source/core/output_buffers/ut_output_buffer_tmp.sql
index 57027817e..1ab19e534 100644
--- a/source/core/output_buffers/ut_output_buffer_tmp.sql
+++ b/source/core/output_buffers/ut_output_buffer_tmp.sql
@@ -30,3 +30,4 @@ create table ut_output_buffer_tmp(
) organization index nologging initrans 100
overflow nologging initrans 100;
+create sequence ut_output_buffer_tmp_seq cache 20;
diff --git a/source/core/output_buffers/ut_output_bulk_buffer.tpb b/source/core/output_buffers/ut_output_bulk_buffer.tpb
new file mode 100644
index 000000000..cfc173e95
--- /dev/null
+++ b/source/core/output_buffers/ut_output_bulk_buffer.tpb
@@ -0,0 +1,160 @@
+create or replace type body ut_output_bulk_buffer is
+ /*
+ utPLSQL - Version 3
+ Copyright 2016 - 2023 utPLSQL Project
+
+ Licensed under the Apache License, Version 2.0 (the "License"):
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+ constructor function ut_output_bulk_buffer(self in out nocopy ut_output_bulk_buffer, a_output_id raw := null) return self as result is
+ begin
+ self.init(a_output_id, $$plsql_unit);
+ return;
+ end;
+
+ overriding member procedure send_line(self in out nocopy ut_output_bulk_buffer, a_text varchar2, a_item_type varchar2 := null) is
+ pragma autonomous_transaction;
+ begin
+ if a_text is not null or a_item_type is not null then
+ if length(a_text) > ut_utils.gc_max_storage_varchar2_len then
+ self.send_lines(
+ ut_utils.convert_collection(
+ ut_utils.clob_to_table(a_text, ut_utils.gc_max_storage_varchar2_len)
+ ),
+ a_item_type
+ );
+ else
+ insert /*+ no_parallel */ into ut_output_buffer_tmp(output_id, message_id, text, item_type)
+ values (self.output_id, ut_output_buffer_tmp_seq.nextval, a_text, a_item_type);
+ end if;
+ commit;
+ end if;
+ end;
+
+ overriding member procedure send_lines(self in out nocopy ut_output_bulk_buffer, a_text_list ut_varchar2_rows, a_item_type varchar2 := null) is
+ pragma autonomous_transaction;
+ begin
+ insert /*+ no_parallel */ into ut_output_buffer_tmp(output_id, message_id, text, item_type)
+ select /*+ no_parallel */ self.output_id, ut_output_buffer_tmp_seq.nextval, t.column_value, a_item_type
+ from table(a_text_list) t
+ where t.column_value is not null or a_item_type is not null;
+ commit;
+ end;
+
+ overriding member procedure send_clob(self in out nocopy ut_output_bulk_buffer, a_text clob, a_item_type varchar2 := null) is
+ pragma autonomous_transaction;
+ begin
+ if a_text is not null and a_text != empty_clob() or a_item_type is not null then
+ if length(a_text) > ut_utils.gc_max_storage_varchar2_len then
+ self.send_lines(
+ ut_utils.convert_collection(
+ ut_utils.clob_to_table(a_text, ut_utils.gc_max_storage_varchar2_len)
+ ),
+ a_item_type
+ );
+ else
+ insert /*+ no_parallel */ into ut_output_buffer_tmp(output_id, message_id, text, item_type)
+ values (self.output_id, ut_output_buffer_tmp_seq.nextval, a_text, a_item_type);
+ end if;
+ commit;
+ end if;
+ end;
+
+ overriding member procedure lines_to_dbms_output(self in ut_output_bulk_buffer, a_initial_timeout number := null, a_timeout_sec number := null) is
+ l_data sys_refcursor;
+ l_text ut_varchar2_rows;
+ l_item_type ut_varchar2_rows;
+ begin
+ l_data := self.get_lines_cursor(a_initial_timeout, a_timeout_sec);
+ loop
+ fetch l_data bulk collect into l_text, l_item_type limit 10000;
+ for idx in 1 .. l_text.count loop
+ dbms_output.put_line(l_text(idx));
+ end loop;
+ exit when l_data%notfound;
+ end loop;
+ close l_data;
+ self.remove_buffer_info();
+ end;
+
+ overriding member function get_lines_cursor(a_initial_timeout number := null, a_timeout_sec number := null) return sys_refcursor is
+ lc_init_wait_sec constant number := coalesce(a_initial_timeout, 10 );
+ l_already_waited_sec number(10,2) := 0;
+ l_sleep_time number(2,1);
+ l_exists integer;
+ l_finished boolean := false;
+ l_data_produced boolean := false;
+ l_producer_active boolean := false;
+ l_producer_started boolean := false;
+ l_producer_finished boolean := false;
+ l_results sys_refcursor;
+ begin
+
+ while not l_finished loop
+
+ if not l_data_produced then
+ select /*+ no_parallel */ count(1) into l_exists
+ from ut_output_buffer_tmp o
+ where o.output_id = self.output_id and rownum = 1;
+ l_data_produced := (l_exists = 1);
+ end if;
+
+ l_sleep_time := case when l_already_waited_sec >= 1 then 0.5 else 0.1 end;
+ l_producer_active := (self.get_lock_status() <> 0);
+ l_producer_started := (l_producer_active or l_data_produced ) or l_producer_started;
+ l_producer_finished := (l_producer_started and not l_producer_active) or l_producer_finished;
+ l_finished :=
+ self.timeout_producer_not_finished(l_producer_finished, l_already_waited_sec, a_timeout_sec)
+ or self.timeout_producer_not_started(l_producer_started, l_already_waited_sec, lc_init_wait_sec)
+ or l_producer_finished;
+
+ dbms_lock.sleep(l_sleep_time);
+ l_already_waited_sec := l_already_waited_sec + l_sleep_time;
+ end loop;
+
+ open l_results for
+ select /*+ no_parallel */ o.text, o.item_type
+ from ut_output_buffer_tmp o
+ where o.output_id = self.output_id
+ and o.text is not null
+ order by o.output_id, o.message_id;
+
+ return l_results;
+
+ end;
+
+ /* Important note.
+ This function code is almost duplicated between two types for performance reasons.
+ The pipe row clause is much faster on VARCHAR2 then it is on clob.
+ That is the key reason for two implementations.
+ */
+ overriding member function get_lines(a_initial_timeout number := null, a_timeout_sec number := null) return ut_output_data_rows pipelined is
+ l_data sys_refcursor;
+ l_text ut_varchar2_rows;
+ l_item_type ut_varchar2_rows;
+ begin
+ l_data := self.get_lines_cursor(a_initial_timeout, a_timeout_sec);
+ loop
+ fetch l_data bulk collect into l_text, l_item_type limit 10000;
+ for idx in 1 .. l_text.count loop
+ pipe row( ut_output_data_row(l_text(idx), l_item_type(idx)) );
+ end loop;
+ exit when l_data%notfound;
+ end loop;
+ close l_data;
+ self.remove_buffer_info();
+ return;
+ end;
+
+end;
+/
diff --git a/source/core/output_buffers/ut_output_bulk_buffer.tps b/source/core/output_buffers/ut_output_bulk_buffer.tps
new file mode 100644
index 000000000..d74d4ee14
--- /dev/null
+++ b/source/core/output_buffers/ut_output_bulk_buffer.tps
@@ -0,0 +1,27 @@
+create or replace type ut_output_bulk_buffer under ut_output_buffer_base (
+ /*
+ utPLSQL - Version 3
+ Copyright 2016 - 2023 utPLSQL Project
+
+ Licensed under the Apache License, Version 2.0 (the "License"):
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+ constructor function ut_output_bulk_buffer(self in out nocopy ut_output_bulk_buffer, a_output_id raw := null) return self as result,
+ overriding member procedure send_line(self in out nocopy ut_output_bulk_buffer, a_text varchar2, a_item_type varchar2 := null),
+ overriding member procedure send_lines(self in out nocopy ut_output_bulk_buffer, a_text_list ut_varchar2_rows, a_item_type varchar2 := null),
+ overriding member procedure send_clob(self in out nocopy ut_output_bulk_buffer, a_text clob, a_item_type varchar2 := null),
+ overriding member procedure lines_to_dbms_output(self in ut_output_bulk_buffer, a_initial_timeout number := null, a_timeout_sec number := null),
+ overriding member function get_lines_cursor(a_initial_timeout number := null, a_timeout_sec number := null) return sys_refcursor,
+ overriding member function get_lines(a_initial_timeout number := null, a_timeout_sec number := null) return ut_output_data_rows pipelined
+) not final
+/
diff --git a/source/core/output_buffers/ut_output_clob_buffer_tmp.sql b/source/core/output_buffers/ut_output_clob_buffer_tmp.sql
index 40dda121f..9ff9f7413 100644
--- a/source/core/output_buffers/ut_output_clob_buffer_tmp.sql
+++ b/source/core/output_buffers/ut_output_clob_buffer_tmp.sql
@@ -45,3 +45,5 @@ begin
end;
end;
/
+
+create sequence ut_output_clob_buffer_tmp_seq cache 20;
diff --git a/source/core/output_buffers/ut_output_clob_table_buffer.tpb b/source/core/output_buffers/ut_output_clob_table_buffer.tpb
index 66ff71c62..3d49ab08d 100644
--- a/source/core/output_buffers/ut_output_clob_table_buffer.tpb
+++ b/source/core/output_buffers/ut_output_clob_table_buffer.tpb
@@ -22,23 +22,12 @@ create or replace type body ut_output_clob_table_buffer is
return;
end;
- overriding member procedure close(self in out nocopy ut_output_clob_table_buffer) is
- pragma autonomous_transaction;
- begin
- self.last_message_id := self.last_message_id + 1;
- insert /*+ no_parallel */ into ut_output_clob_buffer_tmp(output_id, message_id, is_finished)
- values (self.output_id, self.last_message_id, 1);
- commit;
- self.is_closed := 1;
- end;
-
overriding member procedure send_line(self in out nocopy ut_output_clob_table_buffer, a_text varchar2, a_item_type varchar2 := null) is
pragma autonomous_transaction;
begin
if a_text is not null or a_item_type is not null then
- self.last_message_id := self.last_message_id + 1;
insert /*+ no_parallel */ into ut_output_clob_buffer_tmp(output_id, message_id, text, item_type)
- values (self.output_id, self.last_message_id, a_text, a_item_type);
+ values (self.output_id, ut_output_clob_buffer_tmp_seq.nextval, a_text, a_item_type);
end if;
commit;
end;
@@ -47,10 +36,9 @@ create or replace type body ut_output_clob_table_buffer is
pragma autonomous_transaction;
begin
insert /*+ no_parallel */ into ut_output_clob_buffer_tmp(output_id, message_id, text, item_type)
- select /*+ no_parallel */ self.output_id, self.last_message_id + rownum, t.column_value, a_item_type
+ select /*+ no_parallel */ self.output_id, ut_output_clob_buffer_tmp_seq.nextval, t.column_value, a_item_type
from table(a_text_list) t
where t.column_value is not null or a_item_type is not null;
- self.last_message_id := self.last_message_id + SQL%rowcount;
commit;
end;
@@ -58,98 +46,87 @@ create or replace type body ut_output_clob_table_buffer is
pragma autonomous_transaction;
begin
if a_text is not null and a_text != empty_clob() or a_item_type is not null then
- self.last_message_id := self.last_message_id + 1;
insert /*+ no_parallel */ into ut_output_clob_buffer_tmp(output_id, message_id, text, item_type)
- values (self.output_id, self.last_message_id, a_text, a_item_type);
+ values (self.output_id, ut_output_clob_buffer_tmp_seq.nextval, a_text, a_item_type);
end if;
commit;
end;
- overriding member function get_lines(a_initial_timeout natural := null, a_timeout_sec natural := null) return ut_output_data_rows pipelined is
- type t_rowid_tab is table of urowid;
- l_message_rowids t_rowid_tab;
- l_buffer_data ut_output_data_rows;
- l_finished_flags ut_integer_list;
- l_already_waited_for number(10,2) := 0;
- l_finished boolean := false;
- lc_init_wait_sec constant naturaln := coalesce(a_initial_timeout, 60 ); -- 1 minute
- lc_max_wait_sec constant naturaln := coalesce(a_timeout_sec, 60 * 60 * 4); -- 4 hours
- l_wait_for integer := lc_init_wait_sec;
- lc_short_sleep_time constant number(1,1) := 0.1; --sleep for 100 ms between checks
- lc_long_sleep_time constant number(1) := 1; --sleep for 1 s when waiting long
- lc_long_wait_time constant number(1) := 1; --waiting more than 1 sec
- l_sleep_time number(2,1) := lc_short_sleep_time;
- lc_bulk_limit constant integer := 5000;
- l_max_message_id integer := lc_bulk_limit;
-
- procedure remove_read_data(a_message_rowids t_rowid_tab) is
- pragma autonomous_transaction;
- begin
- forall i in 1 .. a_message_rowids.count
- delete from ut_output_clob_buffer_tmp a
- where rowid = a_message_rowids(i);
- commit;
- end;
-
- procedure remove_buffer_info is
- pragma autonomous_transaction;
- begin
- delete from ut_output_buffer_info_tmp a
- where a.output_id = self.output_id;
- commit;
- end;
-
+ overriding member function get_lines(a_initial_timeout number := null, a_timeout_sec number := null) return ut_output_data_rows pipelined is
+ lc_init_wait_sec constant number := coalesce(a_initial_timeout, 10 );
+ l_buffer_rowids ut_varchar2_rows;
+ l_buffer_data ut_output_data_rows;
+ l_finished_flags ut_integer_list;
+ l_already_waited_sec number(10,2) := 0;
+ l_finished boolean := false;
+ l_sleep_time number(2,1);
+ l_lock_status integer;
+ l_producer_started boolean := false;
+ l_producer_finished boolean := false;
+ procedure get_data_from_buffer_table(
+ a_buffer_data out nocopy ut_output_data_rows,
+ a_buffer_rowids out nocopy ut_varchar2_rows,
+ a_finished_flags out nocopy ut_integer_list
+ ) is
+ lc_bulk_limit constant integer := 5000;
begin
- while not l_finished loop
with ordered_buffer as (
- select /*+ no_parallel index(a) */ a.rowid, ut_output_data_row(a.text, a.item_type), is_finished
+ select /*+ no_parallel index(a) */ ut_output_data_row(a.text, a.item_type), rowidtochar(a.rowid), is_finished
from ut_output_clob_buffer_tmp a
where a.output_id = self.output_id
- and a.message_id <= l_max_message_id
+ and a.message_id <= (select min(message_id) from ut_output_clob_buffer_tmp o where o.output_id = self.output_id) + lc_bulk_limit
order by a.message_id
)
select /*+ no_parallel */ b.*
- bulk collect into l_message_rowids, l_buffer_data, l_finished_flags
+ bulk collect into a_buffer_data, a_buffer_rowids, a_finished_flags
from ordered_buffer b;
+ end;
- --nothing fetched from output, wait and try again
- if l_buffer_data.count = 0 then
- $if dbms_db_version.version >= 18 $then
- dbms_session.sleep(l_sleep_time);
- $else
- dbms_lock.sleep(l_sleep_time);
- $end
- l_already_waited_for := l_already_waited_for + l_sleep_time;
- if l_already_waited_for > lc_long_wait_time then
- l_sleep_time := lc_long_sleep_time;
- end if;
- else
- --reset wait time
- -- we wait lc_max_wait_sec for new message
- l_wait_for := lc_max_wait_sec;
- l_already_waited_for := 0;
- l_sleep_time := lc_short_sleep_time;
+ procedure remove_read_data(a_buffer_rowids ut_varchar2_rows) is
+ pragma autonomous_transaction;
+ begin
+ forall i in 1 .. a_buffer_rowids.count
+ delete from ut_output_clob_buffer_tmp a
+ where rowid = chartorowid(a_buffer_rowids(i));
+ commit;
+ end;
+
+ begin
+ while not l_finished loop
+
+ l_sleep_time := case when l_already_waited_sec >= 1 then 0.5 else 0.1 end;
+ l_lock_status := self.get_lock_status();
+ get_data_from_buffer_table( l_buffer_data, l_buffer_rowids, l_finished_flags );
+
+ if l_buffer_data.count > 0 then
+ l_already_waited_sec := 0;
for i in 1 .. l_buffer_data.count loop
if l_buffer_data(i).text is not null then
- pipe row(l_buffer_data(i));
+ pipe row( l_buffer_data(i) );
elsif l_finished_flags(i) = 1 then
l_finished := true;
exit;
end if;
end loop;
- remove_read_data(l_message_rowids);
- l_max_message_id := l_max_message_id + lc_bulk_limit;
- end if;
- if l_finished or l_already_waited_for >= l_wait_for then
- remove_buffer_info();
- if l_already_waited_for > 0 and l_already_waited_for >= l_wait_for then
- raise_application_error(
- ut_utils.gc_out_buffer_timeout,
- 'Timeout occurred while waiting for output data. Waited for: '||l_already_waited_for||' seconds.'
- );
- end if;
+ remove_read_data(l_buffer_rowids);
+ else
+ --nothing fetched from output, wait.
+ dbms_lock.sleep(l_sleep_time);
+ l_already_waited_sec := l_already_waited_sec + l_sleep_time;
end if;
+
+ l_producer_started := (l_lock_status <> 0 or l_buffer_data.count > 0) or l_producer_started;
+ l_producer_finished := (l_producer_started and l_lock_status = 0 and l_buffer_data.count = 0) or l_producer_finished;
+
+ l_finished :=
+ self.timeout_producer_not_finished(l_producer_finished, l_already_waited_sec, a_timeout_sec)
+ or self.timeout_producer_not_started(l_producer_started, l_already_waited_sec, lc_init_wait_sec)
+ or l_producer_finished
+ or l_finished;
+
end loop;
+
+ self.remove_buffer_info();
return;
end;
diff --git a/source/core/output_buffers/ut_output_clob_table_buffer.tps b/source/core/output_buffers/ut_output_clob_table_buffer.tps
index 7b98efaba..191e64c01 100644
--- a/source/core/output_buffers/ut_output_clob_table_buffer.tps
+++ b/source/core/output_buffers/ut_output_clob_table_buffer.tps
@@ -20,7 +20,6 @@ create or replace type ut_output_clob_table_buffer under ut_output_buffer_base (
overriding member procedure send_line(self in out nocopy ut_output_clob_table_buffer, a_text varchar2, a_item_type varchar2 := null),
overriding member procedure send_lines(self in out nocopy ut_output_clob_table_buffer, a_text_list ut_varchar2_rows, a_item_type varchar2 := null),
overriding member procedure send_clob(self in out nocopy ut_output_clob_table_buffer, a_text clob, a_item_type varchar2 := null),
- overriding member procedure close(self in out nocopy ut_output_clob_table_buffer),
- overriding member function get_lines(a_initial_timeout natural := null, a_timeout_sec natural := null) return ut_output_data_rows pipelined
+ overriding member function get_lines(a_initial_timeout number := null, a_timeout_sec number := null) return ut_output_data_rows pipelined
) not final
/
diff --git a/source/core/output_buffers/ut_output_table_buffer.tpb b/source/core/output_buffers/ut_output_table_buffer.tpb
index 1809a49d5..e8e2442a7 100644
--- a/source/core/output_buffers/ut_output_table_buffer.tpb
+++ b/source/core/output_buffers/ut_output_table_buffer.tpb
@@ -22,21 +22,11 @@ create or replace type body ut_output_table_buffer is
return;
end;
- overriding member procedure close(self in out nocopy ut_output_table_buffer) is
- pragma autonomous_transaction;
- begin
- self.last_message_id := self.last_message_id + 1;
- insert /*+ no_parallel */ into ut_output_buffer_tmp(output_id, message_id, is_finished)
- values (self.output_id, self.last_message_id, 1);
- commit;
- self.is_closed := 1;
- end;
-
overriding member procedure send_line(self in out nocopy ut_output_table_buffer, a_text varchar2, a_item_type varchar2 := null) is
pragma autonomous_transaction;
begin
if a_text is not null or a_item_type is not null then
- if length(a_text) > ut_utils.gc_max_storage_varchar2_len then
+ if lengthb(a_text) > ut_utils.gc_max_storage_varchar2_len then
self.send_lines(
ut_utils.convert_collection(
ut_utils.clob_to_table(a_text, ut_utils.gc_max_storage_varchar2_len)
@@ -44,9 +34,8 @@ create or replace type body ut_output_table_buffer is
a_item_type
);
else
- self.last_message_id := self.last_message_id + 1;
insert /*+ no_parallel */ into ut_output_buffer_tmp(output_id, message_id, text, item_type)
- values (self.output_id, self.last_message_id, a_text, a_item_type);
+ values (self.output_id, ut_output_buffer_tmp_seq.nextval, a_text, a_item_type);
end if;
commit;
end if;
@@ -56,10 +45,9 @@ create or replace type body ut_output_table_buffer is
pragma autonomous_transaction;
begin
insert /*+ no_parallel */ into ut_output_buffer_tmp(output_id, message_id, text, item_type)
- select /*+ no_parallel */ self.output_id, self.last_message_id + rownum, t.column_value, a_item_type
+ select /*+ no_parallel */ self.output_id, ut_output_buffer_tmp_seq.nextval, t.column_value, a_item_type
from table(a_text_list) t
where t.column_value is not null or a_item_type is not null;
- self.last_message_id := self.last_message_id + SQL%rowcount;
commit;
end;
@@ -67,7 +55,7 @@ create or replace type body ut_output_table_buffer is
pragma autonomous_transaction;
begin
if a_text is not null and a_text != empty_clob() or a_item_type is not null then
- if length(a_text) > ut_utils.gc_max_storage_varchar2_len then
+ if ut_utils.lengthb_clob(a_text) > ut_utils.gc_max_storage_varchar2_len then
self.send_lines(
ut_utils.convert_collection(
ut_utils.clob_to_table(a_text, ut_utils.gc_max_storage_varchar2_len)
@@ -75,99 +63,100 @@ create or replace type body ut_output_table_buffer is
a_item_type
);
else
- self.last_message_id := self.last_message_id + 1;
insert /*+ no_parallel */ into ut_output_buffer_tmp(output_id, message_id, text, item_type)
- values (self.output_id, self.last_message_id, a_text, a_item_type);
+ values (self.output_id, ut_output_buffer_tmp_seq.nextval, a_text, a_item_type);
end if;
commit;
end if;
end;
- overriding member function get_lines(a_initial_timeout natural := null, a_timeout_sec natural := null) return ut_output_data_rows pipelined is
- l_buffer_data ut_varchar2_rows;
- l_item_types ut_varchar2_rows;
- l_finished_flags ut_integer_list;
- l_already_waited_for number(10,2) := 0;
- l_finished boolean := false;
- lc_init_wait_sec constant naturaln := coalesce(a_initial_timeout, 60 ); -- 1 minute
- lc_max_wait_sec constant naturaln := coalesce(a_timeout_sec, 60 * 60 * 4); -- 4 hours
- l_wait_for integer := lc_init_wait_sec;
- lc_short_sleep_time constant number(1,1) := 0.1; --sleep for 100 ms between checks
- lc_long_sleep_time constant number(1) := 1; --sleep for 1 s when waiting long
- lc_long_wait_time constant number(1) := 1; --waiting more than 1 sec
- l_sleep_time number(2,1) := lc_short_sleep_time;
- lc_bulk_limit constant integer := 5000;
- l_max_message_id integer := lc_bulk_limit;
-
- procedure get_data_from_buffer(
- a_max_message_id integer,
- a_buffer_data out nocopy ut_varchar2_rows,
- a_item_types out nocopy ut_varchar2_rows,
- a_finished_flags out nocopy ut_integer_list
- ) is
- pragma autonomous_transaction;
- begin
- delete /*+ no_parallel */ from (
- select /*+ no_parallel */ *
- from ut_output_buffer_tmp o
- where o.output_id = self.output_id
- and o.message_id <= a_max_message_id
- order by o.message_id
- ) d
- returning d.text, d.item_type, d.is_finished
- bulk collect into a_buffer_data, a_item_types, a_finished_flags;
- commit;
-
- end;
-
- procedure remove_buffer_info is
- pragma autonomous_transaction;
- begin
- delete from ut_output_buffer_info_tmp a
- where a.output_id = self.output_id;
- commit;
- end;
+ overriding member procedure lines_to_dbms_output(self in ut_output_table_buffer, a_initial_timeout number := null, a_timeout_sec number := null) is
+ l_data sys_refcursor;
+ l_text ut_varchar2_rows;
+ l_item_type ut_varchar2_rows;
+ begin
+ l_data := self.get_lines_cursor(a_initial_timeout, a_timeout_sec);
+ loop
+ fetch l_data bulk collect into l_text, l_item_type limit 10000;
+ for idx in 1 .. l_text.count loop
+ dbms_output.put_line(l_text(idx));
+ end loop;
+ exit when l_data%notfound;
+ end loop;
+ close l_data;
+ end;
- begin
+ /* Important note.
+ This function code is almost duplicated between two types for performance reasons.
+ The pipe row clause is much faster on VARCHAR2 then it is on clob.
+ That is the key reason for two implementations.
+ */
+ overriding member function get_lines(a_initial_timeout number := null, a_timeout_sec number := null) return ut_output_data_rows pipelined is
+ lc_init_wait_sec constant number := coalesce(a_initial_timeout, 10 );
+ l_buffer_texts ut_varchar2_rows;
+ l_buffer_item_types ut_varchar2_rows;
+ l_finished_flags ut_integer_list;
+ l_already_waited_sec number(10,2) := 0;
+ l_finished boolean := false;
+ l_sleep_time number(2,1);
+ l_lock_status integer;
+ l_producer_started boolean := false;
+ l_producer_finished boolean := false;
+
+ procedure get_data_from_buffer_table(
+ a_buffer_texts out nocopy ut_varchar2_rows,
+ a_buffer_item_types out nocopy ut_varchar2_rows,
+ a_finished_flags out nocopy ut_integer_list
+ ) is
+ lc_bulk_limit constant integer := 20000;
+ pragma autonomous_transaction;
+ begin
+ delete /*+ no_parallel */ from (
+ select /*+ no_parallel */ *
+ from ut_output_buffer_tmp a
+ where a.output_id = self.output_id
+ and a.message_id <= (select min(message_id) from ut_output_buffer_tmp o where o.output_id = self.output_id) + lc_bulk_limit
+ order by a.message_id
+ ) d
+ returning d.text, d.item_type, d.is_finished
+ bulk collect into a_buffer_texts, a_buffer_item_types, a_finished_flags;
+ commit;
+ end;
+ begin
while not l_finished loop
- get_data_from_buffer( l_max_message_id, l_buffer_data, l_item_types, l_finished_flags);
- --nothing fetched from output, wait and try again
- if l_buffer_data.count = 0 then
- $if dbms_db_version.version >= 18 $then
- dbms_session.sleep(l_sleep_time);
- $else
- dbms_lock.sleep(l_sleep_time);
- $end
- l_already_waited_for := l_already_waited_for + l_sleep_time;
- if l_already_waited_for > lc_long_wait_time then
- l_sleep_time := lc_long_sleep_time;
- end if;
- else
- --reset wait time
- -- we wait lc_max_wait_sec for new message
- l_wait_for := lc_max_wait_sec;
- l_already_waited_for := 0;
- l_sleep_time := lc_short_sleep_time;
- for i in 1 .. l_buffer_data.count loop
- if l_buffer_data(i) is not null then
- pipe row(ut_output_data_row(l_buffer_data(i),l_item_types(i)));
+
+ l_sleep_time := case when l_already_waited_sec >= 1 then 0.5 else 0.1 end;
+ l_lock_status := self.get_lock_status();
+ get_data_from_buffer_table( l_buffer_texts, l_buffer_item_types, l_finished_flags );
+
+ if l_buffer_texts.count > 0 then
+ l_already_waited_sec := 0;
+ for i in 1 .. l_buffer_texts.count loop
+ if l_buffer_texts(i) is not null then
+ pipe row( ut_output_data_row(l_buffer_texts(i), l_buffer_item_types(i)) );
elsif l_finished_flags(i) = 1 then
l_finished := true;
exit;
end if;
end loop;
- l_max_message_id := l_max_message_id + lc_bulk_limit;
- end if;
- if l_finished or l_already_waited_for >= l_wait_for then
- remove_buffer_info();
- if l_already_waited_for > 0 and l_already_waited_for >= l_wait_for then
- raise_application_error(
- ut_utils.gc_out_buffer_timeout,
- 'Timeout occurred while waiting for output data. Waited for: '||l_already_waited_for||' seconds.'
- );
- end if;
+ else
+ --nothing fetched from output, wait.
+ dbms_lock.sleep(l_sleep_time);
+ l_already_waited_sec := l_already_waited_sec + l_sleep_time;
end if;
+
+ l_producer_started := (l_lock_status <> 0 or l_buffer_texts.count > 0) or l_producer_started;
+ l_producer_finished := (l_producer_started and l_lock_status = 0 and l_buffer_texts.count = 0) or l_producer_finished;
+
+ l_finished :=
+ self.timeout_producer_not_finished(l_producer_finished, l_already_waited_sec, a_timeout_sec)
+ or self.timeout_producer_not_started(l_producer_started, l_already_waited_sec, lc_init_wait_sec)
+ or l_producer_finished
+ or l_finished;
+
end loop;
+
+ self.remove_buffer_info();
return;
end;
diff --git a/source/core/output_buffers/ut_output_table_buffer.tps b/source/core/output_buffers/ut_output_table_buffer.tps
index 726b692f8..154ce4de6 100644
--- a/source/core/output_buffers/ut_output_table_buffer.tps
+++ b/source/core/output_buffers/ut_output_table_buffer.tps
@@ -20,7 +20,7 @@ create or replace type ut_output_table_buffer under ut_output_buffer_base (
overriding member procedure send_line(self in out nocopy ut_output_table_buffer, a_text varchar2, a_item_type varchar2 := null),
overriding member procedure send_lines(self in out nocopy ut_output_table_buffer, a_text_list ut_varchar2_rows, a_item_type varchar2 := null),
overriding member procedure send_clob(self in out nocopy ut_output_table_buffer, a_text clob, a_item_type varchar2 := null),
- overriding member procedure close(self in out nocopy ut_output_table_buffer),
- overriding member function get_lines(a_initial_timeout natural := null, a_timeout_sec natural := null) return ut_output_data_rows pipelined
+ overriding member procedure lines_to_dbms_output(self in ut_output_table_buffer, a_initial_timeout number := null, a_timeout_sec number := null),
+ overriding member function get_lines(a_initial_timeout number := null, a_timeout_sec number := null) return ut_output_data_rows pipelined
) not final
/
diff --git a/source/core/types/ut_executable_test.tpb b/source/core/types/ut_executable_test.tpb
index c5a7f29a1..fa5872e04 100644
--- a/source/core/types/ut_executable_test.tpb
+++ b/source/core/types/ut_executable_test.tpb
@@ -159,7 +159,7 @@ create or replace type body ut_executable_test as
if self.error_stack is null then
l_fail_message := 'Expected one of exceptions ('||l_expected_error_codes||') but nothing was raised.';
else
- l_actual_error_no := regexp_substr(self.error_stack, '^[a-zA-Z]{3}(-[0-9]+)', subexpression=>1);
+ l_actual_error_no := regexp_substr(self.error_stack, '^[[:alpha:]]{3}(-[0-9]+)', subexpression=>1);
if not l_actual_error_no member of a_expected_error_codes or l_actual_error_no is null then
l_fail_message := 'Actual: '||l_actual_error_no||' was expected to ';
if cardinality(a_expected_error_codes) > 1 then
diff --git a/source/core/types/ut_output_reporter_base.tpb b/source/core/types/ut_output_reporter_base.tpb
index f6bb27b94..48970be5a 100644
--- a/source/core/types/ut_output_reporter_base.tpb
+++ b/source/core/types/ut_output_reporter_base.tpb
@@ -41,13 +41,6 @@ create or replace type body ut_output_reporter_base is
return l_result;
end;
- overriding member procedure before_calling_run(self in out nocopy ut_output_reporter_base, a_run in ut_run) is
- l_output_table_buffer ut_output_table_buffer;
- begin
- (self as ut_reporter_base).before_calling_run(a_run);
- l_output_table_buffer := treat(self.output_buffer as ut_output_table_buffer);
- end;
-
member procedure print_text(self in out nocopy ut_output_reporter_base, a_text varchar2, a_item_type varchar2 := null) is
begin
self.output_buffer.send_line(a_text, a_item_type);
@@ -87,6 +80,7 @@ create or replace type body ut_output_reporter_base is
overriding member procedure on_initialize(self in out nocopy ut_output_reporter_base, a_run in ut_run) is
begin
+ self.output_buffer.lock_buffer();
self.output_buffer.send_line(null, 'initialize');
end;
diff --git a/source/core/types/ut_output_reporter_base.tps b/source/core/types/ut_output_reporter_base.tps
index 22f507f8d..21eed9957 100644
--- a/source/core/types/ut_output_reporter_base.tps
+++ b/source/core/types/ut_output_reporter_base.tps
@@ -20,8 +20,7 @@ create or replace type ut_output_reporter_base under ut_reporter_base(
member procedure init(self in out nocopy ut_output_reporter_base, a_self_type varchar2, a_output_buffer ut_output_buffer_base := null),
overriding member procedure set_reporter_id(self in out nocopy ut_output_reporter_base, a_reporter_id raw),
member function set_reporter_id(self in ut_output_reporter_base, a_reporter_id raw) return ut_output_reporter_base,
- overriding member procedure before_calling_run(self in out nocopy ut_output_reporter_base, a_run in ut_run),
-
+
member procedure print_text(self in out nocopy ut_output_reporter_base, a_text varchar2, a_item_type varchar2 := null),
member procedure print_text_lines(self in out nocopy ut_output_reporter_base, a_text_lines ut_varchar2_rows, a_item_type varchar2 := null),
member procedure print_clob(self in out nocopy ut_output_reporter_base, a_clob clob, a_item_type varchar2 := null),
diff --git a/source/core/types/ut_run.tpb b/source/core/types/ut_run.tpb
index cdafb30fc..660c88791 100644
--- a/source/core/types/ut_run.tpb
+++ b/source/core/types/ut_run.tpb
@@ -24,7 +24,7 @@ create or replace type body ut_run as
a_test_file_mappings ut_file_mappings := null,
a_client_character_set varchar2 := null,
a_random_test_order_seed positive := null,
- a_run_tags ut_varchar2_rows := null
+ a_run_tags varchar2 := null
) return self as result is
begin
self.run_paths := a_run_paths;
diff --git a/source/core/types/ut_run.tps b/source/core/types/ut_run.tps
index debf847cd..1878a2d46 100644
--- a/source/core/types/ut_run.tps
+++ b/source/core/types/ut_run.tps
@@ -21,7 +21,7 @@ create or replace type ut_run under ut_suite_item (
project_name varchar2(4000),
items ut_suite_items,
run_paths ut_varchar2_list,
- run_tags ut_varchar2_rows,
+ run_tags varchar2(4000),
coverage_options ut_coverage_options,
test_file_mappings ut_file_mappings,
client_character_set varchar2(100),
@@ -34,7 +34,7 @@ create or replace type ut_run under ut_suite_item (
a_test_file_mappings ut_file_mappings := null,
a_client_character_set varchar2 := null,
a_random_test_order_seed positive := null,
- a_run_tags ut_varchar2_rows := null
+ a_run_tags varchar2 := null
) return self as result,
overriding member procedure mark_as_skipped(self in out nocopy ut_run,a_skip_reason in varchar2),
overriding member function do_execute(self in out nocopy ut_run) return boolean,
diff --git a/source/core/types/ut_stack.tpb b/source/core/types/ut_stack.tpb
new file mode 100644
index 000000000..b5f4e8747
--- /dev/null
+++ b/source/core/types/ut_stack.tpb
@@ -0,0 +1,58 @@
+create or replace type body ut_stack as
+ /*
+ utPLSQL - Version 3
+ Copyright 2016 - 2023 utPLSQL Project
+
+ Licensed under the Apache License, Version 2.0 (the "License"):
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+ constructor function ut_stack( self in out nocopy ut_stack) return self as result is
+ begin
+ self.tokens := ut_varchar2_list();
+ self.top := 0;
+ return;
+ end ut_stack;
+
+ member function peek(self in out nocopy ut_stack) return varchar2 is
+ l_token varchar2(32767);
+ begin
+ if self.tokens.count =0 or self.tokens is null then
+ l_token := null;
+ else
+ l_token := self.tokens(self.tokens.last);
+ end if;
+ return l_token;
+ end;
+
+ member procedure push(self in out nocopy ut_stack, a_token varchar2) is
+ begin
+ self.tokens.extend;
+ self.tokens(self.tokens.last) := a_token;
+ self.top := self.tokens.count;
+ end push;
+
+ member procedure pop(self in out nocopy ut_stack,a_cnt in integer default 1) is
+ begin
+ self.tokens.trim(a_cnt);
+ self.top := self.tokens.count;
+ end pop;
+
+ member function pop(self in out nocopy ut_stack) return varchar2 is
+ l_token varchar2(32767) := self.tokens(self.tokens.last);
+ begin
+ self.pop();
+ return l_token;
+ end;
+end;
+/
+
diff --git a/source/core/types/ut_stack.tps b/source/core/types/ut_stack.tps
new file mode 100644
index 000000000..23112fdde
--- /dev/null
+++ b/source/core/types/ut_stack.tps
@@ -0,0 +1,26 @@
+create or replace type ut_stack as object (
+ top integer,
+ tokens ut_varchar2_list,
+ /*
+ utPLSQL - Version 3
+ Copyright 2016 - 2023 utPLSQL Project
+
+ Licensed under the Apache License, Version 2.0 (the "License"):
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+ constructor function ut_stack( self in out nocopy ut_stack) return self as result,
+ member function peek(self in out nocopy ut_stack) return varchar2,
+ member procedure push(self in out nocopy ut_stack, a_token varchar2),
+ member procedure pop(self in out nocopy ut_stack,a_cnt in integer default 1),
+ member function pop(self in out nocopy ut_stack) return varchar2
+)
+/
\ No newline at end of file
diff --git a/source/core/ut_expectation_processor.pkb b/source/core/ut_expectation_processor.pkb
index 77b734b30..c165a9ee5 100644
--- a/source/core/ut_expectation_processor.pkb
+++ b/source/core/ut_expectation_processor.pkb
@@ -159,17 +159,17 @@ create or replace package body ut_expectation_processor as
-- when 11g and 12c reports only package name
function cut_header_and_expectations( a_stack varchar2 ) return varchar2 is
begin
- return regexp_substr( a_stack, '(.*\.(UT_EQUAL|UT_BE_WITHIN[A-Z0-9#_$]*|UT_EXPECTATION[A-Z0-9#_$]*|UT|UTASSERT2?)(\.[A-Z0-9#_$]+)?\s+)+((.|\s)*)', 1, 1, 'm', 4);
+ return regexp_substr( a_stack, '(.*\.(UT_EQUAL|UT_BE_WITHIN[[:alnum:]$#_]*|UT_EXPECTATION[[:alnum:]$#_]*|UT|UTASSERT2?)(\.[[:alnum:]$#_]+)?\s+)+((.|\s)*)', 1, 1, 'm', 4);
end;
function cut_address_columns( a_stack varchar2 ) return varchar2 is
begin
- return regexp_replace( a_stack, '^(0x)?[0-9a-f]+\s+', '', 1, 0, 'mi' );
+ return regexp_replace( a_stack, '^(0x)?[[:digit:]abcdef]+\s+', '', 1, 0, 'mi' );
end;
function cut_framework_stack( a_stack varchar2 ) return varchar2 is
begin
return regexp_replace(
a_stack,
- '[0-9]+\s+anonymous\s+block\s+[0-9]+\s+package\s+body\s+sys\.dbms_sql(\.execute)?\s+[0-9]+\s+[0-9_$#a-z ]+\.ut_executable.*',
+ '[0-9]+\s+anonymous\s+block\s+[0-9]+\s+package\s+body\s+sys\.dbms_sql(\.execute)?\s+[0-9]+\s+[[:alnum:]_$# ]+\.ut_executable.*',
'',
1, 1, 'mni'
);
@@ -178,7 +178,7 @@ create or replace package body ut_expectation_processor as
begin
return regexp_replace(
a_stack,
- '([0-9]+)\s+(.* )?((anonymous block)|(([0-9_$#a-z]+\.[0-9_$#a-z]+(\.([0-9_$#a-z])+)?)))',
+ '([0-9]+)\s+(.* )?((anonymous block)|(([[:alnum:]$#_]+\.[[:alnum:]$#_]+(\.([[:alnum:]$#_])+)?)))',
'at "\3", line \1', 1, 0, 'i'
);
end;
@@ -190,8 +190,8 @@ create or replace package body ut_expectation_processor as
l_caller_stack_line := regexp_substr(l_call_stack,'^(.*)');
if l_caller_stack_line like '%.%' then
l_line_no := to_number( regexp_substr( l_caller_stack_line, ', line (\d+)', subexpression => 1 ) );
- l_owner := regexp_substr( l_caller_stack_line, 'at "([A-Za-z0-9$#_]+)\.(([A-Za-z0-9$#_]+)(\.([A-Za-z0-9$#_]+))?)", line (\d+)', subexpression => 1 );
- l_object_name := regexp_substr( l_caller_stack_line, 'at "([A-Za-z0-9$#_]+)\.(([A-Za-z0-9$#_]+)(\.([A-Za-z0-9$#_]+))?)", line (\d+)', subexpression => 3 );
+ l_owner := regexp_substr( l_caller_stack_line, 'at "([[:alnum:]$#_]+)\.(([[:alnum:]$#_]+)(\.([[:alnum:]$#_]+))?)", line (\d+)', subexpression => 1 );
+ l_object_name := regexp_substr( l_caller_stack_line, 'at "([[:alnum:]$#_]+)\.(([[:alnum:]$#_]+)(\.([[:alnum:]$#_]+))?)", line (\d+)', subexpression => 3 );
l_result :=
l_caller_stack_line || ' ' || rtrim(ut_metadata.get_source_definition_line(l_owner, l_object_name, l_line_no),chr(10))
|| replace( l_call_stack, l_caller_stack_line );
diff --git a/source/core/ut_metadata.pkb b/source/core/ut_metadata.pkb
index 700c0efb0..360b7b97d 100644
--- a/source/core/ut_metadata.pkb
+++ b/source/core/ut_metadata.pkb
@@ -304,7 +304,7 @@ create or replace package body ut_metadata as
begin
l_result := regexp_substr(
a_full_object_name,
- '^([A-Za-z0-9$#_]+|".*?")\.([A-Za-z0-9$#_]+|".*?")', subexpression => 2
+ '^([[:alnum:]$#_]+|".*?")\.([[:alnum:]$#_]+|".*?")', subexpression => 2
);
if not l_result like '"%"' then
l_result := upper(l_result);
diff --git a/source/core/ut_suite_cache_manager.pkb b/source/core/ut_suite_cache_manager.pkb
index d3e832a9b..6d621c339 100644
--- a/source/core/ut_suite_cache_manager.pkb
+++ b/source/core/ut_suite_cache_manager.pkb
@@ -88,7 +88,7 @@ create or replace package body ut_suite_cache_manager is
end;
function group_paths_by_schema(a_paths ut_varchar2_list) return ut_path_items is
- c_package_path_regex constant varchar2(100) := '^([A-Za-z0-9$#_]+)(\.([A-Za-z0-9$#_\*]+))?(\.([A-Za-z0-9$#_\*]+))?$';
+ c_package_path_regex constant varchar2(100) := '^([[:alnum:]$#_]+)(\.([[:alnum:]$#_\*]+))?(\.([[:alnum:]$#_\*]+))?$';
l_results ut_path_items := ut_path_items();
l_path_item ut_path_item;
i pls_integer;
@@ -157,7 +157,7 @@ create or replace package body ut_suite_cache_manager is
from schema_paths sp left outer join ut_suite_cache c on
( c.object_owner = upper(sp.schema_name)
--and c.path like replace(sp.suite_path,'*','%'))
- and regexp_like(c.path,'^'||replace(sp.suite_path,'*','[A-Za-z0-9$#_]*')))
+ and regexp_like(c.path,'^'||replace(sp.suite_path,'*','[[:alnum:]$#_]*')))
where sp.suite_path is not null and instr(sp.suite_path,'*') > 0
),
straigth_suite_paths as (
@@ -220,55 +220,7 @@ create or replace package body ut_suite_cache_manager is
and c.name = nvl(upper(sp.procedure_name),c.name)))) where r_num =1;
return l_suite_items;
end;
-
- /*
- Having a base set of suites we will do a further filter down if there are
- any tags defined.
- */
- function get_tags_suites (
- a_suite_items ut_suite_cache_rows,
- a_tags ut_varchar2_rows
- ) return ut_suite_cache_rows is
- l_suite_tags ut_suite_cache_rows := ut_suite_cache_rows();
- l_include_tags ut_varchar2_rows;
- l_exclude_tags ut_varchar2_rows;
- begin
-
- select /*+ no_parallel */ column_value
- bulk collect into l_include_tags
- from table(a_tags)
- where column_value not like '-%';
-
- select /*+ no_parallel */ ltrim(column_value,'-')
- bulk collect into l_exclude_tags
- from table(a_tags)
- where column_value like '-%';
-
- with included_tags as (
- select c.path as path
- from table(a_suite_items) c
- where c.tags multiset intersect l_include_tags is not empty or l_include_tags is empty
- ),
- excluded_tags as (
- select c.path as path
- from table(a_suite_items) c
- where c.tags multiset intersect l_exclude_tags is not empty
- )
- select value(c) as obj
- bulk collect into l_suite_tags
- from table(a_suite_items) c
- where exists (
- select 1 from included_tags t
- where t.path||'.' like c.path || '.%' /*all ancestors and self*/
- or c.path||'.' like t.path || '.%' /*all descendants and self*/
- )
- and not exists (
- select 1 from excluded_tags t
- where c.path||'.' like t.path || '.%' /*all descendants and self*/
- );
- return l_suite_tags;
- end;
-
+
/*
We will sort a suites in hierarchical structure.
Sorting from bottom to top so when we consolidate
@@ -321,31 +273,18 @@ create or replace package body ut_suite_cache_manager is
end;
function get_cached_suite_rows(
- a_schema_paths ut_path_items,
- a_random_seed positive := null,
- a_tags ut_varchar2_rows := null
+ a_suites_filtered ut_suite_cache_rows
) return ut_suite_cache_rows is
l_results ut_suite_cache_rows := ut_suite_cache_rows();
- l_suite_items ut_suite_cache_rows := ut_suite_cache_rows();
- l_schema_paths ut_path_items;
- l_tags ut_varchar2_rows := coalesce(a_tags,ut_varchar2_rows());
begin
- l_schema_paths := a_schema_paths;
- l_suite_items := get_suite_items(a_schema_paths);
- if l_tags.count > 0 then
- l_suite_items := get_tags_suites(l_suite_items,l_tags);
- end if;
-
- open c_get_bulk_cache_suite(l_suite_items);
+ open c_get_bulk_cache_suite(a_suites_filtered);
fetch c_get_bulk_cache_suite bulk collect into l_results;
close c_get_bulk_cache_suite;
return l_results;
end;
-
-
function get_schema_parse_time(a_schema_name varchar2) return timestamp result_cache is
l_cache_parse_time timestamp;
begin
@@ -492,7 +431,7 @@ create or replace package body ut_suite_cache_manager is
a_schema_paths ut_path_items
) return ut_suite_cache_rows is
begin
- return get_cached_suite_rows( a_schema_paths );
+ return get_cached_suite_rows(get_suite_items(a_schema_paths));
end;
function get_suite_items_info(
diff --git a/source/core/ut_suite_cache_manager.pks b/source/core/ut_suite_cache_manager.pks
index 974babca5..81b1e0136 100644
--- a/source/core/ut_suite_cache_manager.pks
+++ b/source/core/ut_suite_cache_manager.pks
@@ -55,11 +55,9 @@ create or replace package ut_suite_cache_manager authid definer is
* Not to be used publicly. Used internally for building suites at runtime.
*/
function get_cached_suite_rows(
- a_schema_paths ut_path_items,
- a_random_seed positive := null,
- a_tags ut_varchar2_rows := null
+ a_suites_filtered ut_suite_cache_rows
) return ut_suite_cache_rows;
-
+
function get_schema_paths(a_paths in ut_varchar2_list) return ut_path_items;
/*
@@ -74,6 +72,10 @@ create or replace package ut_suite_cache_manager authid definer is
function get_suite_items_info(
a_suite_cache_items ut_suite_cache_rows
) return ut_suite_items_info;
+
+ function get_suite_items (
+ a_schema_paths ut_path_items
+ ) return ut_suite_cache_rows;
/*
* Retrieves list of cached suite packages.
@@ -94,6 +96,6 @@ create or replace package ut_suite_cache_manager authid definer is
a_package_name varchar2,
a_procedure_name varchar2
) return boolean;
-
+
end ut_suite_cache_manager;
/
diff --git a/source/core/ut_suite_manager.pkb b/source/core/ut_suite_manager.pkb
index 86f68c076..c418de638 100644
--- a/source/core/ut_suite_manager.pkb
+++ b/source/core/ut_suite_manager.pkb
@@ -32,7 +32,7 @@ create or replace package body ut_suite_manager is
for i in 1 .. a_paths.count loop
l_path := a_paths(i);
if l_path is null or not (
- regexp_like(l_path, '^[A-Za-z0-9$#_\*]+(\.[A-Za-z0-9$#_\*]+){0,2}$') or regexp_like(l_path, '^([A-Za-z0-9$#_]+)?:[A-Za-z0-9$#_\*]+(\.[A-Za-z0-9$#_\*]+)*$')) then
+ regexp_like(l_path, '^[[:alnum:]$#_\*]+(\.[[:alnum:]$#_\*]+){0,2}$') or regexp_like(l_path, '^([[:alnum:]$#_]+)?:[[:alnum:]$#_\*]+(\.[[:alnum:]$#_\*]+)*$')) then
raise_application_error(ut_utils.gc_invalid_path_format, 'Invalid path format: ' || nvl(l_path, 'NULL'));
end if;
end loop;
@@ -61,9 +61,9 @@ create or replace package body ut_suite_manager is
for i in 1 .. a_paths.count loop
--if path is suite-path
- if regexp_like(a_paths(i), '^([A-Za-z0-9$#_]+)?:') then
+ if regexp_like(a_paths(i), '^([[:alnum:]$#_]+)?:') then
--get schema name / path
- l_schema := regexp_substr(a_paths(i), '^([A-Za-z0-9$#_]+)?:',subexpression => 1);
+ l_schema := regexp_substr(a_paths(i), '^([[:alnum:]$#_]+)?:',subexpression => 1);
-- transform ":path1[.path2]" to "schema:path1[.path2]"
if l_schema is not null then
l_schema := sys.dbms_assert.schema_name(upper(l_schema));
@@ -78,7 +78,7 @@ create or replace package body ut_suite_manager is
-- Object name or procedure is allowed to have filter char
-- However this is not allowed on schema
begin
- l_object := regexp_substr(a_paths(i), '^[A-Za-z0-9$#_\*]+');
+ l_object := regexp_substr(a_paths(i), '^[[:alnum:]$#_\*]+');
l_schema := sys.dbms_assert.schema_name(upper(l_object));
exception
when sys.dbms_assert.invalid_schema_name then
@@ -352,20 +352,18 @@ create or replace package body ut_suite_manager is
function get_cached_suite_data(
a_schema_paths ut_path_items,
a_random_seed positive,
- a_tags ut_varchar2_rows := null,
+ a_tags varchar2 := null,
a_skip_all_objects boolean := false
) return t_cached_suites_cursor is
- l_unfiltered_rows ut_suite_cache_rows;
- l_filtered_rows ut_suite_cache_rows;
- l_result t_cached_suites_cursor;
+ l_unfiltered_rows ut_suite_cache_rows;
+ l_tag_filter_applied ut_suite_cache_rows;
+ l_filtered_rows ut_suite_cache_rows;
+ l_result t_cached_suites_cursor;
begin
- l_unfiltered_rows := ut_suite_cache_manager.get_cached_suite_rows(
- a_schema_paths,
- a_random_seed,
- a_tags
- );
+ l_unfiltered_rows := ut_suite_cache_manager.get_suite_items(a_schema_paths);
- l_filtered_rows := get_filtered_cursor(l_unfiltered_rows,a_skip_all_objects);
+ l_tag_filter_applied := ut_suite_tag_filter.apply(l_unfiltered_rows,a_tags);
+ l_filtered_rows := get_filtered_cursor(ut_suite_cache_manager.get_cached_suite_rows(l_tag_filter_applied),a_skip_all_objects);
reconcile_paths_and_suites(a_schema_paths,l_filtered_rows);
ut_suite_cache_manager.sort_and_randomize_tests(l_filtered_rows,a_random_seed);
@@ -451,7 +449,7 @@ create or replace package body ut_suite_manager is
a_schema_paths ut_path_items,
a_suites in out nocopy ut_suite_items,
a_random_seed positive,
- a_tags ut_varchar2_rows := null
+ a_tags varchar2 := null
) is
begin
reconstruct_from_cache(
@@ -528,7 +526,7 @@ create or replace package body ut_suite_manager is
a_paths ut_varchar2_list,
a_suites out nocopy ut_suite_items,
a_random_seed positive := null,
- a_tags ut_varchar2_rows := ut_varchar2_rows()
+ a_tags varchar2 := null
) is
l_paths ut_varchar2_list := a_paths;
l_schema_names ut_varchar2_rows;
diff --git a/source/core/ut_suite_manager.pks b/source/core/ut_suite_manager.pks
index 65b3c0654..07539139a 100644
--- a/source/core/ut_suite_manager.pks
+++ b/source/core/ut_suite_manager.pks
@@ -53,7 +53,7 @@ create or replace package ut_suite_manager authid current_user is
a_paths in ut_varchar2_list,
a_suites out nocopy ut_suite_items,
a_random_seed in positive := null,
- a_tags ut_varchar2_rows := ut_varchar2_rows()
+ a_tags in varchar2 := null
);
/**
diff --git a/source/core/ut_suite_tag_filter.pkb b/source/core/ut_suite_tag_filter.pkb
new file mode 100644
index 000000000..2d9436301
--- /dev/null
+++ b/source/core/ut_suite_tag_filter.pkb
@@ -0,0 +1,295 @@
+create or replace package body ut_suite_tag_filter is
+ /*
+ utPLSQL - Version 3
+ Copyright 2016 - 2023 utPLSQL Project
+
+ Licensed under the Apache License, Version 2.0 (the "License"):
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+ /**
+ * Constants use in postfix and infix transformations
+ */
+ gc_operators constant ut_varchar2_list := ut_varchar2_list('|','&','!');
+ gc_unary_operators constant ut_varchar2_list := ut_varchar2_list('!'); -- right side associative operator
+ gc_binary_operators constant ut_varchar2_list := ut_varchar2_list('|','&'); -- left side associative operator
+ gc_reserved_tag_words constant ut_varchar2_list := ut_varchar2_list('none','any');
+ gc_tags_column_name constant varchar2(250) := 'tags';
+ gc_exception_msg constant varchar2(200) := 'Invalid tag expression';
+
+ type t_precedence_table is table of number index by varchar2(1);
+ g_precedence t_precedence_table;
+
+ function tokenize_tags_string(a_tags in varchar2) return ut_varchar2_list is
+ l_tags_tokens ut_varchar2_list := ut_varchar2_list();
+ begin
+ --Tokenize a string into operators and tags
+ select regexp_substr(a_tags,'([^!()|&]+)|([!()|&])', 1, level) as string_parts
+ bulk collect into l_tags_tokens
+ from dual connect by regexp_substr (a_tags, '([^!()|&]+)|([!()|&])', 1, level) is not null;
+
+ return l_tags_tokens;
+ end;
+
+ /*
+ To support a legact tag notation
+ , = OR
+ - = NOT
+ we will perform a replace of that characters into
+ new notation.
+ | = OR
+ & = AND
+ ! = NOT
+ */
+ function replace_legacy_tag_notation(a_tags varchar2
+ ) return varchar2 is
+ l_tags ut_varchar2_list := ut_utils.string_to_table(a_tags,',');
+ l_tags_include varchar2(4000);
+ l_tags_exclude varchar2(4000);
+ l_return_tag varchar2(4000);
+ begin
+ if instr(a_tags,',') > 0 or instr(a_tags,'-') > 0 then
+
+ select '('||listagg( t.column_value,'|')
+ within group( order by column_value)||')'
+ into l_tags_include
+ from table(l_tags) t
+ where t.column_value not like '-%';
+
+ select '('||listagg( replace(t.column_value,'-','!'),' & ')
+ within group( order by column_value)||')'
+ into l_tags_exclude
+ from table(l_tags) t
+ where t.column_value like '-%';
+
+
+ l_return_tag:=
+ case
+ when l_tags_include <> '()' and l_tags_exclude <> '()'
+ then l_tags_include || ' & ' || l_tags_exclude
+ when l_tags_include <> '()'
+ then l_tags_include
+ when l_tags_exclude <> '()'
+ then l_tags_exclude
+ end;
+ else
+ l_return_tag := a_tags;
+ end if;
+ return l_return_tag;
+ end;
+
+ /*
+ https://stackoverflow.com/questions/29634992/shunting-yard-validate-expression
+ */
+ function shunt_logical_expression(a_tags in ut_varchar2_list) return ut_varchar2_list is
+ l_operator_stack ut_stack := ut_stack();
+ l_rnp_tokens ut_varchar2_list := ut_varchar2_list();
+ l_token varchar2(32767);
+ l_expect_operand boolean := true;
+ l_expect_operator boolean := false;
+ l_idx pls_integer;
+ begin
+ l_idx := a_tags.first;
+ --Exuecute modified shunting algorithm
+ WHILE (l_idx is not null) loop
+ l_token := a_tags(l_idx);
+ if (l_token member of gc_operators and l_token member of gc_binary_operators) then
+ if not(l_expect_operator) then
+ raise_application_error(ut_utils.gc_invalid_tag_expression, gc_exception_msg);
+ end if;
+ while l_operator_stack.top > 0 and (g_precedence(l_operator_stack.peek) > g_precedence(l_token)) loop
+ l_rnp_tokens.extend;
+ l_rnp_tokens(l_rnp_tokens.last) := l_operator_stack.pop;
+ end loop;
+ l_operator_stack.push(a_tags(l_idx));
+ l_expect_operand := true;
+ l_expect_operator:= false;
+ elsif (l_token member of gc_operators and l_token member of gc_unary_operators) then
+ if not(l_expect_operand) then
+ raise_application_error(ut_utils.gc_invalid_tag_expression, gc_exception_msg);
+ end if;
+ l_operator_stack.push(a_tags(l_idx));
+ l_expect_operand := true;
+ l_expect_operator:= false;
+ elsif l_token = '(' then
+ if not(l_expect_operand) then
+ raise_application_error(ut_utils.gc_invalid_tag_expression, gc_exception_msg);
+ end if;
+ l_operator_stack.push(a_tags(l_idx));
+ l_expect_operand := true;
+ l_expect_operator:= false;
+ elsif l_token = ')' then
+ if not(l_expect_operator) then
+ raise_application_error(ut_utils.gc_invalid_tag_expression, gc_exception_msg);
+ end if;
+ while l_operator_stack.peek <> '(' loop
+ l_rnp_tokens.extend;
+ l_rnp_tokens(l_rnp_tokens.last) := l_operator_stack.pop;
+ end loop;
+ l_operator_stack.pop; --Pop the open bracket and discard it
+ l_expect_operand := false;
+ l_expect_operator:= true;
+ else
+ if not(l_expect_operand) then
+ raise_application_error(ut_utils.gc_invalid_tag_expression, gc_exception_msg);
+ end if;
+ l_rnp_tokens.extend;
+ l_rnp_tokens(l_rnp_tokens.last) :=l_token;
+ l_expect_operator := true;
+ l_expect_operand := false;
+ end if;
+
+ l_idx := a_tags.next(l_idx);
+ end loop;
+
+ while l_operator_stack.peek is not null loop
+ if l_operator_stack.peek in ('(',')') then
+ raise_application_error(ut_utils.gc_invalid_tag_expression, gc_exception_msg);
+ end if;
+ l_rnp_tokens.extend;
+ l_rnp_tokens(l_rnp_tokens.last):=l_operator_stack.pop;
+ end loop;
+
+ return l_rnp_tokens;
+ end shunt_logical_expression;
+
+ function conv_postfix_to_infix_sql(a_postfix_exp in ut_varchar2_list,a_tags_column_name in varchar2)
+ return varchar2 is
+ l_infix_stack ut_stack := ut_stack();
+ l_right_side varchar2(32767);
+ l_left_side varchar2(32767);
+ l_infix_exp varchar2(32767);
+ l_member_token varchar2(20) := ' member of '||a_tags_column_name;
+ l_idx pls_integer;
+ begin
+ l_idx := a_postfix_exp.first;
+ while ( l_idx is not null) loop
+ --If the token we got is a none or any keyword
+ if a_postfix_exp(l_idx) member of gc_reserved_tag_words then
+
+ l_infix_stack.push(
+ case
+ when a_postfix_exp(l_idx) = 'none' then '('||a_tags_column_name||' is empty or '||a_tags_column_name||' is null)'
+ else a_tags_column_name||' is not empty'
+ end
+ );
+ --If token is operand but also single tag
+ elsif regexp_count(a_postfix_exp(l_idx),'[!()|&]') = 0 then
+ l_infix_stack.push(q'[']'||a_postfix_exp(l_idx)||q'[']'||l_member_token);
+ --If token is unary operator not
+ elsif a_postfix_exp(l_idx) member of gc_unary_operators then
+ l_right_side := l_infix_stack.pop;
+ l_infix_exp := a_postfix_exp(l_idx)||'('||l_right_side||')';
+ l_infix_stack.push(l_infix_exp);
+ --If token is binary operator
+ elsif a_postfix_exp(l_idx) member of gc_binary_operators then
+ l_right_side := l_infix_stack.pop;
+ l_left_side := l_infix_stack.pop;
+ l_infix_exp := '('||l_left_side||a_postfix_exp(l_idx)||l_right_side||')';
+ l_infix_stack.push(l_infix_exp);
+ end if;
+ l_idx := a_postfix_exp.next(l_idx);
+ end loop;
+
+ return l_infix_stack.pop;
+ end conv_postfix_to_infix_sql;
+
+ function create_where_filter(a_tags varchar2
+ ) return varchar2 is
+ l_tags varchar2(4000);
+ begin
+ l_tags := replace(replace_legacy_tag_notation(a_tags),' ');
+ l_tags := conv_postfix_to_infix_sql(shunt_logical_expression(tokenize_tags_string(l_tags)),gc_tags_column_name);
+ l_tags := replace(l_tags, '|',' or ');
+ l_tags := replace(l_tags ,'&',' and ');
+ l_tags := replace(l_tags ,'!','not');
+ return l_tags;
+ end;
+
+
+ /*
+ Having a base set of suites we will do a further filter down if there are
+ any tags defined.
+ */
+ function get_tags_suites (
+ a_suite_items ut_suite_cache_rows,
+ a_tags varchar2
+ ) return ut_suite_cache_rows is
+ l_suite_tags ut_suite_cache_rows := ut_suite_cache_rows();
+ l_sql varchar2(32000);
+ l_tags varchar2(4000):= create_where_filter(a_tags);
+ begin
+ l_sql :=
+ q'[
+with
+ suites_mv as (
+ select c.id,value(c) as obj,c.path as path,c.self_type,c.object_owner,c.tags as ]'||gc_tags_column_name||q'[
+ from table(:suite_items) c
+ ),
+ suites_matching_expr as (
+ select c.id,c.path as path,c.self_type,c.object_owner,c.tags
+ from suites_mv c
+ where c.self_type in ('UT_SUITE','UT_CONTEXT')
+ and ]'||l_tags||q'[
+ ),
+ tests_matching_expr as (
+ select c.id,c.path as path,c.self_type,c.object_owner,c.tags as ]'||gc_tags_column_name||q'[
+ from suites_mv c where c.self_type in ('UT_TEST')
+ and ]'||l_tags||q'[
+ ),
+ tests_with_tags_inh_from_suite as (
+ select c.id,c.self_type,c.path,c.tags multiset union distinct t.tags as ]'||gc_tags_column_name||q'[ ,c.object_owner
+ from suites_mv c join suites_matching_expr t
+ on (c.path||'.' like t.path || '.%' /*all descendants and self*/ and c.object_owner = t.object_owner)
+ ),
+ tests_with_tags_prom_to_suite as (
+ select c.id,c.self_type,c.path,c.tags multiset union distinct t.tags as ]'||gc_tags_column_name||q'[ ,c.object_owner
+ from suites_mv c join tests_matching_expr t
+ on (t.path||'.' like c.path || '.%' /*all ancestors and self*/ and c.object_owner = t.object_owner)
+ )
+ select obj from suites_mv c,
+ (select id,row_number() over (partition by id order by id) r_num from
+ (select id
+ from tests_with_tags_prom_to_suite tst
+ where ]'||l_tags||q'[
+ union all
+ select id from tests_with_tags_inh_from_suite tst
+ where ]'||l_tags||q'[
+ )
+ ) t where c.id = t.id and r_num = 1 ]';
+ execute immediate l_sql bulk collect into l_suite_tags using a_suite_items;
+ return l_suite_tags;
+ end;
+
+ function apply(
+ a_unfiltered_rows ut_suite_cache_rows,
+ a_tags varchar2 := null
+ ) return ut_suite_cache_rows is
+ l_suite_items ut_suite_cache_rows := a_unfiltered_rows;
+ begin
+ if length(a_tags) > 0 then
+ l_suite_items := get_tags_suites(l_suite_items,a_tags);
+ end if;
+
+ return l_suite_items;
+ end;
+
+begin
+ --Define operators precedence
+ g_precedence('!'):=4;
+ g_precedence('&'):=3;
+ g_precedence('|'):=2;
+ g_precedence(')'):=1;
+ g_precedence('('):=1;
+
+end ut_suite_tag_filter;
+/
diff --git a/source/core/ut_suite_tag_filter.pks b/source/core/ut_suite_tag_filter.pks
new file mode 100644
index 000000000..e824ae275
--- /dev/null
+++ b/source/core/ut_suite_tag_filter.pks
@@ -0,0 +1,55 @@
+create or replace package ut_suite_tag_filter authid definer is
+ /*
+ utPLSQL - Version 3
+ Copyright 2016 - 2023 utPLSQL Project
+
+ Licensed under the Apache License, Version 2.0 (the "License"):
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+ /**
+ * Package that will filter suites by tags
+ *
+ */
+
+ /*
+ * Return table of tokens character by character
+ */
+ function tokenize_tags_string(a_tags in varchar2) return ut_varchar2_list;
+
+ /*
+ * Function that uses Dijkstra algorithm to parse mathematical and logical expression
+ * and return a list of elements in Reverse Polish Notation ( postfix )
+ * As part of execution it will validate expression.
+ */
+ function shunt_logical_expression(a_tags in ut_varchar2_list) return ut_varchar2_list;
+
+ /*
+ * Function that converts postfix notation into infix and creating a string of sql filter
+ * that checking a tags collections for tags according to posted logic.
+ */
+ function conv_postfix_to_infix_sql(a_postfix_exp in ut_varchar2_list,a_tags_column_name in varchar2)
+ return varchar2;
+
+ /*
+ * Generates a part where clause sql
+ */
+ function create_where_filter(a_tags varchar2)
+ return varchar2;
+
+ function apply(
+ a_unfiltered_rows ut_suite_cache_rows,
+ a_tags varchar2 := null
+ ) return ut_suite_cache_rows;
+
+end ut_suite_tag_filter;
+/
diff --git a/source/core/ut_utils.pkb b/source/core/ut_utils.pkb
index 162e50f8f..81d47221b 100644
--- a/source/core/ut_utils.pkb
+++ b/source/core/ut_utils.pkb
@@ -19,11 +19,12 @@ create or replace package body ut_utils is
/**
* Constants regex used to validate XML name
*/
- gc_invalid_first_xml_char constant varchar2(50) := '[^_a-zA-Z]';
- gc_invalid_xml_char constant varchar2(50) := '[^_a-zA-Z0-9\.-]';
- gc_full_valid_xml_name constant varchar2(50) := '^([_a-zA-Z])([_a-zA-Z0-9\.-])*$';
+ gc_invalid_first_xml_char constant varchar2(50) := '[^_[:alpha:]]';
+ gc_invalid_xml_char constant varchar2(50) := '[^_[:alnum:]\.-]';
+ gc_full_valid_xml_name constant varchar2(50) := '^([[:alpha:]])([_[:alnum:]\.-])*$';
gc_owner_hash constant integer(11) := dbms_utility.get_hash_value( ut_owner(), 0, power(2,31)-1);
+
function surround_with(a_value varchar2, a_quote_char varchar2) return varchar2 is
begin
return case when a_quote_char is not null then a_quote_char||a_value||a_quote_char else a_value end;
@@ -91,8 +92,8 @@ create or replace package body ut_utils is
a_max_output_len in number := gc_max_output_string_length
) return varchar2 is
l_result varchar2(32767);
- c_length constant integer := coalesce( length( a_value ), 0 );
- c_max_input_string_length constant integer := a_max_output_len - coalesce( length( a_quote_char ) * 2, 0 );
+ c_length constant integer := coalesce( lengthb( a_value ), 0 );
+ c_max_input_string_length constant integer := a_max_output_len - coalesce( lengthb( a_quote_char ) * 2, 0 );
c_overflow_substr_len constant integer := c_max_input_string_length - gc_more_data_string_len;
begin
if c_length = 0 then
@@ -111,8 +112,8 @@ create or replace package body ut_utils is
a_max_output_len in number := gc_max_output_string_length
) return varchar2 is
l_result varchar2(32767);
- c_length constant integer := coalesce(dbms_lob.getlength(a_value), 0);
- c_max_input_string_length constant integer := a_max_output_len - coalesce( length( a_quote_char ) * 2, 0 );
+ c_length constant integer := coalesce(ut_utils.lengthb_clob(a_value), 0);
+ c_max_input_string_length constant integer := a_max_output_len - coalesce( lengthb( a_quote_char ) * 2, 0 );
c_overflow_substr_len constant integer := c_max_input_string_length - gc_more_data_string_len;
begin
if a_value is null then
@@ -134,7 +135,7 @@ create or replace package body ut_utils is
) return varchar2 is
l_result varchar2(32767);
c_length constant integer := coalesce(dbms_lob.getlength(a_value), 0);
- c_max_input_string_length constant integer := a_max_output_len - coalesce( length( a_quote_char ) * 2, 0 );
+ c_max_input_string_length constant integer := a_max_output_len - coalesce( lengthb( a_quote_char ) * 2, 0 );
c_overflow_substr_len constant integer := c_max_input_string_length - gc_more_data_string_len;
begin
if a_value is null then
@@ -411,7 +412,7 @@ create or replace package body ut_utils is
if a_list is null then
a_list := ut_varchar2_rows();
end if;
- if length(a_item) > gc_max_storage_varchar2_len then
+ if lengthb(a_item) > gc_max_storage_varchar2_len then
append_to_list(
a_list,
ut_utils.convert_collection(
@@ -467,7 +468,7 @@ create or replace package body ut_utils is
l_result := ut_varchar2_rows();
for i in 1 .. a_collection.count loop
l_result.extend();
- l_result(i) := substr(a_collection(i),1,gc_max_storage_varchar2_len);
+ l_result(i) := substrb(a_collection(i),1,gc_max_storage_varchar2_len);
end loop;
end if;
return l_result;
@@ -570,6 +571,7 @@ create or replace package body ut_utils is
end loop;
exit when l_lines_data%notfound;
end loop;
+ close l_lines_data;
execute immediate 'truncate table ut_dbms_output_cache';
commit;
end;
@@ -990,5 +992,37 @@ create or replace package body ut_utils is
end;
+ /*
+ * Inspired by
+ * https://stackoverflow.com/a/48782891
+ */
+ function lengthb_clob( a_clob clob) return integer is
+ l_blob blob;
+ l_desc_offset PLS_INTEGER := 1;
+ l_src_offset PLS_INTEGER := 1;
+ l_lang PLS_INTEGER := 0;
+ l_warning PLS_INTEGER := 0;
+ l_result integer;
+ begin
+ if a_clob = empty_clob() then
+ l_result := 0;
+ elsif a_clob is not null then
+ dbms_lob.createtemporary(l_blob,true);
+ dbms_lob.converttoblob
+ ( l_blob
+ , a_clob
+ , dbms_lob.getlength(a_clob)
+ , l_desc_offset
+ , l_src_offset
+ , dbms_lob.default_csid
+ , l_lang
+ , l_warning
+ );
+ l_result := length(l_blob);
+ dbms_lob.freetemporary(l_blob);
+ end if;
+ return l_result;
+ end;
+
end ut_utils;
/
diff --git a/source/core/ut_utils.pks b/source/core/ut_utils.pks
index 86f25f8fa..463aa1604 100644
--- 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.13.4069';
+ gc_version constant varchar2(50) := 'v3.1.14.4197-develop';
subtype t_executable_type is varchar2(30);
gc_before_all constant t_executable_type := 'beforeall';
@@ -121,6 +121,10 @@ create or replace package ut_utils authid definer is
ex_failed_open_cur exception;
gc_failed_open_cur constant pls_integer := -20218;
pragma exception_init (ex_failed_open_cur, -20218);
+
+ ex_invalid_tag_expression exception;
+ gc_invalid_tag_expression constant pls_integer := -20219;
+ pragma exception_init (ex_invalid_tag_expression, -20219);
gc_max_storage_varchar2_len constant integer := 4000;
gc_max_output_string_length constant integer := 4000;
@@ -472,6 +476,11 @@ create or replace package ut_utils authid definer is
* Return value of interval in plain english
*/
function interval_to_text(a_interval yminterval_unconstrained) return varchar2;
+
+ /*
+ * Return length of CLOB in bytes. Null for NULL
+ */
+ function lengthb_clob( a_clob clob) return integer;
end ut_utils;
/
diff --git a/source/create_grants.sql b/source/create_grants.sql
index 8a44ab371..0e9f46cc5 100644
--- a/source/create_grants.sql
+++ b/source/create_grants.sql
@@ -123,6 +123,7 @@ grant execute on &&ut3_owner..ut_console_reporter_base to &ut3_user;
grant execute on &&ut3_owner..ut_output_buffer_base to &ut3_user;
grant execute on &&ut3_owner..ut_output_table_buffer to &ut3_user;
grant execute on &&ut3_owner..ut_output_clob_table_buffer to &ut3_user;
+grant execute on &&ut3_owner..ut_output_bulk_buffer to &ut3_user;
--needed internally for selecting from annotation objects within packages that use invoker rights
grant execute on &&ut3_owner..ut_annotation_objs_cache_info to &ut3_user;
diff --git a/source/create_utplsql_owner.sql b/source/create_utplsql_owner.sql
index 64bcb52ce..d7e4f3040 100644
--- a/source/create_utplsql_owner.sql
+++ b/source/create_utplsql_owner.sql
@@ -31,15 +31,7 @@ create user &ut3_owner_schema identified by "&ut3_password" default tablespace &
grant create session, create sequence, create procedure, create type, create table, create view, create synonym to &ut3_owner_schema;
-begin
- $if dbms_db_version.version < 18 $then
- execute immediate 'grant execute on dbms_lock to &ut3_owner_schema';
- $else
- null;
- $end
-end;
-/
-
+grant execute on dbms_lock to &ut3_owner_schema;
grant execute on dbms_crypto to &ut3_owner_schema;
grant execute on dbms_lob to &ut3_owner_schema;
grant execute on dbms_xmlgen to &ut3_owner_schema;
diff --git a/source/expectations/matchers/ut_contain.tpb b/source/expectations/matchers/ut_contain.tpb
index 7591925f5..c9691f731 100644
--- a/source/expectations/matchers/ut_contain.tpb
+++ b/source/expectations/matchers/ut_contain.tpb
@@ -47,6 +47,7 @@ create or replace type body ut_contain as
overriding member function run_matcher_negated(self in out nocopy ut_contain, a_actual ut_data_value) return boolean is
begin
+ self.negated();
return run_matcher(a_actual);
end;
diff --git a/source/expectations/ut_expectation.tpb b/source/expectations/ut_expectation.tpb
index a78c57eb7..309759d48 100644
--- a/source/expectations/ut_expectation.tpb
+++ b/source/expectations/ut_expectation.tpb
@@ -686,7 +686,7 @@ create or replace type body ut_expectation as
member procedure not_to_contain(self in ut_expectation, a_expected sys_refcursor) is
begin
- self.not_to( ut_contain(a_expected).negated() );
+ self.not_to( ut_contain(a_expected));
end;
member procedure to_contain(self in ut_expectation, a_expected anydata) is
@@ -696,7 +696,7 @@ create or replace type body ut_expectation as
member procedure not_to_contain(self in ut_expectation, a_expected anydata) is
begin
- self.not_to( ut_contain(a_expected).negated() );
+ self.not_to( ut_contain(a_expected));
end;
member function to_be_within(a_dist number) return ut_be_within is
diff --git a/source/install.sql b/source/install.sql
index 6f3c16801..827213e6c 100644
--- a/source/install.sql
+++ b/source/install.sql
@@ -50,6 +50,8 @@ create or replace context &&ut3_owner._info using &&ut3_owner..ut_session_contex
@@install_component.sql 'core/types/ut_key_value_pairs.tps'
@@install_component.sql 'core/types/ut_reporter_info.tps'
@@install_component.sql 'core/types/ut_reporters_info.tps'
+@@install_component.sql 'core/types/ut_stack.tps'
+@@install_component.sql 'core/types/ut_stack.tpb'
@@install_component.sql 'core/ut_utils.pks'
@@install_component.sql 'core/ut_metadata.pks'
@@install_component.sql 'core/ut_savepoint_seq.sql'
@@ -120,6 +122,8 @@ create or replace context &&ut3_owner._info using &&ut3_owner..ut_session_contex
@@install_component.sql 'core/output_buffers/ut_output_table_buffer.tpb'
@@install_component.sql 'core/output_buffers/ut_output_clob_table_buffer.tps'
@@install_component.sql 'core/output_buffers/ut_output_clob_table_buffer.tpb'
+@@install_component.sql 'core/output_buffers/ut_output_bulk_buffer.tps'
+@@install_component.sql 'core/output_buffers/ut_output_bulk_buffer.tpb'
@@install_component.sql 'core/types/ut_output_reporter_base.tps'
@@ -151,6 +155,8 @@ create or replace context &&ut3_owner._info using &&ut3_owner..ut_session_contex
@@install_component.sql 'core/ut_suite_cache_seq.sql'
@@install_component.sql 'core/ut_suite_cache.sql'
+@@install_component.sql 'core/ut_suite_tag_filter.pks'
+@@install_component.sql 'core/ut_suite_tag_filter.pkb'
@@install_component.sql 'core/ut_suite_cache_manager.pks'
@@install_component.sql 'core/ut_suite_cache_manager.pkb'
@@install_component.sql 'core/ut_suite_builder.pks'
diff --git a/source/reporters/ut_coverage_cobertura_reporter.tpb b/source/reporters/ut_coverage_cobertura_reporter.tpb
index 48082a6d4..d833ac0aa 100644
--- a/source/reporters/ut_coverage_cobertura_reporter.tpb
+++ b/source/reporters/ut_coverage_cobertura_reporter.tpb
@@ -20,7 +20,7 @@ create or replace type body ut_coverage_cobertura_reporter is
self in out nocopy ut_coverage_cobertura_reporter
) return self as result is
begin
- self.init($$plsql_unit);
+ self.init($$plsql_unit,ut_output_bulk_buffer());
return;
end;
@@ -29,11 +29,19 @@ create or replace type body ut_coverage_cobertura_reporter is
l_report_lines ut_varchar2_list;
l_coverage_data ut_coverage.t_coverage;
- function get_lines_xml(a_unit_coverage ut_coverage.t_unit_coverage) return clob is
+ function get_line_rate(a_lines_covered in integer, a_lines_hit in integer) return varchar2 is
+ begin
+ return to_char(round((case a_lines_covered when 0 then 0 else a_lines_covered/a_lines_hit end), 17), rpad('FM0.0',20,'9') , 'NLS_NUMERIC_CHARACTERS=''. ''');
+ end;
+
+ procedure get_lines_xml(a_unit_coverage ut_coverage.t_unit_coverage,
+ a_lines_result in out nocopy clob, a_lines_hits out number, a_lines_total out number) is
l_file_part varchar2(32767);
l_result clob;
l_line_no binary_integer;
l_pct integer;
+ l_lines_hits integer := 0;
+ l_lines_total integer := 0;
begin
dbms_lob.createtemporary(l_result, true);
l_line_no := a_unit_coverage.lines.first;
@@ -41,11 +49,14 @@ create or replace type body ut_coverage_cobertura_reporter is
for i in 1 .. a_unit_coverage.total_lines loop
ut_utils.append_to_clob(l_result, ''||chr(10));
end loop;
+ l_lines_hits:=0;
+ l_lines_total:= a_unit_coverage.total_lines;
else
while l_line_no is not null loop
if a_unit_coverage.lines(l_line_no).executions = 0 then
l_file_part := ''||chr(10);
else
+ l_lines_hits:= l_lines_hits+1;
l_file_part := ''
+ ''
);
ut_utils.append_to_list(
@@ -129,13 +150,13 @@ create or replace type body ut_coverage_cobertura_reporter is
ut_utils.append_to_list(
l_result,
''
+ ||dbms_xmlgen.convert(l_unit)||'" line-rate="'||get_line_rate(l_line_hits,l_line_total)||'" branch-rate="0.0" complexity="0.0">'
);
ut_utils.append_to_list(l_result, '');
-
- ut_utils.append_to_list( l_result, get_lines_xml(a_coverage_data.objects(l_unit)) );
-
+ ut_utils.append_to_list( l_result,l_lines_xml);
+ dbms_lob.freetemporary(l_lines_xml);
+
ut_utils.append_to_list(l_result, c_lines_footer);
ut_utils.append_to_list(l_result, c_class_footer);
ut_utils.append_to_list(l_result, c_classes_footer);
diff --git a/source/reporters/ut_coverage_html_reporter.tpb b/source/reporters/ut_coverage_html_reporter.tpb
index c88c91a80..b1f9f6651 100644
--- a/source/reporters/ut_coverage_html_reporter.tpb
+++ b/source/reporters/ut_coverage_html_reporter.tpb
@@ -22,7 +22,7 @@ create or replace type body ut_coverage_html_reporter is
a_html_report_assets_path varchar2 := null
) return self as result is
begin
- self.init($$plsql_unit);
+ self.init($$plsql_unit,ut_output_bulk_buffer());
self.project_name := a_project_name;
assets_path := nvl(a_html_report_assets_path, ut_coverage_report_html_helper.get_default_html_assets_path());
return;
diff --git a/source/reporters/ut_coverage_sonar_reporter.tpb b/source/reporters/ut_coverage_sonar_reporter.tpb
index 8ee78dc24..1861a9be3 100644
--- a/source/reporters/ut_coverage_sonar_reporter.tpb
+++ b/source/reporters/ut_coverage_sonar_reporter.tpb
@@ -20,7 +20,7 @@ create or replace type body ut_coverage_sonar_reporter is
self in out nocopy ut_coverage_sonar_reporter
) return self as result is
begin
- self.init($$plsql_unit);
+ self.init($$plsql_unit,ut_output_bulk_buffer());
return;
end;
@@ -84,6 +84,12 @@ create or replace type body ut_coverage_sonar_reporter is
end;
begin
+-- execute immediate 'alter session set statistics_level=all';
+-- dbms_hprof.start_profiling(
+-- location => 'PLSHPROF_DIR'
+-- , filename => 'profiler_utPLSQL_run_on_'||$$plsql_unit||'_'||rawtohex(self.id)||'.txt'
+-- );
+--
ut_coverage.coverage_stop();
self.print_text_lines(
@@ -92,6 +98,7 @@ create or replace type body ut_coverage_sonar_reporter is
a_run
)
);
+-- dbms_hprof.stop_profiling;
end;
overriding member function get_description return varchar2 as
diff --git a/source/reporters/ut_coveralls_reporter.tpb b/source/reporters/ut_coveralls_reporter.tpb
index 3a54aa7f7..14672303e 100644
--- a/source/reporters/ut_coveralls_reporter.tpb
+++ b/source/reporters/ut_coveralls_reporter.tpb
@@ -20,7 +20,7 @@ create or replace type body ut_coveralls_reporter is
self in out nocopy ut_coveralls_reporter
) return self as result is
begin
- self.init($$plsql_unit);
+ self.init($$plsql_unit,ut_output_bulk_buffer());
return;
end;
diff --git a/source/reporters/ut_junit_reporter.tpb b/source/reporters/ut_junit_reporter.tpb
index 44affa030..3bceb52a4 100644
--- a/source/reporters/ut_junit_reporter.tpb
+++ b/source/reporters/ut_junit_reporter.tpb
@@ -18,7 +18,7 @@ create or replace type body ut_junit_reporter is
constructor function ut_junit_reporter(self in out nocopy ut_junit_reporter) return self as result is
begin
- self.init($$plsql_unit);
+ self.init($$plsql_unit,ut_output_bulk_buffer());
return;
end;
diff --git a/source/reporters/ut_sonar_test_reporter.tpb b/source/reporters/ut_sonar_test_reporter.tpb
index a3ec72241..7c46879d2 100644
--- a/source/reporters/ut_sonar_test_reporter.tpb
+++ b/source/reporters/ut_sonar_test_reporter.tpb
@@ -20,7 +20,7 @@ create or replace type body ut_sonar_test_reporter is
self in out nocopy ut_sonar_test_reporter
) return self as result is
begin
- self.init($$plsql_unit);
+ self.init($$plsql_unit,ut_output_bulk_buffer());
return;
end;
diff --git a/source/reporters/ut_teamcity_reporter.tpb b/source/reporters/ut_teamcity_reporter.tpb
index 95bea32b8..e05dc994f 100644
--- a/source/reporters/ut_teamcity_reporter.tpb
+++ b/source/reporters/ut_teamcity_reporter.tpb
@@ -108,23 +108,28 @@ create or replace type body ut_teamcity_reporter is
ut_teamcity_reporter_helper.test_failed(
a_test_name => l_test_full_name,
a_msg => 'Error occured',
- a_details =>
- trim(l_std_err_msg)
- || case when a_test.failed_expectations is not null
- and a_test.failed_expectations.count>0
- then a_test.failed_expectations(1).message end
+ a_details => trim(l_std_err_msg)
)
);
+ for i in 1 .. a_test.failed_expectations.count loop
+ ut_utils.append_to_list(
+ l_results,
+ ut_teamcity_reporter_helper.test_failed(
+ a_test_name => l_test_full_name,
+ a_msg => a_test.failed_expectations(i).description,
+ a_details => a_test.failed_expectations(i).message )
+ );
+ end loop;
elsif a_test.failed_expectations is not null and a_test.failed_expectations.count > 0 then
- -- Teamcity supports only a single failure message
-
- ut_utils.append_to_list(
- l_results,
- ut_teamcity_reporter_helper.test_failed(
- a_test_name => l_test_full_name,
- a_msg => a_test.failed_expectations(a_test.failed_expectations.first).description,
- a_details => a_test.failed_expectations(a_test.failed_expectations.first).message )
- );
+ for i in 1 .. a_test.failed_expectations.count loop
+ ut_utils.append_to_list(
+ l_results,
+ ut_teamcity_reporter_helper.test_failed(
+ a_test_name => l_test_full_name,
+ a_msg => a_test.failed_expectations(i).description,
+ a_details => a_test.failed_expectations(i).message )
+ );
+ end loop;
elsif a_test.result = ut_utils.gc_failure then
ut_utils.append_to_list(
l_results,
diff --git a/source/reporters/ut_teamcity_reporter_helper.pkb b/source/reporters/ut_teamcity_reporter_helper.pkb
index 84a9d19e8..1633d10aa 100644
--- a/source/reporters/ut_teamcity_reporter_helper.pkb
+++ b/source/reporters/ut_teamcity_reporter_helper.pkb
@@ -73,8 +73,6 @@ create or replace package body ut_teamcity_reporter_helper is
'true'
when false then
'false'
- else
- null
end;
l_props('flowId') := a_flow_id;
return message('testStarted', l_props);
diff --git a/source/reporters/ut_tfs_junit_reporter.tpb b/source/reporters/ut_tfs_junit_reporter.tpb
index 710c3bc7f..5e36aad17 100644
--- a/source/reporters/ut_tfs_junit_reporter.tpb
+++ b/source/reporters/ut_tfs_junit_reporter.tpb
@@ -18,7 +18,7 @@ create or replace type body ut_tfs_junit_reporter is
constructor function ut_tfs_junit_reporter(self in out nocopy ut_tfs_junit_reporter) return self as result is
begin
- self.init($$plsql_unit);
+ self.init($$plsql_unit,ut_output_bulk_buffer());
return;
end;
@@ -51,11 +51,12 @@ create or replace type body ut_tfs_junit_reporter is
return regexp_substr(a_path_with_name, '(.*)\.' ||a_name||'$',subexpression=>1);
end;
- procedure print_test_results(a_test ut_test) is
+ function add_test_results(a_test ut_test) return ut_varchar2_rows is
l_results ut_varchar2_rows := ut_varchar2_rows();
begin
- self.print_text('');
+
/*
According to specs :
- A failure is a test which the code has explicitly failed by using the mechanisms for that purpose.
@@ -83,64 +84,87 @@ create or replace type body ut_tfs_junit_reporter is
ut_utils.append_to_list( l_results, '');
- self.print_text_lines(l_results);
+ return l_results;
end;
- procedure print_suite_results(a_suite ut_logical_suite, a_suite_id in out nocopy integer) is
+ procedure print_suite_results(a_suite ut_logical_suite, a_suite_id in out nocopy integer, a_nested_tests in out nocopy ut_varchar2_rows) is
l_tests_count integer := a_suite.results_count.disabled_count + a_suite.results_count.success_count +
a_suite.results_count.failure_count + a_suite.results_count.errored_count;
l_results ut_varchar2_rows := ut_varchar2_rows();
l_suite ut_suite;
l_outputs clob;
l_errors ut_varchar2_list;
- begin
-
+ l_tests ut_varchar2_list;
+ begin
for i in 1 .. a_suite.items.count loop
- if a_suite.items(i) is of(ut_logical_suite) then
- print_suite_results(treat(a_suite.items(i) as ut_logical_suite), a_suite_id);
+ if a_suite.items(i) is of(ut_suite_context) then
+ print_suite_results(treat(a_suite.items(i) as ut_suite_context), a_suite_id, a_nested_tests);
+ elsif a_suite.items(i) is of(ut_suite) then
+ print_suite_results(treat(a_suite.items(i) as ut_suite), a_suite_id, a_nested_tests);
+ elsif a_suite.items(i) is of(ut_logical_suite) then
+ print_suite_results(treat(a_suite.items(i) as ut_logical_suite), a_suite_id, a_nested_tests);
end if;
end loop;
-
- if a_suite is of(ut_suite) then
- a_suite_id := a_suite_id + 1;
- self.print_text('');
- self.print_text('');
+ --Due to fact tha TFS and junit5 accepts only flat structure we have to report in suite level only.
+ if a_suite is of(ut_suite_context) then
for i in 1 .. a_suite.items.count loop
if a_suite.items(i) is of(ut_test) then
- print_test_results(treat(a_suite.items(i) as ut_test));
+ ut_utils.append_to_list( a_nested_tests,(add_test_results(treat(a_suite.items(i) as ut_test))));
end if;
end loop;
- l_suite := treat(a_suite as ut_suite);
- l_outputs := l_suite.get_serveroutputs();
- if l_outputs is not null and l_outputs != empty_clob() then
- ut_utils.append_to_list( l_results, '');
- ut_utils.append_to_list( l_results, ut_utils.to_cdata( l_suite.get_serveroutputs() ) );
- ut_utils.append_to_list( l_results, '');
- else
- ut_utils.append_to_list( l_results, '');
- end if;
-
- l_errors := l_suite.get_error_stack_traces();
- if l_errors is not empty then
- ut_utils.append_to_list( l_results, '');
- ut_utils.append_to_list( l_results, ut_utils.to_cdata( ut_utils.convert_collection( l_errors ) ) );
- ut_utils.append_to_list( l_results, '');
- else
- ut_utils.append_to_list( l_results, '');
- end if;
- ut_utils.append_to_list( l_results, '');
-
- self.print_text_lines(l_results);
+ elsif a_suite is of(ut_suite) then
+ for i in 1 .. a_suite.items.count loop
+ if a_suite.items(i) is of(ut_test) then
+ ut_utils.append_to_list( a_nested_tests,(add_test_results(treat(a_suite.items(i) as ut_test))));
+ end if;
+ end loop;
+ --TFS doesnt report on empty test suites, however all we want to make sure is that we dont pring parents suites
+ -- showing test count but not tests.
+ if (a_nested_tests.count > 0 and l_tests_count > 0) or (a_nested_tests.count = 0 and l_tests_count = 0) then
+ a_suite_id := a_suite_id + 1;
+ ut_utils.append_to_list( l_results,'');
+ ut_utils.append_to_list( l_results,'');
+ ut_utils.append_to_list(l_results,a_nested_tests);
+ l_suite := treat(a_suite as ut_suite);
+ l_outputs := l_suite.get_serveroutputs();
+ if l_outputs is not null and l_outputs != empty_clob() then
+ ut_utils.append_to_list( l_results, '');
+ ut_utils.append_to_list( l_results, ut_utils.to_cdata( l_suite.get_serveroutputs() ) );
+ ut_utils.append_to_list( l_results, '');
+ else
+ ut_utils.append_to_list( l_results, '');
+ end if;
+
+ l_errors := l_suite.get_error_stack_traces();
+ if l_errors is not empty then
+ ut_utils.append_to_list( l_results, '');
+ ut_utils.append_to_list( l_results, ut_utils.to_cdata( ut_utils.convert_collection( l_errors ) ) );
+ ut_utils.append_to_list( l_results, '');
+ else
+ ut_utils.append_to_list( l_results, '');
+ end if;
+ ut_utils.append_to_list( l_results, '');
+
+ self.print_text_lines(l_results);
+ --We have resolved a context and we now reset value.
+ a_nested_tests := ut_varchar2_rows();
+ end if;
end if;
end;
+
+ procedure get_suite_results(a_suite ut_logical_suite, a_suite_id in out nocopy integer) is
+ l_nested_tests ut_varchar2_rows:= ut_varchar2_rows();
+ begin
+ print_suite_results(a_suite, l_suite_id,l_nested_tests);
+ end;
begin
l_suite_id := 0;
self.print_text(ut_utils.get_xml_header(a_run.client_character_set));
self.print_text('');
for i in 1 .. a_run.items.count loop
- print_suite_results(treat(a_run.items(i) as ut_logical_suite), l_suite_id);
+ get_suite_results(treat(a_run.items(i) as ut_logical_suite), l_suite_id);
end loop;
self.print_text('');
end;
diff --git a/source/reporters/ut_xunit_reporter.tpb b/source/reporters/ut_xunit_reporter.tpb
index eab0c8a3c..4612fb640 100644
--- a/source/reporters/ut_xunit_reporter.tpb
+++ b/source/reporters/ut_xunit_reporter.tpb
@@ -18,7 +18,7 @@ create or replace type body ut_xunit_reporter is
constructor function ut_xunit_reporter(self in out nocopy ut_xunit_reporter) return self as result is
begin
- self.init($$plsql_unit);
+ self.init($$plsql_unit,ut_output_bulk_buffer());
return;
end;
diff --git a/source/uninstall_objects.sql b/source/uninstall_objects.sql
index 571d187a2..dde9a824f 100644
--- a/source/uninstall_objects.sql
+++ b/source/uninstall_objects.sql
@@ -95,6 +95,8 @@ drop package ut_suite_manager;
drop package ut_suite_builder;
+drop package ut_suite_tag_filter;
+
drop package ut_suite_cache_manager;
drop table ut_suite_cache purge;
@@ -267,6 +269,8 @@ end;
drop package ut_utils;
+drop type ut_stack force;
+
drop sequence ut_savepoint_seq;
drop type ut_documentation_reporter force;
@@ -323,12 +327,18 @@ drop type ut_output_table_buffer force;
drop type ut_output_clob_table_buffer force;
+drop type ut_output_bulk_buffer force;
+
drop type ut_output_buffer_base force;
drop table ut_output_buffer_tmp purge;
+drop sequence ut_output_buffer_tmp_seq;
+
drop table ut_output_clob_buffer_tmp purge;
+drop sequence ut_output_clob_buffer_tmp_seq;
+
drop table ut_output_buffer_info_tmp purge;
drop package ut_session_context;
diff --git a/test/install_ut3_tester_tests.sql b/test/install_ut3_tester_tests.sql
index 8163a39f2..cc96b2b64 100644
--- a/test/install_ut3_tester_tests.sql
+++ b/test/install_ut3_tester_tests.sql
@@ -17,6 +17,7 @@ alter session set plsql_optimize_level=0;
@@ut3_tester/core/annotations/test_annot_disabled_reason.pks
@@ut3_tester/core/expectations/test_expectation_processor.pks
@@ut3_tester/core/test_ut_utils.pks
+@@ut3_tester/core/test_ut_suite_tag_filter.pks
@@ut3_tester/core/test_ut_test.pks
@@ut3_tester/core/test_ut_suite.pks
@@ut3_tester/core/test_ut_executable.pks
@@ -35,6 +36,7 @@ alter session set plsql_optimize_level=0;
@@ut3_tester/core/annotations/test_annot_disabled_reason.pkb
@@ut3_tester/core/expectations/test_expectation_processor.pkb
@@ut3_tester/core/test_ut_utils.pkb
+@@ut3_tester/core/test_ut_suite_tag_filter.pkb
@@ut3_tester/core/test_ut_test.pkb
@@ut3_tester/core/test_ut_suite.pkb
@@ut3_tester/core/test_ut_executable.pkb
diff --git a/test/ut3_tester/core/test_output_buffer.pkb b/test/ut3_tester/core/test_output_buffer.pkb
index 2e8b3337c..317e7e3d5 100644
--- a/test/ut3_tester/core/test_output_buffer.pkb
+++ b/test/ut3_tester/core/test_output_buffer.pkb
@@ -16,12 +16,13 @@ create or replace package body test_output_buffer is
|| chr(13) || chr(10) || to_clob(lpad('a text', 31000, ',a text')) || to_clob(lpad('a text', 31000, ',a text'));
l_expected_item_type := lpad('some item type',1000,'-');
--Act
+ l_buffer.lock_buffer();
l_buffer.send_clob(l_expected_text, l_expected_item_type);
l_buffer.close();
select text, item_type
into l_actual_text, l_actual_item_type
- from table(l_buffer.get_lines(0,0));
+ from table(l_buffer.get_lines(0.1,0.1));
--Assert
ut.expect(l_actual_text).to_equal(l_expected_text);
@@ -32,7 +33,14 @@ create or replace package body test_output_buffer is
ut.expect(l_remaining).to_equal(0);
end;
-
+
+ procedure test_wait_for_producer is
+ l_buffer ut3_develop.ut_output_buffer_base;
+ begin
+ l_buffer := ut3_develop.ut_output_clob_table_buffer();
+ ut.expect( l_buffer.get_lines_cursor(0.1) ).to_be_empty();
+ end;
+
procedure test_doesnt_send_on_null_text is
l_cur sys_refcursor;
l_result integer;
@@ -48,8 +56,8 @@ create or replace package body test_output_buffer is
procedure test_doesnt_send_on_null_elem is
- l_cur sys_refcursor;
- l_result integer;
+ l_actual sys_refcursor;
+ l_expected sys_refcursor;
l_buffer ut3_develop.ut_output_buffer_base := ut3_develop.ut_output_table_buffer();
l_message_id varchar2(255);
l_text varchar2(4000);
@@ -59,9 +67,12 @@ create or replace package body test_output_buffer is
l_buffer.send_lines(ut3_develop.ut_varchar2_rows(null));
l_buffer.send_lines(ut3_develop.ut_varchar2_rows('test'));
- select message_id, text into l_message_id, l_text from table(ut3_tester_helper.run_helper.ut_output_buffer_tmp);
- ut.expect(l_message_id).to_equal('1');
- ut.expect(l_text).to_equal('test');
+ open l_actual for
+ select text from table(ut3_tester_helper.run_helper.ut_output_buffer_tmp);
+ open l_expected for
+ select 'test' as text from dual;
+
+ ut.expect(l_actual).to_equal(l_expected);
end;
procedure test_send_line is
@@ -86,11 +97,12 @@ create or replace package body test_output_buffer is
begin
--Arrange
l_expected := 'a text';
+ l_buffer.lock_buffer();
l_buffer.send_line(l_expected);
l_start := localtimestamp;
--Act
begin
- select text into l_result from table(l_buffer.get_lines(1,1));
+ select text into l_result from table(l_buffer.get_lines(0,0.3));
ut.fail('Expected a timeout exception but nothing was raised');
exception
when others then
@@ -101,7 +113,7 @@ create or replace package body test_output_buffer is
--Throws a timeout exception
ut.expect(dbms_utility.format_error_stack()).to_match('ORA'||ut3_develop.ut_utils.gc_out_buffer_timeout);
--Waited for one second
- ut.expect(l_duration).to_be_greater_than(interval '0.99' second);
+ ut.expect(l_duration).to_be_greater_or_equal(interval '0.3' second);
end;
select count(1) into l_remaining from table(ut3_tester_helper.run_helper.ut_output_buffer_tmp) where output_id = l_buffer.output_id;
@@ -116,13 +128,15 @@ create or replace package body test_output_buffer is
l_buffer ut3_develop.ut_output_buffer_base;
begin
--Arrange
- l_stale_buffer.start_date := sysdate - 2;
+ l_stale_buffer.start_date := sysdate - 10;
--initialize with new start date
l_stale_buffer.init();
+ l_stale_buffer.lock_buffer();
l_stale_buffer.send_line('some text');
l_stale_buffer.close();
l_fresh_buffer := ut3_develop.ut_output_table_buffer();
+ l_fresh_buffer.lock_buffer();
l_fresh_buffer.send_line('some text');
l_fresh_buffer.close();
@@ -131,9 +145,9 @@ create or replace package body test_output_buffer is
--Assert
-- Data in "fresh" buffer remains
- ut.expect( l_fresh_buffer.get_lines_cursor(0,0), l_buffer.self_type ).to_have_count(1);
+ ut.expect( l_fresh_buffer.get_lines_cursor(0,0), l_fresh_buffer.self_type ).to_have_count(1);
-- Data in "stale" buffer is purged and so the call to get_lines_cursor throws ORA-20218
- ut.expect( l_stale_buffer.get_lines_cursor(0,0), l_buffer.self_type ).to_be_empty();
+ ut.expect( l_stale_buffer.get_lines_cursor(0,0), l_stale_buffer.self_type ).to_be_empty();
end;
procedure test_purge_text_buffer is
@@ -146,5 +160,41 @@ create or replace package body test_output_buffer is
test_purge(ut3_develop.ut_output_clob_table_buffer());
end;
-end test_output_buffer;
+ procedure text_buffer_send_multibyte is
+ l_input varchar2(32767);
+ l_max_len integer := ut3_develop.ut_utils.gc_max_storage_varchar2_len;
+ l_buffer ut3_develop.ut_output_buffer_base := ut3_develop.ut_output_table_buffer();
+ l_text varchar2(4000);
+ begin
+ --Arrange
+ ut3_tester_helper.run_helper.delete_buffer();
+ l_input := rpad( '❤', l_max_len, 'a' );
+ ut.expect( lengthb( l_input ) ).to_be_greater_than(l_max_len);
+
+ --Act
+ l_buffer.send_line(l_input);
+ --Assert
+ select text into l_text from table(ut3_tester_helper.run_helper.ut_output_buffer_tmp);
+ ut.expect(lengthb(l_text)).to_be_less_or_equal(l_max_len);
+ end;
+
+ procedure text_buffer_send_clob_multib is
+ l_input clob;
+ l_max_len integer := ut3_develop.ut_utils.gc_max_storage_varchar2_len;
+ l_buffer ut3_develop.ut_output_buffer_base := ut3_develop.ut_output_table_buffer();
+ l_text varchar2(4000);
+ begin
+ --Arrange
+ ut3_tester_helper.run_helper.delete_buffer();
+ l_input := rpad( '❤', l_max_len, 'a' );
+ ut.expect( ut3_develop.ut_utils.lengthb_clob( l_input ) ).to_be_greater_than(l_max_len);
+
+ --Act
+ l_buffer.send_clob(l_input);
+ --Assert
+ select text into l_text from table(ut3_tester_helper.run_helper.ut_output_buffer_tmp);
+ ut.expect(lengthb(l_text)).to_be_less_or_equal(l_max_len);
+ end;
+
+ end test_output_buffer;
/
diff --git a/test/ut3_tester/core/test_output_buffer.pks b/test/ut3_tester/core/test_output_buffer.pks
index 24c2c01eb..5b6cd678b 100644
--- a/test/ut3_tester/core/test_output_buffer.pks
+++ b/test/ut3_tester/core/test_output_buffer.pks
@@ -2,10 +2,33 @@ create or replace package test_output_buffer is
--%suite(output_buffer)
--%suitepath(utplsql.ut3_tester.core)
+
+
+ --%context(Read and write within the same session)
+
+
+ --%endcontext
+ --%context(Buffer is read in a different session than buffer write)
+
+ --reader will wait for a_initial_timeout seconds for the writer process to start and then it will finish with error
+
+ --reader will wait forever (beyond a_initial_timeout) if the writer process is started and end of data row was not received from the buffer
+
+ --reader stops after reading the end of data signal from the buffer
+
+ --reader stops when writer process ends and all data was read from the buffer
+
+
+ --%endcontext
+
--%test(Receives a line from buffer table and deletes)
procedure test_receive;
+ --%test(Waits specified time for producer to lock the buffer )
+ --%throws(-20218)
+ procedure test_wait_for_producer;
+
--%test(Does not send line if null text given)
procedure test_doesnt_send_on_null_text;
@@ -19,12 +42,16 @@ create or replace package test_output_buffer is
procedure test_waiting_for_data;
--%test(Purges text buffer data older than one day and leaves the rest)
- --%throws(-20218)
procedure test_purge_text_buffer;
--%test(Purges clob buffer data older than one day and leaves the rest)
- --%throws(-20218)
procedure test_purge_clob_buffer;
+ --%test(Successfully sends multibyte long line into text buffer)
+ procedure text_buffer_send_multibyte;
+
+ --%test(Successfully sends multibyte long clob line into text buffer)
+ procedure text_buffer_send_clob_multib;
+
end test_output_buffer;
/
diff --git a/test/ut3_tester/core/test_suite_manager.pkb b/test/ut3_tester/core/test_suite_manager.pkb
index fbac0f3f5..c818ad212 100644
--- a/test/ut3_tester/core/test_suite_manager.pkb
+++ b/test/ut3_tester/core/test_suite_manager.pkb
@@ -2217,5 +2217,22 @@ end;]';
end loop;
end;
+ --%test(Path validation does not fail on Estonian NLS_SORT - fix #1252)
+ procedure path_validate_nls_sort is
+ l_schema_names ut3_develop.ut_varchar2_rows;
+ begin
+ --Arrange
+ execute immediate q'[alter session set nls_sort='estonian']';
+ --Act
+ l_schema_names := ut3_develop.ut_suite_manager.get_schema_names(ut3_develop.ut_varchar2_list('ut3'));
+ --Asseert
+ ut.expect(sqlcode).to_equal(0);
+ end;
+
+
+ procedure reset_nls_sort is
+ begin
+ execute immediate q'[alter session set nls_sort='binary']';
+ end;
end test_suite_manager;
/
diff --git a/test/ut3_tester/core/test_suite_manager.pks b/test/ut3_tester/core/test_suite_manager.pks
index d9d4efc09..ac7818f4f 100644
--- a/test/ut3_tester/core/test_suite_manager.pks
+++ b/test/ut3_tester/core/test_suite_manager.pks
@@ -237,5 +237,15 @@ create or replace package test_suite_manager is
--%endcontext
+ --%context(paths validation)
+
+ --%test(Path validation does not fail on Estonian NLS_SORT - fix #1252)
+ --%aftertest(reset_nls_sort)
+ procedure path_validate_nls_sort;
+
+ procedure reset_nls_sort;
+
+ --%endcontext
+
end test_suite_manager;
/
diff --git a/test/ut3_tester/core/test_ut_suite_tag_filter.pkb b/test/ut3_tester/core/test_ut_suite_tag_filter.pkb
new file mode 100644
index 000000000..edfb27cfc
--- /dev/null
+++ b/test/ut3_tester/core/test_ut_suite_tag_filter.pkb
@@ -0,0 +1,82 @@
+create or replace package body test_ut_suite_tag_filter is
+
+ procedure test_conversion_to_rpn is
+ l_postfix ut3_develop.ut_varchar2_list;
+ l_postfix_string varchar2(4000);
+ l_input_token ut3_develop.ut_varchar2_list;
+ begin
+ l_input_token := ut3_develop.ut_suite_tag_filter.tokenize_tags_string('A');
+ l_postfix := ut3_develop.ut_suite_tag_filter.shunt_logical_expression(l_input_token);
+ l_postfix_string := ut3_develop.ut_utils.table_to_clob(l_postfix,'');
+ ut.expect(l_postfix_string).to_equal('A');
+
+ l_input_token := ut3_develop.ut_suite_tag_filter.tokenize_tags_string('A|B');
+ l_postfix := ut3_develop.ut_suite_tag_filter.shunt_logical_expression(l_input_token);
+ l_postfix_string := ut3_develop.ut_utils.table_to_clob(l_postfix,'');
+ ut.expect(l_postfix_string).to_equal('AB|');
+
+ l_input_token := ut3_develop.ut_suite_tag_filter.tokenize_tags_string('(a|b)|c&d');
+ l_postfix := ut3_develop.ut_suite_tag_filter.shunt_logical_expression(l_input_token);
+ l_postfix_string := ut3_develop.ut_utils.table_to_clob(l_postfix,'');
+ ut.expect(l_postfix_string).to_equal('ab|cd&|');
+
+ l_input_token := ut3_develop.ut_suite_tag_filter.tokenize_tags_string('!a|b');
+ l_postfix := ut3_develop.ut_suite_tag_filter.shunt_logical_expression(l_input_token);
+ l_postfix_string := ut3_develop.ut_utils.table_to_clob(l_postfix,'');
+ ut.expect(l_postfix_string).to_equal('a!b|');
+ end;
+
+ procedure test_conversion_opr_by_opr is
+ l_postfix ut3_develop.ut_varchar2_list;
+ l_input_token ut3_develop.ut_varchar2_list;
+ begin
+ l_input_token := ut3_develop.ut_varchar2_list('A','B');
+ l_postfix := ut3_develop.ut_suite_tag_filter.shunt_logical_expression(l_input_token);
+ ut.fail('Expected exception but nothing was raised');
+ end;
+
+ procedure test_conversion_oprd_by_opd is
+ l_postfix ut3_develop.ut_varchar2_list;
+ l_input_token ut3_develop.ut_varchar2_list;
+ begin
+ l_input_token := ut3_develop.ut_varchar2_list('|','|');
+ l_postfix := ut3_develop.ut_suite_tag_filter.shunt_logical_expression(l_input_token);
+ ut.fail('Expected exception but nothing was raised');
+ end;
+
+ procedure test_conversion_lb_by_oper is
+ l_postfix ut3_develop.ut_varchar2_list;
+ l_input_token ut3_develop.ut_varchar2_list;
+ begin
+ l_input_token := ut3_develop.ut_varchar2_list('(','A','|','B',')','(');
+ l_postfix := ut3_develop.ut_suite_tag_filter.shunt_logical_expression(l_input_token);
+ ut.fail('Expected exception but nothing was raised');
+ end;
+
+ procedure test_conversion_rb_by_oprd is
+ l_postfix ut3_develop.ut_varchar2_list;
+ l_input_token ut3_develop.ut_varchar2_list;
+ begin
+ l_input_token := ut3_develop.ut_varchar2_list(')','A');
+ l_postfix := ut3_develop.ut_suite_tag_filter.shunt_logical_expression(l_input_token);
+ ut.fail('Expected exception but nothing was raised');
+ end;
+
+ procedure conv_from_tag_to_sql_filter is
+ l_sql_filter varchar2(4000);
+ begin
+ l_sql_filter := ut3_develop.ut_suite_tag_filter.create_where_filter('test1');
+ ut.expect(l_sql_filter).to_equal(q'['test1' member of tags]');
+
+ l_sql_filter := ut3_develop.ut_suite_tag_filter.create_where_filter('test1|test2');
+ ut.expect(l_sql_filter).to_equal(q'[('test1' member of tags or 'test2' member of tags)]');
+
+ l_sql_filter := ut3_develop.ut_suite_tag_filter.create_where_filter('test1|!test2');
+ ut.expect(l_sql_filter).to_equal(q'[('test1' member of tags or not('test2' member of tags))]');
+
+ l_sql_filter := ut3_develop.ut_suite_tag_filter.create_where_filter('test1&!test2');
+ ut.expect(l_sql_filter).to_equal(q'[('test1' member of tags and not('test2' member of tags))]');
+ end;
+
+end test_ut_suite_tag_filter;
+/
diff --git a/test/ut3_tester/core/test_ut_suite_tag_filter.pks b/test/ut3_tester/core/test_ut_suite_tag_filter.pks
new file mode 100644
index 000000000..0f84b751b
--- /dev/null
+++ b/test/ut3_tester/core/test_ut_suite_tag_filter.pks
@@ -0,0 +1,33 @@
+create or replace package test_ut_suite_tag_filter is
+
+ --%suite(ut_suite_tag_filter)
+ --%suitepath(utplsql.ut3_tester.core)
+
+ --%context( Conversion to Reverse Polish Notation)
+
+ --%test( Test conversion of expression into Reverse Polish Notation)
+ procedure test_conversion_to_rpn;
+
+ --%test( Operator is followed by operator)
+ --%throws(ut3_develop.ut_utils.gc_invalid_tag_expression)
+ procedure test_conversion_opr_by_opr;
+
+ --%test( Operand is followed by operand)
+ --%throws(ut3_develop.ut_utils.gc_invalid_tag_expression)
+ procedure test_conversion_oprd_by_opd;
+
+ --%test( Left Bracket is followed by operator)
+ --%throws(ut3_develop.ut_utils.gc_invalid_tag_expression)
+ procedure test_conversion_lb_by_oper;
+
+ --%test( Right Bracket is followed by operand)
+ --%throws(ut3_develop.ut_utils.gc_invalid_tag_expression)
+ procedure test_conversion_rb_by_oprd;
+
+ --%endcontext
+
+ --%test( Test conversion of expression from tag into custom where filter for SQL)
+ procedure conv_from_tag_to_sql_filter;
+
+end test_ut_suite_tag_filter;
+/
diff --git a/test/ut3_tester/core/test_ut_utils.pkb b/test/ut3_tester/core/test_ut_utils.pkb
index 4ed718777..433987c01 100644
--- a/test/ut3_tester/core/test_ut_utils.pkb
+++ b/test/ut3_tester/core/test_ut_utils.pkb
@@ -488,6 +488,24 @@ end;
begin
ut.expect(l_expected).to_equal(l_actual);
end;
-
+
+ procedure convert_collection_multibyte is
+ l_input ut3_develop.ut_varchar2_list;
+ l_max_len integer := ut3_develop.ut_utils.gc_max_storage_varchar2_len;
+ begin
+ --Arrange
+ l_input := ut3_develop.ut_varchar2_list( rpad( '❤', l_max_len, 'a' ) );
+ ut.expect( lengthb( l_input( 1 ) ) ).to_be_greater_than(l_max_len);
+
+ --Act
+ ut.expect( lengthb( ut3_develop.ut_utils.convert_collection(l_input)(1) ) ).to_be_less_or_equal(l_max_len);
+ end;
+
+ procedure lengthb_gives_length_in_bytes is
+ l_clob clob;
+ begin
+ l_clob := '❤';
+ ut.expect(ut3_develop.ut_utils.lengthb_clob(l_clob)).to_be_greater_than(1);
+ end;
end test_ut_utils;
/
diff --git a/test/ut3_tester/core/test_ut_utils.pks b/test/ut3_tester/core/test_ut_utils.pks
index 4d83b5042..ca2e7b304 100644
--- a/test/ut3_tester/core/test_ut_utils.pks
+++ b/test/ut3_tester/core/test_ut_utils.pks
@@ -152,10 +152,15 @@ create or replace package test_ut_utils is
procedure int_conv_ym_month;
--%test(returns text representation of interval year to month for custom interval)
- procedure int_conv_ym_date;
-
-
+ procedure int_conv_ym_date;
+
--%endcontext
+ --%test(convert_collection does not fail on multibyte strings - Issue #1245 )
+ procedure convert_collection_multibyte;
+
+ --%test(lengthb returns length of a CLOB in bytes )
+ procedure lengthb_gives_length_in_bytes;
+
end test_ut_utils;
/
diff --git a/test/ut3_tester_helper/coverage_helper.pkb b/test/ut3_tester_helper/coverage_helper.pkb
index 99f26e9f8..ef14c586f 100644
--- a/test/ut3_tester_helper/coverage_helper.pkb
+++ b/test/ut3_tester_helper/coverage_helper.pkb
@@ -290,11 +290,11 @@ create or replace package body coverage_helper is
ut3_develop.ut_runner.coverage_stop();
end;
- function get_job_status(a_job_name varchar2, a_job_started_after timestamp with time zone) return varchar2 is
- l_status varchar2(1000);
+ function get_job_status(a_job_name varchar2, a_job_started_after timestamp with time zone) return user_scheduler_job_run_details%rowtype is
+ l_result user_scheduler_job_run_details%rowtype;
begin
begin
- select status into l_status
+ select * into l_result
from user_scheduler_job_run_details
where job_name = upper(a_job_name)
and req_start_date >= a_job_started_after;
@@ -302,20 +302,11 @@ create or replace package body coverage_helper is
when no_data_found then
null;
end;
- return l_status;
- end;
-
- procedure sleep(a_time number) is
- begin
- $if dbms_db_version.version >= 18 $then
- dbms_session.sleep(a_time);
- $else
- dbms_lock.sleep(a_time );
- $end
+ return l_result;
end;
procedure run_job_and_wait_for_finish(a_job_action varchar2) is
- l_status varchar2(1000);
+ l_job_run_info user_scheduler_job_run_details%rowtype;
l_job_name varchar2(30);
l_timestamp timestamp with time zone := current_timestamp;
i integer := 0;
@@ -323,7 +314,7 @@ create or replace package body coverage_helper is
begin
g_job_no := g_job_no + 1;
l_job_name := 'utPLSQL_selftest_job_'||g_job_no;
- sleep(0.15);
+ dbms_lock.sleep(0.15);
dbms_scheduler.create_job(
job_name => l_job_name,
job_type => 'PLSQL_BLOCK',
@@ -333,14 +324,14 @@ create or replace package body coverage_helper is
auto_drop => TRUE,
comments => 'one-time-job'
);
- while (l_status is null or l_status not in ('SUCCEEDED','FAILED')) and i < 150 loop
- l_status := get_job_status( l_job_name, l_timestamp );
- sleep(0.1);
+ while (l_job_run_info.status is null or l_job_run_info.status not in ('SUCCEEDED','FAILED')) and i < 6000 loop
+ l_job_run_info := get_job_status( l_job_name, l_timestamp );
+ dbms_lock.sleep(0.1);
i := i + 1;
end loop;
commit;
- if l_status = 'FAILED' then
- raise_application_error(-20000, 'Running a scheduler job failed');
+ if nvl(l_job_run_info.status,'null') <> 'SUCCEEDED' then
+ raise_application_error(-20000, 'Scheduler job '''||l_job_name||''', status='''||l_job_run_info.status||'''. Additional info: '||l_job_run_info.additional_info);
end if;
end;
@@ -378,7 +369,7 @@ create or replace package body coverage_helper is
pragma autonomous_transaction;
begin
run_job_and_wait_for_finish( a_plsql_block );
-
+ dbms_lock.sleep(0.1);
execute immediate q'[
declare
l_results ut3_develop.ut_varchar2_list;
@@ -498,16 +489,30 @@ create or replace package body coverage_helper is
l_coverage_id raw(32) := sys_guid();
begin
l_plsql_block := q'[
+ declare
+ x dbms_output.chararr;
+ i integer := 100000;
begin
+/*
+ execute immediate 'alter session set statistics_level=all';
+ dbms_hprof.start_profiling(
+ location => 'PLSHPROF_DIR'
+ , filename => 'profiler_utPLSQL_run_]'||rawtohex(l_coverage_id)||q'[.txt'
+ );
+*/
ut3_develop.ut_runner.coverage_start(']'||rawtohex(l_coverage_id)||q'[');
ut3_develop.ut_coverage.set_develop_mode(a_develop_mode => true);
--gather coverage on the command executed
begin {a_run_command}; end;
+ dbms_output.get_lines(x,i);
ut3_develop.ut_coverage.set_develop_mode(a_develop_mode => false);
ut3_develop.ut_runner.coverage_stop();
--get the actual results of the command gathering the coverage
insert into test_results select rownum as id, x.* from table( {a_run_command} ) x;
commit;
+/*
+ dbms_hprof.stop_profiling;
+*/
end;]';
l_plsql_block := replace(l_plsql_block,'{a_run_command}',a_run_command);
l_result_clob := run_code_as_job( l_plsql_block );
diff --git a/test/ut3_tester_helper/run_helper.pkb b/test/ut3_tester_helper/run_helper.pkb
index a132f4943..6289b1642 100644
--- a/test/ut3_tester_helper/run_helper.pkb
+++ b/test/ut3_tester_helper/run_helper.pkb
@@ -343,9 +343,250 @@ create or replace package body run_helper is
end;
end test_package_3;
]';
+
+ execute immediate q'[create or replace package test_tag_pkg_1 is
+ --%suite
+ --%tags(suite1,release_3_1_13,development,complex,end_to_end)
+ --%suitepath(suite1)
+ --%rollback(manual)
+
+ --%test(Test1 from test_tag_pkg_1)
+ --%tags(test1,development,fast)
+ procedure test1;
+
+ --%test(Test2 from test_tag_pkg_1)
+ --%tags(test2,production,slow,patch_3_1_13)
+ procedure test2;
+
+ end test_tag_pkg_1;
+ ]';
+
+ execute immediate q'[create or replace package body test_tag_pkg_1 is
+ procedure test1 is
+ begin
+ dbms_output.put_line('test_tag_pkg_1.test1 executed');
+ end;
+ procedure test2 is
+ begin
+ dbms_output.put_line('test_tag_pkg_1.test2 executed');
+ end;
+ end test_tag_pkg_1;
+ ]';
+
+ execute immediate q'[create or replace package test_tag_pkg_2 is
+ --%suite
+ --%tags(suite2,release_3_1_12,development,simple)
+ --%suitepath(suite1.suite2)
+ --%rollback(manual)
+
+ --%test(Test3 from test_tag_pkg_2)
+ --%tags(test3,development,fast)
+ procedure test3;
+
+ --%test(Test4 from test_tag_pkg_1)
+ --%tags(test4,production,slow)
+ procedure test4;
+
+ end test_tag_pkg_2;
+ ]';
+
+ execute immediate q'[create or replace package body test_tag_pkg_2 is
+ procedure test3 is
+ begin
+ dbms_output.put_line('test_tag_pkg_2.test3 executed');
+ end;
+ procedure test4 is
+ begin
+ dbms_output.put_line('test_tag_pkg_2.test4 executed');
+ end;
+ end test_tag_pkg_2;
+ ]';
+
+ execute immediate q'[create or replace package test_tag_pkg_3 is
+ --%suite
+ --%tags(suite3,release_3_1_13,production,simple,end_to_end)
+ --%suitepath(suite3)
+ --%rollback(manual)
+
+ --%test(Test5 from test_tag_pkg_3)
+ --%tags(test5,release_3_1_13,production,patch_3_1_13)
+ procedure test5;
+
+ --%test(Test6 from test_tag_pkg_3)
+ --%tags(test6,development,patch_3_1_14)
+ procedure test6;
+
+ end test_tag_pkg_3;
+ ]';
+
+ execute immediate q'[create or replace package body test_tag_pkg_3 is
+ procedure test5 is
+ begin
+ dbms_output.put_line('test_tag_pkg_3.test5 executed');
+ end;
+ procedure test6 is
+ begin
+ dbms_output.put_line('test_tag_pkg_3.test6 executed');
+ end;
+ end test_tag_pkg_3;
+ ]';
+
+ execute immediate q'[create or replace package suite1_level1_pkg is
+
+ --%suite(suite1_level1)
+ --%suitepath(any_none)
+ --%rollback(manual)
+
+ --%test(Test 1 from Suite1 on level 1)
+ --%tags(suite1,level1,test1,test1_level1)
+ procedure test1_level1;
+
+ --%test(Test 2 from Suite1 on level 1)
+ procedure test2_level1;
+
+ end suite1_level1_pkg;
+ ]';
+
+ execute immediate q'[create or replace package body suite1_level1_pkg is
+ procedure test1_level1 is
+ begin
+ dbms_output.put_line('suite1_level1_pkg.test1_level1 executed');
+ end;
+ procedure test2_level1 is
+ begin
+ dbms_output.put_line('suite1_level1_pkg.test2_level1 executed');
+ end;
+ end suite1_level1_pkg;
+ ]';
+
+ execute immediate q'[create or replace package suite1_1_level2_pkg is
+
+ --%suite(suite1_1_level2)
+ --%suitepath(any_none.suite1_level1)
+ --%rollback(manual)
+
+ --%test(Test 1 from Suite1_2 on level 2)
+ --%tags(level2,test1,test1_level2)
+ procedure suite1_1_test1_level2;
+
+ --%test(Test 2 from Suite1_2 on level 2)
+ procedure suite1_1_test2_level2;
+
+ end suite1_1_level2_pkg;
+ ]';
+
+ execute immediate q'[create or replace package body suite1_1_level2_pkg is
+ procedure suite1_1_test1_level2 is
+ begin
+ dbms_output.put_line('suite1_1_level2_pkg.suite1_1_test1_level2 executed');
+ end;
+ procedure suite1_1_test2_level2 is
+ begin
+ dbms_output.put_line('suite1_1_level2_pkg.suite1_1_test2_level2 executed');
+ end;
+ end suite1_1_level2_pkg;
+ ]';
+
+ execute immediate q'[create or replace package suite1_2_level2_pkg is
+
+ --%suite(suite1_2_level2)
+ --%tags(level2,suite1_2,suites)
+ --%suitepath(any_none.suite1_level1)
+ --%rollback(manual)
+
+ --%test(Test 1 from Suite1_2 on level 2)
+ procedure suite1_2_test1_level2;
+
+ --%test(Test 2 from Suite1_2 on level 2)
+ --%tags(level2,test2,test2_level2)
+ procedure suite1_2_test2_level1;
+
+ end suite1_2_level2_pkg;
+ ]';
+
+ execute immediate q'[create or replace package body suite1_2_level2_pkg is
+ procedure suite1_2_test1_level2 is
+ begin
+ dbms_output.put_line('suite1_2_level2_pkg.suite1_2_test1_level2 executed');
+ end;
+ procedure suite1_2_test2_level1 is
+ begin
+ dbms_output.put_line('suite1_2_level2_pkg.suite1_2_test2_level1 executed');
+ end;
+ end suite1_2_level2_pkg;
+ ]';
+
+ execute immediate q'[create or replace package suite2_level1_pkg is
+
+ --%suite(suite2_level1)
+ --%tags(level1,suite2,suites)
+ --%suitepath(any_none)
+ --%rollback(manual)
+
+ --%test(Test 1 from Suite1 on level 1)
+ --%tags(suite2,level1,test1,test1_level1)
+ procedure test1_level1;
+
+ --%test(Test 2 from Suite1 on level 1)
+ procedure test2_level1;
+
+ end suite2_level1_pkg;
+ ]';
+
+ execute immediate q'[create or replace package body suite2_level1_pkg is
+ procedure test1_level1 is
+ begin
+ dbms_output.put_line('suite2_level1_pkg.test1_level1 executed');
+ end;
+ procedure test2_level1 is
+ begin
+ dbms_output.put_line('suite2_level1_pkg.test2_level1 executed');
+ end;
+ end suite2_level1_pkg;
+ ]';
+
+ execute immediate q'[create or replace package suite2_2_level2_pkg is
+
+ --%suite(suite2_2_level2)
+ --%tags(level2,suite2_2,suites)
+ --%suitepath(any_none.suite2_level1)
+ --%rollback(manual)
+
+ --%test(Test 1 from Suite2_2 on level 2)
+ procedure suite2_2_test1_level2;
+
+ --%test(Test 2 from Suite2_2 on level 2)
+ --%tags(level2,test2,test2_level2)
+ procedure suite2_2_test2_level2;
+
+ end suite2_2_level2_pkg;
+ ]';
+
+ execute immediate q'[create or replace package body suite2_2_level2_pkg is
+ procedure suite2_2_test1_level2 is
+ begin
+ dbms_output.put_line('suite2_2_level2_pkg.suite2_2_test1_level2 executed');
+ end;
+ procedure suite2_2_test2_level2 is
+ begin
+ dbms_output.put_line('suite2_2_level2_pkg.suite2_2_test2_level2 executed');
+ end;
+ end suite2_2_level2_pkg;
+ ]';
+
+
execute immediate q'[grant execute on test_package_1 to public]';
execute immediate q'[grant execute on test_package_2 to public]';
execute immediate q'[grant execute on test_package_3 to public]';
+ execute immediate q'[grant execute on test_tag_pkg_1 to public]';
+ execute immediate q'[grant execute on test_tag_pkg_2 to public]';
+ execute immediate q'[grant execute on test_tag_pkg_3 to public]';
+
+ execute immediate q'[grant execute on suite1_level1_pkg to public]';
+ execute immediate q'[grant execute on suite1_1_level2_pkg to public]';
+ execute immediate q'[grant execute on suite1_2_level2_pkg to public]';
+ execute immediate q'[grant execute on suite2_level1_pkg to public]';
+ execute immediate q'[grant execute on suite2_2_level2_pkg to public]';
end;
procedure drop_ut3_user_tests is
@@ -354,6 +595,15 @@ create or replace package body run_helper is
execute immediate q'[drop package test_package_1]';
execute immediate q'[drop package test_package_2]';
execute immediate q'[drop package test_package_3]';
+ execute immediate q'[drop package test_tag_pkg_1]';
+ execute immediate q'[drop package test_tag_pkg_2]';
+ execute immediate q'[drop package test_tag_pkg_3]';
+
+ execute immediate q'[drop package suite2_2_level2_pkg]';
+ execute immediate q'[drop package suite2_level1_pkg]';
+ execute immediate q'[drop package suite1_2_level2_pkg]';
+ execute immediate q'[drop package suite1_level1_pkg]';
+ execute immediate q'[drop package suite1_1_level2_pkg]';
end;
procedure create_test_suite is
diff --git a/test/ut3_user/api/test_ut_run.pkb b/test/ut3_user/api/test_ut_run.pkb
index 41b969359..f0cfd8373 100644
--- a/test/ut3_user/api/test_ut_run.pkb
+++ b/test/ut3_user/api/test_ut_run.pkb
@@ -742,7 +742,7 @@ Failures:%
procedure remove_time_from_results(a_results in out nocopy ut3_develop.ut_varchar2_list) is
begin
for i in 1 .. a_results.count loop
- a_results(i) := regexp_replace(a_results(i),'\[[0-9]*[\.,][0-9]+ sec\]','');
+ a_results(i) := regexp_replace(a_results(i),'\[[0-9]*[\.,]?[0-9]+ sec\]','');
a_results(i) := regexp_replace(a_results(i),'Finished in [0-9]*[\.,][0-9]+ seconds','');
end loop;
end;
@@ -948,7 +948,7 @@ Failures:%
procedure two_test_run_by_two_tags is
l_results clob;
begin
- ut3_tester_helper.run_helper.run(a_tags => 'subtest1,subtest2');
+ ut3_tester_helper.run_helper.run(a_tags => 'subtest1|subtest2');
l_results := ut3_tester_helper.main_helper.get_dbms_output_as_clob();
--Assert
ut.expect( l_results ).to_be_like( '%test_package_1%' );
@@ -958,7 +958,21 @@ Failures:%
ut.expect( l_results ).not_to_be_like( '%test_package_3%' );
ut.expect( l_results ).not_to_be_like( '%test_package_3%' );
end;
-
+
+ procedure two_test_run_by_two_tags_leg is
+ l_results clob;
+ begin
+ ut3_tester_helper.run_helper.run(a_tags => 'subtest1,subtest2');
+ l_results := ut3_tester_helper.main_helper.get_dbms_output_as_clob();
+ --Assert
+ ut.expect( l_results ).to_be_like( '%test_package_1%' );
+ ut.expect( l_results ).to_be_like( '%test_package_2%' );
+ ut.expect( l_results ).not_to_be_like( '%test_package_1.test2%' );
+ ut.expect( l_results ).not_to_be_like( '%test_package_2.test2%' );
+ ut.expect( l_results ).not_to_be_like( '%test_package_3%' );
+ ut.expect( l_results ).not_to_be_like( '%test_package_3%' );
+ end;
+
procedure suite_with_children_tag is
l_results clob;
begin
@@ -1078,6 +1092,20 @@ Failures:%
procedure tag_run_func_path_list is
l_results ut3_develop.ut_varchar2_list;
+ begin
+ l_results := ut3_tester_helper.run_helper.run(ut3_develop.ut_varchar2_list(':tests.test_package_1',':tests'),a_tags => 'suite1test1|suite2test1');
+ --Assert
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_1%' );
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_2%' );
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_1.test1%executed%' );
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_1.test2%executed%' );
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_2.test1%executed%' );
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_2.test2%executed%' );
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_3%' );
+ end;
+
+ procedure tag_run_func_path_list_leg is
+ l_results ut3_develop.ut_varchar2_list;
begin
l_results := ut3_tester_helper.run_helper.run(ut3_develop.ut_varchar2_list(':tests.test_package_1',':tests'),a_tags => 'suite1test1,suite2test1');
--Assert
@@ -1092,6 +1120,18 @@ Failures:%
procedure tag_inc_exc_run_func_path_list is
l_results ut3_develop.ut_varchar2_list;
+ begin
+ l_results := ut3_tester_helper.run_helper.run(ut3_develop.ut_varchar2_list(':tests.test_package_1',':tests'),a_tags => '(suite1test1|suite2test1)&!suite2');
+ --Assert
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_1%' );
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_2%' );
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_1.test1%executed%' );
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_1.test2%executed%' );
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_3%' );
+ end;
+
+ procedure tag_inc_exc_run_fun_pth_lst_lg is
+ l_results ut3_develop.ut_varchar2_list;
begin
l_results := ut3_tester_helper.run_helper.run(ut3_develop.ut_varchar2_list(':tests.test_package_1',':tests'),a_tags => 'suite1test1,suite2test1,-suite2');
--Assert
@@ -1104,6 +1144,22 @@ Failures:%
procedure tag_exclude_run_func_path_list is
l_results ut3_develop.ut_varchar2_list;
+ begin
+ l_results := ut3_tester_helper.run_helper.run(ut3_develop.ut_varchar2_list(':tests,:tests2'),a_tags => '!suite1test2&!suite2test1&!test1suite3');
+ --Assert
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_1%' );
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_2%' );
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_3%' );
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_1.test1%executed%' );
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_1.test2%executed%' );
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_2.test1%executed%' );
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_2.test2%executed%' );
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_3.test1%executed%' );
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_3.test2%executed%' );
+ end;
+
+procedure tag_exclude_run_fun_pth_lst_lg is
+ l_results ut3_develop.ut_varchar2_list;
begin
l_results := ut3_tester_helper.run_helper.run(ut3_develop.ut_varchar2_list(':tests,:tests2'),a_tags => '-suite1test2,-suite2test1,-test1suite3');
--Assert
@@ -1120,6 +1176,20 @@ Failures:%
procedure tag_include_exclude_run_func is
l_results ut3_develop.ut_varchar2_list;
+ begin
+ l_results := ut3_tester_helper.run_helper.run(a_tags => '(suite1)&(!suite1test2&!suite2test1&!test1suite3)');
+ --Assert
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_1%' );
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_2%' );
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_3%' );
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_1.test1%executed%' );
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_1.test2%executed%' );
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_2.test1%executed%' );
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_2.test2%executed%' );
+ end;
+
+ procedure tag_include_exclude_run_fun_lg is
+ l_results ut3_develop.ut_varchar2_list;
begin
l_results := ut3_tester_helper.run_helper.run(a_tags => 'suite1,-suite1test2,-suite2test1,-test1suite3');
--Assert
@@ -1132,6 +1202,105 @@ Failures:%
ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_package_2.test2%executed%' );
end;
+ procedure tag_complex_expressions is
+ l_results ut3_develop.ut_varchar2_list;
+ begin
+ l_results := ut3_tester_helper.run_helper.run(a_tags => 'release_3_1_13&(fast|simple)');
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_tag_pkg_3.test5 executed%' );
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_tag_pkg_3.test6 executed%' );
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_1.test1%executed%' );
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_1.test2%executed%' );
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_2.test3%executed%' );
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_2.test4%executed%' );
+
+ l_results := ut3_tester_helper.run_helper.run(a_tags => 'release_3_1_13&(!patch_3_1_13&!patch_3_1_14)');
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_tag_pkg_1.test1 executed%' );
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_1.test2%executed%' );
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_2.test3%executed%' );
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_2.test4%executed%' );
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_3.test5%executed%' );
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_3.test6%executed%' );
+
+ l_results := ut3_tester_helper.run_helper.run(a_tags => 'release_3_1_13&(patch_3_1_13&!slow)');
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_tag_pkg_3.test5 executed%' );
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_1.test1%executed%' );
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_1.test2%executed%' );
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_2.test3%executed%' );
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_2.test4%executed%' );
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_3.test6%executed%' );
+
+ l_results := ut3_tester_helper.run_helper.run(a_tags => '(simple&end_to_end)|(development&fast)');
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_tag_pkg_1.test1 executed%' );
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_tag_pkg_2.test3 executed%' );
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_tag_pkg_3.test5 executed%' );
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_tag_pkg_3.test6 executed%' );
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_1.test2%executed%' );
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_2.test4%executed%' );
+
+ l_results := ut3_tester_helper.run_helper.run(a_tags => '(!development&end_to_end)');
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%test_tag_pkg_3.test5 executed%' );
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_1.test1%executed%' );
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_1.test2%executed%' );
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_2.test3%executed%' );
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_2.test4%executed%' );
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%test_package_3.test6%executed%' );
+
+ l_results := ut3_tester_helper.run_helper.run(a_tags => 'any');
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%suite2_level1_pkg.test1_level1 executed%' );
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%suite2_level1_pkg.test2_level1 executed%' );
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%suite1_level1_pkg.test1_level1 executed%' );
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%suite2_2_level2_pkg.suite2_2_test1_level2 executed%' );
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%suite2_2_level2_pkg.suite2_2_test2_level2 executed%' );
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%suite1_2_level2_pkg.suite1_2_test1_level2 executed%' );
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%suite1_2_level2_pkg.suite1_2_test2_level1 executed%' );
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%suite1_1_level2_pkg.suite1_1_test1_level2 executed%' );
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%suite1_level1_pkg.test2_level1 executed%' );
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%suite1_1_level2_pkg.suite1_1_test2_level2 executed%' );
+
+ l_results := ut3_tester_helper.run_helper.run(a_tags => 'none');
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%suite1_level1_pkg.test2_level1 executed%' );
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_be_like( '%suite1_1_level2_pkg.suite1_1_test2_level2 executed%' );
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%suite2_level1_pkg.test1_level1 executed%' );
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%suite2_level1_pkg.test2_level1 executed%' );
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%suite1_level1_pkg.test1_level1 executed%' );
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%suite2_2_level2_pkg.suite2_2_test1_level2 executed%' );
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%suite2_2_level2_pkg.suite2_2_test2_level2 executed%' );
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%suite1_2_level2_pkg.suite1_2_test1_level2 executed%' );
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%suite1_2_level2_pkg.suite1_2_test2_level1 executed%' );
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like( '%suite1_1_level2_pkg.suite1_1_test1_level2 executed%' );
+
+
+ end;
+
+ procedure invalid_tag_expression is
+ l_results ut3_develop.ut_varchar2_list;
+ begin
+ l_results := ut3_tester_helper.run_helper.run(a_tags => '(!development!&end_to_end)');
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_match('^\s*invalid_tag_expression \[[,\.0-9]+ sec\]\s*$','m');
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like('%(FAILED -%');
+
+ l_results := ut3_tester_helper.run_helper.run(a_tags => '(!development&&end_to_end)');
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_match('^\s*invalid_tag_expression \[[,\.0-9]+ sec\]\s*$','m');
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like('%(FAILED -%');
+
+ l_results := ut3_tester_helper.run_helper.run(a_tags => '(!development&end_to_end|)');
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_match('^\s*invalid_tag_expression \[[,\.0-9]+ sec\]\s*$','m');
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like('%(FAILED -%');
+
+ l_results := ut3_tester_helper.run_helper.run(a_tags => '(!development&!!end_to_end)');
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_match('^\s*invalid_tag_expression \[[,\.0-9]+ sec\]\s*$','m');
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like('%(FAILED -%');
+
+ l_results := ut3_tester_helper.run_helper.run(a_tags => '(&development&end_to_end)');
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_match('^\s*invalid_tag_expression \[[,\.0-9]+ sec\]\s*$','m');
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like('%(FAILED -%');
+
+ l_results := ut3_tester_helper.run_helper.run(a_tags => '(development|end_to_end))');
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).to_match('^\s*invalid_tag_expression \[[,\.0-9]+ sec\]\s*$','m');
+ ut.expect( ut3_tester_helper.main_helper.table_to_clob(l_results) ).not_to_be_like('%(FAILED -%');
+
+ end;
+
procedure set_application_info is
begin
dbms_application_info.set_module( gc_module, gc_action );
diff --git a/test/ut3_user/api/test_ut_run.pks b/test/ut3_user/api/test_ut_run.pks
index b3be8700d..c57788bff 100644
--- a/test/ut3_user/api/test_ut_run.pks
+++ b/test/ut3_user/api/test_ut_run.pks
@@ -202,6 +202,9 @@ create or replace package test_ut_run is
--%test(Execute tests by passing two tags)
procedure two_test_run_by_two_tags;
+ --%test(Execute tests by passing two tags - Legacy notation)
+ procedure two_test_run_by_two_tags_leg;
+
--%test(Execute suite and all of its children)
procedure suite_with_children_tag;
@@ -235,15 +238,34 @@ create or replace package test_ut_run is
--%test(Runs tests from given paths with paths list and a tag)
procedure tag_run_func_path_list;
+ --%test(Runs tests from given paths with paths list and a tag - Legacy Notation)
+ procedure tag_run_func_path_list_leg;
+
--%test(Runs tests from given paths with paths list and include/exclude tags)
procedure tag_inc_exc_run_func_path_list;
+ --%test(Runs tests from given paths with paths list and include/exclude tags - Legacy Notation)
+ procedure tag_inc_exc_run_fun_pth_lst_lg;
+
--%test(Runs tests from given path and excludes specific tags)
procedure tag_exclude_run_func_path_list;
+ --%test(Runs tests from given path and excludes specific tags - Legacy Notation)
+ procedure tag_exclude_run_fun_pth_lst_lg;
+
--%test(Runs tests from given tags and exclude tags)
procedure tag_include_exclude_run_func;
+ --%test(Runs tests from given tags and exclude tags - Legacy Notation)
+ procedure tag_include_exclude_run_fun_lg;
+
+ --%test(Runs tests suing complex expressions)
+ procedure tag_complex_expressions;
+
+ --%test(Testing invalid tag expression)
+ --%throws(-20219)
+ procedure invalid_tag_expression;
+
--%endcontext
--%context(ut3_info context)
diff --git a/test/ut3_user/expectations/test_expectation_anydata.pkb b/test/ut3_user/expectations/test_expectation_anydata.pkb
index c56c31930..c70d41f9e 100644
--- a/test/ut3_user/expectations/test_expectation_anydata.pkb
+++ b/test/ut3_user/expectations/test_expectation_anydata.pkb
@@ -957,6 +957,23 @@ Rows: [ 60 differences, showing first 20 ]
ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0);
end;
+ procedure collection_not_to_contain is
+ l_actual ut3_tester_helper.test_dummy_object_list;
+ l_expected ut3_tester_helper.test_dummy_object_list;
+ begin
+ --Arrange
+ select ut3_tester_helper.test_dummy_object( rownum, 'Something2 '||rownum, rownum+100)
+ bulk collect into l_actual
+ from dual connect by level <=4;
+ select ut3_tester_helper.test_dummy_object( rownum, 'Something '||rownum, rownum)
+ bulk collect into l_expected
+ from dual connect by level <=2
+ order by rownum desc;
+ --Act
+ ut3_develop.ut.expect(anydata.convertCollection(l_actual)).not_to_contain(anydata.convertCollection(l_expected));
+ ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0);
+ end;
+
procedure object_to_contain is
begin
--Arrange
@@ -967,7 +984,7 @@ Rows: [ 60 differences, showing first 20 ]
ut3_develop.ut.expect(g_test_actual).to_contain(g_test_expected);
ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0);
end;
-
+
procedure arr_empty_eq_arr_empty_unord is
begin
--Arrange
diff --git a/test/ut3_user/expectations/test_expectation_anydata.pks b/test/ut3_user/expectations/test_expectation_anydata.pks
index 81dea74eb..54c246bd3 100644
--- a/test/ut3_user/expectations/test_expectation_anydata.pks
+++ b/test/ut3_user/expectations/test_expectation_anydata.pks
@@ -195,6 +195,9 @@ create or replace package test_expectation_anydata is
--%test( Success when anydata collection contains data from another anydata collection)
procedure collection_to_contain;
+ --%test( Success when anydata collection not contains data from another anydata collection)
+ procedure collection_not_to_contain;
+
--%test( Success when anydata object contains data from another anydata)
procedure object_to_contain;
diff --git a/test/ut3_user/expectations/test_expectations_cursor.pkb b/test/ut3_user/expectations/test_expectations_cursor.pkb
index 952084fd3..847cce9a0 100644
--- a/test/ut3_user/expectations/test_expectations_cursor.pkb
+++ b/test/ut3_user/expectations/test_expectations_cursor.pkb
@@ -2329,6 +2329,23 @@ Diff:%
ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0);
end;
+ procedure cursor_not_to_contain2
+ as
+ l_actual sys_refcursor;
+ l_expected sys_refcursor;
+ begin
+ open l_expected for select 'TEST' username, -600 user_id from dual;
+
+ open l_actual for select username, user_id from all_users
+ union all
+ select 'TEST1' username, -601 user_id from dual;
+
+ --Act
+ ut3_develop.ut.expect(l_actual).not_to(ut3_develop.contain(l_expected));
+ --Assert
+ ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0);
+ end;
+
procedure cursor_not_to_contain_fail is
l_actual sys_refcursor;
l_expected sys_refcursor;
@@ -2359,6 +2376,37 @@ Diff:%
ut.expect(l_actual_message).to_be_like(l_expected_message);
end;
+
+ procedure cursor_not_to_contain_fail2 is
+ l_actual sys_refcursor;
+ l_expected sys_refcursor;
+ l_expected_message varchar2(32767);
+ l_actual_message varchar2(32767);
+ begin
+ --Arrange
+ open l_expected for select 'TEST' username, -600 user_id from dual;
+
+ open l_actual for select username, user_id from all_users
+ union all
+ select 'TEST' username, -600 user_id from dual;
+
+ --Act
+ ut3_develop.ut.expect(l_actual).not_to(ut3_develop.contain(l_expected));
+ --Assert
+ l_expected_message := q'[%Actual: (refcursor [ count = % ])%
+%Data-types:%
+%VARCHAR2NUMBER%
+%Data:%
+%was expected not to contain:(refcursor [ count = 1 ])%
+%Data-types:%
+%CHARNUMBER%
+%Data:%
+%TEST-600%]';
+ l_actual_message := ut3_tester_helper.main_helper.get_failed_expectations(1);
+ --Assert
+ ut.expect(l_actual_message).to_be_like(l_expected_message);
+ end;
+
procedure cursor_not_to_contain_joinby is
l_actual sys_refcursor;
l_expected sys_refcursor;
@@ -2372,7 +2420,21 @@ Diff:%
--Assert
ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0);
end;
-
+
+ procedure cursor_not_to_contain_joinby2 is
+ l_actual sys_refcursor;
+ l_expected sys_refcursor;
+ begin
+ --Arrange
+ open l_actual for select username,rownum * 10 user_id from all_users where rownum < 5;
+ open l_expected for select username||to_char(rownum) username ,rownum user_id from all_users where rownum < 5;
+
+ --Act
+ ut3_develop.ut.expect(l_actual).not_to(ut3_develop.contain(l_expected).join_by('USER_ID'));
+ --Assert
+ ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0);
+ end;
+
procedure not_cont_join_incl_cols_as_lst is
l_actual sys_refcursor;
l_expected sys_refcursor;
@@ -2386,6 +2448,19 @@ Diff:%
ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0);
end;
+ procedure not_con_join_incl_cols_as_lst2 is
+ l_actual sys_refcursor;
+ l_expected sys_refcursor;
+ begin
+ --Arrange
+ open l_actual for select rownum as rn, 'b' as "A_Column", 'c' as A_COLUMN, 'x' SOME_COL, 'd' "Some_Col" from dual a connect by level < 10;
+ open l_expected for select rownum * 20 rn, 'a' as "A_Column", 'd' as A_COLUMN, 'x' SOME_COL, 'c' "Some_Col" from dual a connect by level < 4;
+ --Act
+ ut3_develop.ut.expect(l_actual).not_to(ut3_develop.contain(l_expected).include(ut3_develop.ut_varchar2_list('RN','//A_Column','SOME_COL')).join_by('RN'));
+ --Assert
+ ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0);
+ end;
+
procedure not_cont_join_excl_cols_as_lst is
l_actual sys_refcursor;
l_expected sys_refcursor;
@@ -2399,6 +2474,19 @@ Diff:%
ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0);
end;
+ procedure not_con_join_excl_cols_as_lst2 is
+ l_actual sys_refcursor;
+ l_expected sys_refcursor;
+ begin
+ --Arrange
+ open l_actual for select rownum as rn, 'a' as "A_Column", 'c' as A_COLUMN, 'y' SOME_COL, 'd' "Some_Col" from dual a connect by level < 10;
+ open l_expected for select rownum * 20 as rn, 'a' as "A_Column", 'd' as A_COLUMN, 'x' SOME_COL, 'c' "Some_Col" from dual a connect by level < 4;
+ --Act
+ ut3_develop.ut.expect(l_actual).not_to(ut3_develop.contain(l_expected).exclude(ut3_develop.ut_varchar2_list('//Some_Col','A_COLUMN')).join_by('RN'));
+ --Assert
+ ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0);
+ end;
+
procedure to_contain_duplicates is
l_actual sys_refcursor;
l_expected sys_refcursor;
@@ -2440,6 +2528,16 @@ Diff:%
ut.expect(l_actual_message).to_be_like(l_expected_message);
end;
+ procedure to_not_contain_fails_1245 is
+ c1 sys_refcursor;
+ c2 sys_refcursor;
+ begin
+ open c1 for select 'a' as letter from dual union all select 'b' from dual;
+ open c2 for select 'c' as letter from dual;
+ ut3_develop.ut.expect(c1).not_to(ut3_develop.contain(c2));
+ ut.expect(ut3_tester_helper.main_helper.get_failed_expectations_num).to_equal(0);
+ end;
+
procedure udt_messg_format_eq is
l_actual sys_refcursor;
l_expected sys_refcursor;
diff --git a/test/ut3_user/expectations/test_expectations_cursor.pks b/test/ut3_user/expectations/test_expectations_cursor.pks
index 0ed249a49..0f34486a9 100644
--- a/test/ut3_user/expectations/test_expectations_cursor.pks
+++ b/test/ut3_user/expectations/test_expectations_cursor.pks
@@ -376,24 +376,42 @@ create or replace package test_expectations_cursor is
--%test( Cursor not to contains data from another cursor)
procedure cursor_not_to_contain;
+ --%test( Cursor not_to[contain] data from another cursor)
+ procedure cursor_not_to_contain2;
+
--%test( Cursor fail not to contains data from another cursor)
procedure cursor_not_to_contain_fail;
-
+
+ --%test( Cursor fail not_to[contain] data from another cursor)
+ procedure cursor_not_to_contain_fail2;
+
--%test( Cursor not contains data from another cursor with joinby clause)
procedure cursor_not_to_contain_joinby;
+ --%test( Cursor not_to[contain] data from another cursor with joinby clause)
+ procedure cursor_not_to_contain_joinby2;
+
--%test(Cursor not contains data with of columns to include and join by value)
procedure not_cont_join_incl_cols_as_lst;
+ --%test(Cursor not_to[contain] data with of columns to include and join by value)
+ procedure not_con_join_incl_cols_as_lst2;
+
--%test(Cursor not contains data with of columns to exclude and join by value)
procedure not_cont_join_excl_cols_as_lst;
+ --%test(Cursor not_to[contain] data with of columns to exclude and join by value)
+ procedure not_con_join_excl_cols_as_lst2;
+
--%test(Cursor to contain duplicates)
procedure to_contain_duplicates;
--%test(Cursor to contain duplicates fail)
procedure to_contain_duplicates_fail;
-
+
+ --%test(Cursor using not_to[contain] fails #1245)
+ procedure to_not_contain_fails_1245;
+
--%test(Display a message with a uer defined type with only type name not structure on equal)
procedure udt_messg_format_eq;
diff --git a/test/ut3_user/reporters.pkb b/test/ut3_user/reporters.pkb
index b6d43b144..031683615 100644
--- a/test/ut3_user/reporters.pkb
+++ b/test/ut3_user/reporters.pkb
@@ -90,11 +90,10 @@ as
procedure erroring_test
is
- l_variable integer;
+ l_integer_variable integer;
begin
dbms_output.put_line('');
- l_variable := 'a string';
- ut3_develop.ut.expect(l_variable).to_equal(1);
+ l_integer_variable := 'a string';
end;
procedure disabled_test
diff --git a/test/ut3_user/reporters/test_coverage/test_cov_cobertura_reporter.pkb b/test/ut3_user/reporters/test_coverage/test_cov_cobertura_reporter.pkb
index 2c36f37ba..ad6c9dbb4 100644
--- a/test/ut3_user/reporters/test_coverage/test_cov_cobertura_reporter.pkb
+++ b/test/ut3_user/reporters/test_coverage/test_cov_cobertura_reporter.pkb
@@ -25,9 +25,9 @@ create or replace package body test_cov_cobertura_reporter is
]'||l_file_path||q'[
-
+
-
+
]'||l_block_cov||q'[
diff --git a/test/ut3_user/reporters/test_coverage/test_coverage_standalone.pkb b/test/ut3_user/reporters/test_coverage/test_coverage_standalone.pkb
index e5706f885..90cfb484e 100644
--- a/test/ut3_user/reporters/test_coverage/test_coverage_standalone.pkb
+++ b/test/ut3_user/reporters/test_coverage/test_coverage_standalone.pkb
@@ -20,9 +20,9 @@ create or replace package body test_coverage_standalone is
]'||l_file_path||q'[
-
+
-
+
]'||l_block_cov||q'[
diff --git a/test/ut3_user/reporters/test_documentation_reporter.pkb b/test/ut3_user/reporters/test_documentation_reporter.pkb
index 6ace70c49..2a05679ff 100644
--- a/test/ut3_user/reporters/test_documentation_reporter.pkb
+++ b/test/ut3_user/reporters/test_documentation_reporter.pkb
@@ -37,7 +37,7 @@ Failures:
%
%
2) erroring_test
- ORA-06502: PL/SQL: numeric or value error: character to number conversion error
+ ORA-06502: PL/SQL: %: character to number conversion error
ORA-06512: at "UT3_USER.TEST_REPORTERS", line 44%
ORA-06512: at line 6
Finished in % seconds
diff --git a/test/ut3_user/reporters/test_teamcity_reporter.pkb b/test/ut3_user/reporters/test_teamcity_reporter.pkb
index ff550e488..517ddc037 100644
--- a/test/ut3_user/reporters/test_teamcity_reporter.pkb
+++ b/test/ut3_user/reporters/test_teamcity_reporter.pkb
@@ -31,12 +31,37 @@ create or replace package body test_teamcity_reporter as
end;
end;]';
+ execute immediate q'[create or replace package check_multiple_failures is
+ --%suite
+
+ --%test
+ procedure multi_failure;
+
+ --%test
+ procedure multi_failure_on_error;
+ end;]';
+ execute immediate q'[create or replace package body check_multiple_failures is
+ procedure multi_failure is
+ begin
+ ut3_develop.ut.expect(1).to_be_null;
+ ut3_develop.ut.expect(2).to_equal(1);
+ ut3_develop.ut.expect('Bad').to_equal('Good');
+ end;
+ procedure multi_failure_on_error is
+ l_integer_variable integer;
+ begin
+ ut3_develop.ut.expect(1).to_be_null;
+ ut3_develop.ut.expect(2).to_equal(1);
+ ut3_develop.ut.expect('Bad').to_equal('Good');
+ l_integer_variable := 'a string';
+ end;
+ end;]';
+
end;
procedure report_produces_expected_out is
l_output_data ut3_develop.ut_varchar2_list;
- l_output clob;
l_expected varchar2(32767);
begin
l_expected := q'{%##teamcity[testSuiteStarted timestamp='%' name='org']
@@ -63,8 +88,8 @@ create or replace package body test_teamcity_reporter as
-%##teamcity[testStdErr timestamp='%' name='ut3_user.test_reporters.erroring_test' out='Test exception:|nORA-06502: PL/SQL: numeric or value error: character to number conversion error|nORA-06512: at "UT3_USER.TEST_REPORTERS", line %|nORA-06512: at %|n']
-%##teamcity[testFailed timestamp='%' details='Test exception:|nORA-06502: PL/SQL: numeric or value error: character to number conversion error|nORA-06512: at "UT3_USER.TEST_REPORTERS", line %|nORA-06512: at %|n' message='Error occured' name='ut3_user.test_reporters.erroring_test']
+%##teamcity[testStdErr timestamp='%' name='ut3_user.test_reporters.erroring_test' out='Test exception:|nORA-06502: PL/SQL: %: character to number conversion error|nORA-06512: at "UT3_USER.TEST_REPORTERS", line %|nORA-06512: at %|n']
+%##teamcity[testFailed timestamp='%' details='Test exception:|nORA-06502: PL/SQL: %: character to number conversion error|nORA-06512: at "UT3_USER.TEST_REPORTERS", line %|nORA-06512: at %|n' message='Error occured' name='ut3_user.test_reporters.erroring_test']
%##teamcity[testFinished timestamp='%' duration='%' name='ut3_user.test_reporters.erroring_test']
%##teamcity[testStarted timestamp='%' captureStandardOutput='true' name='ut3_user.test_reporters.disabled_test']
%##teamcity[testIgnored timestamp='%' name='ut3_user.test_reporters.disabled_test']
@@ -84,7 +109,6 @@ create or replace package body test_teamcity_reporter as
procedure escape_special_chars is
l_output_data ut3_develop.ut_varchar2_list;
- l_output clob;
l_expected varchar2(32767);
begin
l_expected := q'{%##teamcity[testSuiteStarted timestamp='%' name='A suite with |'quote|'']
@@ -103,7 +127,6 @@ create or replace package body test_teamcity_reporter as
procedure trims_long_output is
l_output_data ut3_develop.ut_varchar2_list;
- l_output clob;
l_expected varchar2(32767);
begin
l_expected := q'{%##teamcity[testSuiteStarted timestamp='%' name='check_trims_long_output']
@@ -120,11 +143,54 @@ create or replace package body test_teamcity_reporter as
ut.expect(ut3_tester_helper.main_helper.table_to_clob(l_output_data)).to_be_like(l_expected);
end;
+ procedure report_multiple_expectations is
+ l_output_data ut3_develop.ut_varchar2_list;
+ l_expected varchar2(32767);
+ begin
+ l_expected := q'{%##teamcity[testSuiteStarted timestamp='%' name='check_multiple_failures']
+%##teamcity[testStarted timestamp='%' captureStandardOutput='true' name='ut3_user.check_multiple_failures.multi_failure']
+%##teamcity[testFailed timestamp='%' details='Actual: 1 (number) was expected to be null' name='ut3_user.check_multiple_failures.multi_failure']
+%##teamcity[testFailed timestamp='%' details='Actual: 2 (number) was expected to equal: 1 (number)' name='ut3_user.check_multiple_failures.multi_failure']
+%##teamcity[testFailed timestamp='%' details='Actual: |'Bad|' (varchar2) was expected to equal: |'Good|' (varchar2)' name='ut3_user.check_multiple_failures.multi_failure']
+%##teamcity[testFinished timestamp='%' duration='%' name='ut3_user.check_multiple_failures.multi_failure']
+%##teamcity[testSuiteFinished timestamp='%' name='check_multiple_failures']}';
+ --act
+ select *
+ bulk collect into l_output_data
+ from table(ut3_develop.ut.run('check_multiple_failures.multi_failure',ut3_develop.ut_teamcity_reporter()));
+
+ --assert
+ ut.expect(ut3_tester_helper.main_helper.table_to_clob(l_output_data)).to_be_like(l_expected);
+ end;
+
+ procedure report_multiple_expect_on_err is
+ l_output_data ut3_develop.ut_varchar2_list;
+ l_expected varchar2(32767);
+ begin
+ l_expected := q'{%##teamcity[testSuiteStarted timestamp='%' name='check_multiple_failures']
+%##teamcity[testStarted timestamp='%' captureStandardOutput='true' name='ut3_user.check_multiple_failures.multi_failure_on_error']
+%##teamcity[testStdErr timestamp='%' name='ut3_user.check_multiple_failures.multi_failure_on_error' out='Test exception:|nORA-06502: PL/SQL: %: character to number conversion error|nORA-06512: at "UT3_USER.CHECK_MULTIPLE_FAILURES", line %|nORA-06512: at %|n']
+%##teamcity[testFailed timestamp='%' details='Test exception:|nORA-06502: PL/SQL: %: character to number conversion error|nORA-06512: at "UT3_USER.CHECK_MULTIPLE_FAILURES", line %|nORA-06512: at %|n' message='Error occured' name='ut3_user.check_multiple_failures.multi_failure_on_error']
+%##teamcity[testFailed timestamp='%' details='Actual: 1 (number) was expected to be null' name='ut3_user.check_multiple_failures.multi_failure_on_error']
+%##teamcity[testFailed timestamp='%' details='Actual: 2 (number) was expected to equal: 1 (number)' name='ut3_user.check_multiple_failures.multi_failure_on_error']
+%##teamcity[testFailed timestamp='%' details='Actual: |'Bad|' (varchar2) was expected to equal: |'Good|' (varchar2)' name='ut3_user.check_multiple_failures.multi_failure_on_error']
+%##teamcity[testFinished timestamp='%' duration='%' name='ut3_user.check_multiple_failures.multi_failure_on_error']
+%##teamcity[testSuiteFinished timestamp='%' name='check_multiple_failures']}';
+ --act
+ select *
+ bulk collect into l_output_data
+ from table(ut3_develop.ut.run('check_multiple_failures.multi_failure_on_error',ut3_develop.ut_teamcity_reporter()));
+
+ --assert
+ ut.expect(ut3_tester_helper.main_helper.table_to_clob(l_output_data)).to_be_like(l_expected);
+ end;
+
procedure remove_test_package is
pragma autonomous_transaction;
begin
execute immediate 'drop package check_escape_special_chars';
execute immediate 'drop package check_trims_long_output';
+ execute immediate 'drop package check_multiple_failures';
end;
end;
diff --git a/test/ut3_user/reporters/test_teamcity_reporter.pks b/test/ut3_user/reporters/test_teamcity_reporter.pks
index f849751f1..1b9277e7a 100644
--- a/test/ut3_user/reporters/test_teamcity_reporter.pks
+++ b/test/ut3_user/reporters/test_teamcity_reporter.pks
@@ -15,6 +15,12 @@ create or replace package test_teamcity_reporter as
--%test(Trims output so it fits into 4000 chars)
procedure trims_long_output;
+ --%test(Reports failures on multiple expectations)
+ procedure report_multiple_expectations;
+
+ --%test(Reports failures on multiple expectations)
+ procedure report_multiple_expect_on_err;
+
--%afterall
procedure remove_test_package;
diff --git a/test/ut3_user/reporters/test_tfs_junit_reporter.pkb b/test/ut3_user/reporters/test_tfs_junit_reporter.pkb
index 7eb4f8ab6..1036be2ba 100644
--- a/test/ut3_user/reporters/test_tfs_junit_reporter.pkb
+++ b/test/ut3_user/reporters/test_tfs_junit_reporter.pkb
@@ -8,7 +8,7 @@ create or replace package body test_tfs_junit_reporter as
--%test(A test with )
procedure test_do_stuff;
-
+
end;]';
execute immediate q'[create or replace package body check_junit_reporting is
procedure test_do_stuff is
@@ -18,12 +18,12 @@ create or replace package body test_tfs_junit_reporter as
end;
end;]';
-
+
execute immediate q'[create or replace package check_junit_rep_suitepath is
--%suitepath(core)
--%suite(check_junit_rep_suitepath)
--%displayname(Check JUNIT Get path for suitepath)
-
+
--%test(check_junit_rep_suitepath)
--%displayname(Check JUNIT Get path for suitepath)
procedure check_junit_rep_suitepath;
@@ -38,7 +38,7 @@ create or replace package body test_tfs_junit_reporter as
execute immediate q'[create or replace package check_junit_flat_suitepath is
--%suitepath(core.check_junit_rep_suitepath)
--%suite(flatsuitepath)
-
+
--%beforeall
procedure donuffin;
end;]';
@@ -49,8 +49,85 @@ create or replace package body test_tfs_junit_reporter as
end;
end;]';
- end;
+ execute immediate q'[create or replace package check_junit_in_context is
+ --%suitepath(core.check_junit_rep_suitepath)
+ --%suite(inctxsuite)
+ --%displayname(JUNIT test are inside context)
+
+ -- %context(incontext)
+ -- %name(incontext)
+
+ --%test(incontext)
+ --%displayname(Check JUNIT Get path incontext)
+ procedure check_junit_rep_incontext;
+
+ -- %endcontext
+ end;]';
+ execute immediate q'[create or replace package body check_junit_in_context is
+ procedure check_junit_rep_incontext is
+ begin
+ ut3_develop.ut.expect(1).to_equal(1);
+ end;
+ end;]';
+
+ execute immediate q'[create or replace package check_junit_out_context is
+ --%suitepath(core)
+ --%suite(outctxsuite)
+ --%displayname(JUNIT test are outside context)
+
+ -- %context(outcontext)
+ -- %name(outcontext)
+
+ -- %endcontext
+
+
+ --%test(outctx)
+ --%displayname(outctx)
+ procedure outctx;
+
+
+ end;]';
+ execute immediate q'[create or replace package body check_junit_out_context is
+ procedure outctx is
+ begin
+ ut3_develop.ut.expect(1).to_equal(1);
+ end;
+ end;]';
+
+ execute immediate q'[create or replace package check_junit_inout_context is
+ --%suitepath(core)
+ --%suite(inoutcontext)
+ --%displayname(Test in and out of context)
+ -- %context(incontext)
+ -- %name(ProductincontextFeatures)
+
+ --%test(inctx)
+ --%displayname(inctx)
+ procedure inctx;
+
+ -- %endcontext
+
+
+ --%test(outctx)
+ --%displayname(outctx)
+ procedure outctx;
+
+
+ end;]';
+ execute immediate q'[create or replace package body check_junit_inout_context is
+ procedure inctx is
+ begin
+ ut3_develop.ut.expect(1).to_equal(1);
+ end;
+
+ procedure outctx is
+ begin
+ ut3_develop.ut.expect(1).to_equal(1);
+ end;
+ end;]';
+
+ end;
procedure escapes_special_chars is
l_results ut3_develop.ut_varchar2_list;
@@ -92,7 +169,7 @@ create or replace package body test_tfs_junit_reporter as
--Assert
ut.expect(l_actual).to_be_like('%testcase classname="check_junit_reporting"%');
end;
-
+
procedure check_flatten_nested_suites is
l_results ut3_develop.ut_varchar2_list;
l_actual clob;
@@ -111,7 +188,7 @@ create or replace package body test_tfs_junit_reporter as
%');
end;
-
+
procedure check_nls_number_formatting is
l_results ut3_develop.ut_varchar2_list;
l_actual clob;
@@ -163,5 +240,73 @@ create or replace package body test_tfs_junit_reporter as
reporters.check_xml_encoding_included(ut3_develop.ut_tfs_junit_reporter(), 'UTF-8');
end;
+ procedure reports_only_test_in_ctx is
+ l_results ut3_develop.ut_varchar2_list;
+ l_actual clob;
+ begin
+ --Act
+ select *
+ bulk collect into l_results
+ from table(ut3_develop.ut.run('check_junit_in_context',ut3_develop.ut_tfs_junit_reporter()));
+ l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results);
+ --Assert
+ ut.expect(l_actual).to_be_like('
+
+
+
+
+
+
+
+
+%');
+ end;
+
+ procedure reports_only_test_out_ctx is
+ l_results ut3_develop.ut_varchar2_list;
+ l_actual clob;
+ begin
+ --Act
+ select *
+ bulk collect into l_results
+ from table(ut3_develop.ut.run('check_junit_out_context',ut3_develop.ut_tfs_junit_reporter()));
+ l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results);
+ --Assert
+ ut.expect(l_actual).to_be_like('
+
+
+
+
+
+
+
+
+%');
+ end;
+
+ procedure reports_only_test_inout_ctx is
+ l_results ut3_develop.ut_varchar2_list;
+ l_actual clob;
+ begin
+ --Act
+ select *
+ bulk collect into l_results
+ from table(ut3_develop.ut.run('check_junit_inout_context',ut3_develop.ut_tfs_junit_reporter()));
+ l_actual := ut3_tester_helper.main_helper.table_to_clob(l_results);
+ --Assert
+ ut.expect(l_actual).to_be_like('
+
+
+
+
+
+
+
+
+
+
+%');
+ end;
+
end;
-/
+/
\ No newline at end of file
diff --git a/test/ut3_user/reporters/test_tfs_junit_reporter.pks b/test/ut3_user/reporters/test_tfs_junit_reporter.pks
index 07acb4d21..70f78e334 100644
--- a/test/ut3_user/reporters/test_tfs_junit_reporter.pks
+++ b/test/ut3_user/reporters/test_tfs_junit_reporter.pks
@@ -30,6 +30,15 @@ create or replace package test_tfs_junit_reporter as
--%test(Includes XML header with encoding when encoding provided)
procedure check_encoding_included;
+ --%test(Reports only testsuites where there are any testcases, all tests are in context)
+ procedure reports_only_test_in_ctx;
+
+ --%test(Reports only testsuites where there are any testcases, all tests are outside context)
+ procedure reports_only_test_out_ctx;
+
+ --%test(Reports only testsuites where there are any testcases, one test in ctx one test outside)
+ procedure reports_only_test_inout_ctx;
+
--%afterall
procedure remove_test_package;
end;