diff --git a/.travis.yml b/.travis.yml index 7fa054ded..5da14e7a9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -86,7 +86,6 @@ install: before_script: - if [[ ! $TRAVIS_TAG ]]; then bash .travis/install.sh; fi - if [[ ! $TRAVIS_TAG ]]; then bash .travis/install_utplsql_release.sh; fi - - if [[ ! $TRAVIS_TAG ]]; then bash .travis/create_additional_grants_for_old_tests.sh; fi - if [[ ! $TRAVIS_TAG ]]; then bash .travis/run_examples.sh; fi - if [[ ! $TRAVIS_TAG ]]; then bash .travis/run_old_tests.sh; fi diff --git a/.travis/create_additional_grants_for_old_tests.sh b/.travis/create_additional_grants_for_old_tests.sh deleted file mode 100644 index c07bfc4a7..000000000 --- a/.travis/create_additional_grants_for_old_tests.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash - -cd source -set -ev - -#additional privileges to run scripted tests -"$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL -set feedback on ---needed for Mystats script to work -grant select any dictionary to $UT3_OWNER; ---Needed for testing a coverage outside ut3_owner. -grant create any procedure, drop any procedure, execute any procedure to $UT3_OWNER; - -exit -SQL - -#Create additional users -"$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL -set feedback off -@create_utplsql_owner.sql $UT3_USER $UT3_USER_PASSWORD $UT3_TABLESPACE - -exit -SQL \ No newline at end of file diff --git a/.travis/install.sh b/.travis/install.sh index 1c3e3ef7e..bb99a0e2d 100644 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -69,3 +69,30 @@ revoke execute on dbms_crypto from $UT3_TESTER; grant create job to $UT3_TESTER; exit SQL + +#additional privileges to run tests +"$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL +set feedback on +--needed for Mystats script to work +grant select any dictionary to $UT3_OWNER; +--Needed for testing a coverage outside ut3_owner. +grant create any procedure, drop any procedure, execute any procedure to $UT3_OWNER; + +exit +SQL + +#Create additional users +"$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL +set feedback off +@create_utplsql_owner.sql $UT3_USER $UT3_USER_PASSWORD $UT3_TABLESPACE + +exit +SQL + +#Grant UT3 framework to UT3$USER# +"$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL +set feedback off +@create_user_grants.sql $UT3_OWNER $UT3_USER + +exit +SQL diff --git a/development/install.sh b/development/install.sh index 42bc88d85..4104e2672 100755 --- a/development/install.sh +++ b/development/install.sh @@ -18,7 +18,3 @@ if ! .travis/install_utplsql_release.sh; then echo -e ${header}"\nFailed to install utPLSQL from branch ${SELFTESTING_BRANCH} into ${UT3_RELEASE_VERSION_SCHEMA}\n"${header} exit 1 fi -if ! .travis/create_additional_grants_for_old_tests.sh; then - echo -e ${header}"Failed to add grants needed old_tests\n"${header} - exit 1 -fi diff --git a/docs/userguide/coverage.md b/docs/userguide/coverage.md index f123a0d22..1d4ca93c5 100644 --- a/docs/userguide/coverage.md +++ b/docs/userguide/coverage.md @@ -230,10 +230,10 @@ C: \hr.test_betwnstr.pks ``` -By default, utPLSQL will convert file paths into database objects using the following regular expression `/((\w+)\.)?(\w+)\.(\w{3})$` +By default, utPLSQL will convert file paths into database objects using the following regular expression `/(((\w|[$#])+)\.)?((\w|[$#])+)\.(\w{3})$` - object owner (if it is present) is identified by the expression in the second set of brackets -- object name is identified by the expression in the third set of brackets -- object type is identified by the expression in the fourth set of brackets +- object name is identified by the expression in the fourth set of brackets +- object type is identified by the expression in the sixth set of brackets **Note** diff --git a/old_tests/RunAll.sql b/old_tests/RunAll.sql index 031f10574..f785aabc1 100644 --- a/old_tests/RunAll.sql +++ b/old_tests/RunAll.sql @@ -37,94 +37,19 @@ create table ut$test_table (val varchar2(1)); exec ut_coverage.coverage_start(); exec ut_coverage.set_develop_mode(true); -@@lib/RunTest.sql ut_expectation_processor/who_called_expectation.parseStackTrace.sql -@@lib/RunTest.sql ut_expectation_processor/who_called_expectation.parseStackTraceWith0x.sql -@@lib/RunTest.sql ut_expectations/ut.expect.to_be_false.GivesFailureWhenExpessionIsNotBoolean.sql -@@lib/RunTest.sql ut_expectations/ut.expect.to_be_false.GivesFailureWhenExpessionIsNull.sql -@@lib/RunTest.sql ut_expectations/ut.expect.to_be_false.GivesFailureWhenExpessionIsTrue.sql -@@lib/RunTest.sql ut_expectations/ut.expect.to_be_false.GivesSuccessWhenExpessionIsFalse.sql -@@lib/RunTest.sql ut_expectations/ut.expect.to_be_like.FailsForUnsupportedDatatype.sql -@@lib/RunTest.sql ut_expectations/ut.expect.to_be_null.anydata.GivesSuccessWhenAnydataIsNull.sql -@@lib/RunTest.sql ut_expectations/ut.expect.to_be_null.anydata.GivesSuccessWhenCollectionPassedIsNull.sql -@@lib/RunTest.sql ut_expectations/ut.expect.to_be_null.anydata.GivesSuccessWhenObjectPassedIsNull.sql -@@lib/RunTest.sql ut_expectations/ut.expect.to_be_true.GivesFailureWhenExpessionIsFalse.sql -@@lib/RunTest.sql ut_expectations/ut.expect.to_be_true.GivesFailureWhenExpessionIsNotBoolean.sql -@@lib/RunTest.sql ut_expectations/ut.expect.to_be_true.GivesFailureWhenExpessionIsNull.sql -@@lib/RunTest.sql ut_expectations/ut.expect.to_be_true.GivesSuccessWhenExpessionIsTrue.sql -@@ut_expectations/ut.expect.not_to_equal.GivesFailureForEqualValues.sql -@@ut_expectations/ut.expect.not_to_equal.GivesSuccessForDifferentValues.sql -@@lib/RunTest.sql ut_expectations/ut.expect.to_match.FailsForUnsupportedDatatype.sql -@@lib/RunTest.sql ut_expectations/ut_data_value_object.compare.Gives0WhenComparingIdenticalObjects.sql @@lib/RunTest.sql ut_expectations/ut_expectation_processor.nulls_are_equal.raisesExceptionWhenTryingToSetNullValue.sql @@lib/RunTest.sql ut_expectations/ut_expectation_processor.stackOnFailedTest.sql @@lib/RunTest.sql ut_expectations/ut_expectation_processor.stackOnUtFail.sql -@@ut_matchers/be_between.sql -@@ut_matchers/be_like.sql -@@ut_matchers/match.sql - -@@lib/RunTest.sql ut_matchers/timestamp_between.sql -@@lib/RunTest.sql ut_matchers/timestamp_ltz_between.sql -@@lib/RunTest.sql ut_matchers/timestamp_ltz_not_between.sql -@@lib/RunTest.sql ut_matchers/timestamp_not_between.sql -@@lib/RunTest.sql ut_matchers/timestamp_tz_between.sql -@@lib/RunTest.sql ut_matchers/timestamp_tz_not_between.sql - @@lib/RunTest.sql ut_metadata/ut_metadata.form_name.TrimStandaloneProgramName.sql -@@lib/RunTest.sql ut_output_buffer/get_lines.RecievesALineFromBufferTableAndDeletes.sql -@@lib/RunTest.sql ut_output_buffer/get_lines.WaitsForMoreDataToAppearForSpecifiedTime.sql -@@lib/RunTest.sql ut_output_buffer/get_lines.WaitsForTheDataToAppearForSpecifiedTime.sql -@@lib/RunTest.sql ut_output_buffer/send_line.DoesNotSendLineIfNullTextGiven.sql -@@lib/RunTest.sql ut_output_buffer/send_line.SendsALineIntoBufferTable.sql - @@lib/RunTest.sql ut_reporters/ut_documentation_reporter.providesCorrectLineFromStacktrace.sql @@lib/RunTest.sql ut_reporters/ut_documentation_reporter.reportMultipleWarnings.sql @@lib/RunTest.sql ut_reporters/ut_documentation_reporter.reportTestTiming.sql @@lib/RunTest.sql ut_reporters/ut_html_reporter.DefaultSchemaCoverage.sql @@lib/RunTest.sql ut_reporters/ut_html_reporter.UserOverrideSchemaCoverage.sql -@@lib/RunTest.sql ut_reporters/ut_teamcity_reporter.ProducesExpectedOutputs.sql - -@@lib/RunTest.sql ut/ut.run.AcceptsCoverageFileList.sql -@@lib/RunTest.sql ut/ut.run.AcceptsCoverageFileListWithSutePaths.sql -@@lib/RunTest.sql ut/ut.run.AcceptsSutePaths.sql -@@lib/RunTest.sql ut/ut.run.ExecutesSuccesfullyAnEmptySuite.sql -@@lib/RunTest.sql ut/ut.run.FailsToExecuteAnInvalidPackageBody.sql -@@lib/RunTest.sql ut/ut.run.function.AcceptsCoverageFileList.sql -@@lib/RunTest.sql ut/ut.run.function.AcceptsCoverageFileListWithSutePaths.sql -@@lib/RunTest.sql ut/ut.run.function.AcceptsSutePaths.sql -@@lib/RunTest.sql ut/ut.run.function.WithGivenReporter.ExectutesAllInCurrentSchemaUsingReporter.sql -@@lib/RunTest.sql ut/ut.run.function.WithNoParams.ExecutesAllFromCurrentSchema.sql -@@lib/RunTest.sql ut/ut.run.function.WithPackageName.ExecutesAllFromGivenPackage.sql ---@@lib/RunTest.sql ut.run/ut.run.function.WithPackageName.ExecutesAllFromGivenPackageOnly.sql --TODO this one doesn't work at the moment -@@lib/RunTest.sql ut/ut.run.function.WithSchemaName.ExecutesAllFromGivenSchema.sql -@@lib/RunTest.sql ut/ut.run.function.WithSuitePath.ExecutesAllFromGivenPath.sql -@@lib/RunTest.sql ut/ut.run.WithGivenReporter.ExectutesAllInCurrentSchemaUsingReporter.sql -@@lib/RunTest.sql ut/ut.run.WithNoParams.ExecutesAllFromCurrentSchema.sql -@@lib/RunTest.sql ut/ut.run.WithPackageName.ExecutesAllFromGivenPackage.sql ---@@lib/RunTest.sql ut.run/ut.run.WithPackageName.ExecutesAllFromGivenPackageOnly.sql --TODO this one doesn't work at the moment -@@lib/RunTest.sql ut/ut.run.WithSchemaName.ExecutesAllFromGivenSchema.sql -@@lib/RunTest.sql ut/ut.run.WithSuitePath.ExecutesAllFromGivenPath.sql -@@lib/RunTest.sql ut/ut.version.sql @@lib/RunTest.sql ut_suite_manager/ut_suite_manager.AllowsDescriptionsWithComma.sql -@@lib/RunTest.sql ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheSchema.sql -@@lib/RunTest.sql ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTopPackageByPath.sql -@@lib/RunTest.sql ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTopPackageByPathCurUser.sql -@@lib/RunTest.sql ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTop2PackageByPath.sql -@@lib/RunTest.sql ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTop2PackageByPathCurUser.sql -@@lib/RunTest.sql ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTopPackageWithoutSubsuitesByPath.sql -@@lib/RunTest.sql ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTopPackageWithoutSubsuitesByPathCurUser.sql -@@lib/RunTest.sql ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTopPackageByName.sql -@@lib/RunTest.sql ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTopPackageByNameCurUser.sql -@@lib/RunTest.sql ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTop2PackageByName.sql -@@lib/RunTest.sql ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTop2PackageByNameCurUser.sql -@@lib/RunTest.sql ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTopPackageWithoutSubsuitesByName.sql -@@lib/RunTest.sql ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTopPackageWithoutSubsuitesByNameCurUser.sql -@@lib/RunTest.sql ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTopPackageProcedureByPath.sql -@@lib/RunTest.sql ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTopPackageProcedureByPathCurUser.sql -@@lib/RunTest.sql ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTop2PackageProcedureByPath.sql -@@lib/RunTest.sql ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTop2PackageProcedureByPathCurUser.sql @@lib/RunTest.sql ut_suite_manager/ut_suite_manager.emptySuitePath.sql @@lib/RunTest.sql ut_suite_manager/ut_suite_manager.get_schema_ut_packages.IncludesPackagesWithSutePath.sql @@lib/RunTest.sql ut_suite_manager/ut_suite_manager.IncludesInvalidPackageBodiesInTheRun.sql diff --git a/old_tests/ut/ut.run.AcceptsCoverageFileList.sql b/old_tests/ut/ut.run.AcceptsCoverageFileList.sql deleted file mode 100644 index 0dea02727..000000000 --- a/old_tests/ut/ut.run.AcceptsCoverageFileList.sql +++ /dev/null @@ -1,30 +0,0 @@ -declare - l_output_data dbms_output.chararr; - l_num_lines integer := 100000; - l_packages_reported integer := 0; -begin - --act - ut.run( - ut_sonar_test_reporter(), a_source_files => ut_varchar2_list(), - a_test_files => ut_varchar2_list('tests/test_package_1.pkb','tests/test_package_2.pkb','tests/test_package_3.pkb') - ); - dbms_output.get_lines( l_output_data, l_num_lines); - - for i in 1 .. l_num_lines loop - if l_output_data(i) like '%tests/test_package_1.pkb%' escape '\' - or l_output_data(i) like '%tests/test_package_2.pkb%' - or l_output_data(i) like '%tests/test_package_3.pkb%' then - l_packages_reported := l_packages_reported + 1; - end if; - end loop; - - if l_packages_reported = 3 then - :test_result := ut_utils.gc_success; - else - for i in 1 .. l_output_data.count loop - dbms_output.put_line(l_output_data(i)); - end loop; - dbms_output.put_line('Failed: not all package paths were found in the outputs. Expected 3, got '||l_packages_reported); - end if; -end; -/ diff --git a/old_tests/ut/ut.run.AcceptsCoverageFileListWithSutePaths.sql b/old_tests/ut/ut.run.AcceptsCoverageFileListWithSutePaths.sql deleted file mode 100644 index 73046daf9..000000000 --- a/old_tests/ut/ut.run.AcceptsCoverageFileListWithSutePaths.sql +++ /dev/null @@ -1,30 +0,0 @@ -declare - l_output_data dbms_output.chararr; - l_num_lines integer := 100000; - l_packages_reported integer := 0; -begin - --act - ut.run( - ut_varchar2_list('test_package_1','test_package_3'), ut_sonar_test_reporter(), - a_source_files => ut_varchar2_list(), a_test_files => ut_varchar2_list('tests/test_package_1.pkb','tests/test_package_2.pkb','tests/test_package_3.pkb') - ); - dbms_output.get_lines( l_output_data, l_num_lines); - - for i in 1 .. l_num_lines loop - if l_output_data(i) like '%tests/test_package_1.pkb%' escape '\' - or l_output_data(i) like '%tests/test_package_2.pkb%' - or l_output_data(i) like '%tests/test_package_3.pkb%' then - l_packages_reported := l_packages_reported + 1; - end if; - end loop; - - if l_packages_reported = 3 then - :test_result := ut_utils.gc_success; - else - for i in 1 .. l_output_data.count loop - dbms_output.put_line(l_output_data(i)); - end loop; - dbms_output.put_line('Failed: not all package paths were found in the outputs. Expected 3, got '||l_packages_reported); - end if; -end; -/ diff --git a/old_tests/ut/ut.run.AcceptsSutePaths.sql b/old_tests/ut/ut.run.AcceptsSutePaths.sql deleted file mode 100644 index 1ed2b001b..000000000 --- a/old_tests/ut/ut.run.AcceptsSutePaths.sql +++ /dev/null @@ -1,27 +0,0 @@ -declare - l_output_data dbms_output.chararr; - l_num_lines integer := 100000; - l_packages_executed integer := 0; -begin - --act - ut.run(ut_varchar2_list('test_package_1','test_package_3'),ut_teamcity_reporter()); - dbms_output.get_lines( l_output_data, l_num_lines); - - for i in 1 .. l_num_lines loop - if l_output_data(i) like '%Finished %''%test\_package\_1''%' escape '\' - or l_output_data(i) like '%Finished %''%test_package_2''%' - or l_output_data(i) like '%Finished %''%test_package_3''%' then - l_packages_executed := l_packages_executed + 1; - end if; - end loop; - - if l_packages_executed = 3 then - :test_result := ut_utils.gc_success; - else - for i in 1 .. l_output_data.count loop - dbms_output.put_line(l_output_data(i)); - end loop; - dbms_output.put_line('Failed: not all packages were found in the outputs. Expected 3, got '||l_packages_executed); - end if; -end; -/ diff --git a/old_tests/ut/ut.run.ExecutesSuccesfullyAnEmptySuite.sql b/old_tests/ut/ut.run.ExecutesSuccesfullyAnEmptySuite.sql deleted file mode 100644 index 35a752acd..000000000 --- a/old_tests/ut/ut.run.ExecutesSuccesfullyAnEmptySuite.sql +++ /dev/null @@ -1,30 +0,0 @@ -set termout off -create or replace package empty_suite as - -- %suite - - procedure not_a_test; -end; -/ -create or replace package body empty_suite as - procedure not_a_test is begin null; end; -end; -/ -set termout on -declare - l_result integer; -begin - select * - into l_result - from table(ut.run('empty_suite',utplsql_test_reporter())); ---Assert - if l_result = ut_utils.gc_error then - :test_result := ut_utils.gc_success; - else - dbms_output.put_line('expected failure of ''empty_suite'' got: '''||ut_utils.test_result_to_char(l_result)||'''' ); - end if; -end; -/ - -set termout off -drop package empty_suite; -set termout on diff --git a/old_tests/ut/ut.run.FailsToExecuteAnInvalidPackageBody.sql b/old_tests/ut/ut.run.FailsToExecuteAnInvalidPackageBody.sql deleted file mode 100644 index b37fe1529..000000000 --- a/old_tests/ut/ut.run.FailsToExecuteAnInvalidPackageBody.sql +++ /dev/null @@ -1,35 +0,0 @@ -set termout off -create table test_dependency_table (id integer); -create or replace package test_dependencies as - -- %suite - - -- %test - procedure dependant; -end; -/ -create or replace package body test_dependencies as - gc_dependant_variable test_dependency_table.id%type; - procedure dependant is begin null; end; -end; -/ -drop table test_dependency_table; -set termout on - -declare - l_result integer; -begin - select * - into l_result - from table(ut.run('test_dependencies',utplsql_test_reporter())); ---Assert - if l_result = ut_utils.gc_error then - :test_result := ut_utils.gc_success; - else - dbms_output.put_line('expected failure of ''test_dependencies'' got: '''||ut_utils.test_result_to_char(l_result)||'''' ); - end if; -end; -/ - -set termout off -drop package test_dependencies; -set termout on diff --git a/old_tests/ut/ut.run.WithGivenReporter.ExectutesAllInCurrentSchemaUsingReporter.sql b/old_tests/ut/ut.run.WithGivenReporter.ExectutesAllInCurrentSchemaUsingReporter.sql deleted file mode 100644 index 88aa01d1e..000000000 --- a/old_tests/ut/ut.run.WithGivenReporter.ExectutesAllInCurrentSchemaUsingReporter.sql +++ /dev/null @@ -1,27 +0,0 @@ -declare - l_output_data dbms_output.chararr; - l_num_lines integer := 100000; - l_packages_executed integer := 0; -begin - --act - ut.run(ut_teamcity_reporter()); - dbms_output.get_lines( l_output_data, l_num_lines); - - for i in 1 .. l_num_lines loop - if l_output_data(i) like '%Finished %''%test\_package\_1''%' escape '\' - or l_output_data(i) like '%Finished %''%test_package_2''%' - or l_output_data(i) like '%Finished %''%test_package_3''%' then - l_packages_executed := l_packages_executed + 1; - end if; - end loop; - - if l_packages_executed = 3 then - :test_result := ut_utils.gc_success; - else - for i in 1 .. l_num_lines loop - dbms_output.put_line(l_output_data(i)); - end loop; - dbms_output.put_line('Failed: not all packages were found in the outputs. Expected 3, got '||l_packages_executed); - end if; -end; -/ diff --git a/old_tests/ut/ut.run.WithNoParams.ExecutesAllFromCurrentSchema.sql b/old_tests/ut/ut.run.WithNoParams.ExecutesAllFromCurrentSchema.sql deleted file mode 100644 index f50403dcd..000000000 --- a/old_tests/ut/ut.run.WithNoParams.ExecutesAllFromCurrentSchema.sql +++ /dev/null @@ -1,27 +0,0 @@ -declare - l_output_data dbms_output.chararr; - l_num_lines integer := 100000; - l_packages_executed integer := 0; -begin - --act - ut.run(); - dbms_output.get_lines( l_output_data, l_num_lines); - - for i in 1 .. l_num_lines loop - if l_output_data(i) like '%test\_package\_1%' escape '\' - or l_output_data(i) like '%test_package_2%' - or l_output_data(i) like '%test_package_3%' then - l_packages_executed := l_packages_executed + 1; - end if; - end loop; - - if l_packages_executed = 3 then - :test_result := ut_utils.gc_success; - else - for i in 1 .. l_num_lines loop - dbms_output.put_line(l_output_data(i)); - end loop; - dbms_output.put_line('Failed: not all packages were found in the outputs. Expected 3, got '||l_packages_executed); - end if; -end; -/ diff --git a/old_tests/ut/ut.run.WithPackageName.ExecutesAllFromGivenPackage.sql b/old_tests/ut/ut.run.WithPackageName.ExecutesAllFromGivenPackage.sql deleted file mode 100644 index cd6371e64..000000000 --- a/old_tests/ut/ut.run.WithPackageName.ExecutesAllFromGivenPackage.sql +++ /dev/null @@ -1,27 +0,0 @@ -declare - l_output_data dbms_output.chararr; - l_num_lines integer := 100000; - l_packages_executed integer := 0; -begin - --act - ut.run(user||'.test_package_3'); - dbms_output.get_lines( l_output_data, l_num_lines); - - for i in 1 .. l_num_lines loop - if l_output_data(i) like '%test\_package\_1%' escape '\' - or l_output_data(i) like '%test_package_2%' - or l_output_data(i) like '%test_package_3%' then - l_packages_executed := l_packages_executed + 1; - end if; - end loop; - - if l_packages_executed = 1 then - :test_result := ut_utils.gc_success; - else - for i in 1 .. l_num_lines loop - dbms_output.put_line(l_output_data(i)); - end loop; - dbms_output.put_line('Failed: not all packages were found in the outputs. Expected 1, got '||l_packages_executed); - end if; -end; -/ diff --git a/old_tests/ut/ut.run.WithPackageName.ExecutesAllFromGivenPackageOnly.sql b/old_tests/ut/ut.run.WithPackageName.ExecutesAllFromGivenPackageOnly.sql deleted file mode 100644 index 09f5fcdea..000000000 --- a/old_tests/ut/ut.run.WithPackageName.ExecutesAllFromGivenPackageOnly.sql +++ /dev/null @@ -1,27 +0,0 @@ -declare - l_output_data dbms_output.chararr; - l_num_lines integer := 100000; - l_packages_executed integer := 0; -begin - --act - ut.run(user||'.test_package_1'); - dbms_output.get_lines( l_output_data, l_num_lines); - - for i in 1 .. l_num_lines loop - if l_output_data(i) like '%test\_package\_1%' escape '\' - or l_output_data(i) like '%test_package_2%' - or l_output_data(i) like '%test_package_3%' then - l_packages_executed := l_packages_executed + 1; - end if; - end loop; - - if l_packages_executed = 1 then - :test_result := ut_utils.gc_success; - else - for i in 1 .. l_num_lines loop - dbms_output.put_line(l_output_data(i)); - end loop; - dbms_output.put_line('Failed: more than just package test_package_1 was executed. Expected 1, got '||l_packages_executed); - end if; -end; -/ diff --git a/old_tests/ut/ut.run.WithSchemaName.ExecutesAllFromGivenSchema.sql b/old_tests/ut/ut.run.WithSchemaName.ExecutesAllFromGivenSchema.sql deleted file mode 100644 index ce568ecea..000000000 --- a/old_tests/ut/ut.run.WithSchemaName.ExecutesAllFromGivenSchema.sql +++ /dev/null @@ -1,27 +0,0 @@ -declare - l_output_data dbms_output.chararr; - l_num_lines integer := 100000; - l_packages_executed integer := 0; -begin - --act - ut.run(user); - dbms_output.get_lines( l_output_data, l_num_lines); - - for i in 1 .. l_num_lines loop - if l_output_data(i) like '%test\_package\_1%' escape '\' - or l_output_data(i) like '%test_package_2%' - or l_output_data(i) like '%test_package_3%' then - l_packages_executed := l_packages_executed + 1; - end if; - end loop; - - if l_packages_executed = 3 then - :test_result := ut_utils.gc_success; - else - for i in 1 .. l_num_lines loop - dbms_output.put_line(l_output_data(i)); - end loop; - dbms_output.put_line('Failed: not all packages were found in the outputs. Expected 3, got '||l_packages_executed); - end if; -end; -/ diff --git a/old_tests/ut/ut.run.WithSuitePath.ExecutesAllFromGivenPath.sql b/old_tests/ut/ut.run.WithSuitePath.ExecutesAllFromGivenPath.sql deleted file mode 100644 index d31099e9f..000000000 --- a/old_tests/ut/ut.run.WithSuitePath.ExecutesAllFromGivenPath.sql +++ /dev/null @@ -1,27 +0,0 @@ -declare - l_output_data dbms_output.chararr; - l_num_lines integer := 100000; - l_packages_executed integer := 0; -begin - --act - ut.run(user||':tests.test_package_1'); - dbms_output.get_lines( l_output_data, l_num_lines); - - for i in 1 .. l_num_lines loop - if l_output_data(i) like '%test\_package\_1%' escape '\' - or l_output_data(i) like '%test_package_2%' - or l_output_data(i) like '%test_package_3%' then - l_packages_executed := l_packages_executed + 1; - end if; - end loop; - - if l_packages_executed = 2 then - :test_result := ut_utils.gc_success; - else - for i in 1 .. l_num_lines loop - dbms_output.put_line(l_output_data(i)); - end loop; - dbms_output.put_line('Failed: not all packages were found in the outputs. Expected 2, got '||l_packages_executed); - end if; -end; -/ diff --git a/old_tests/ut/ut.run.function.AcceptsCoverageFileList.sql b/old_tests/ut/ut.run.function.AcceptsCoverageFileList.sql deleted file mode 100644 index c5b7af70c..000000000 --- a/old_tests/ut/ut.run.function.AcceptsCoverageFileList.sql +++ /dev/null @@ -1,29 +0,0 @@ -declare - l_output_data ut_varchar2_list; - l_packages_reported integer := 0; -begin - --act - select * bulk collect into l_output_data - from table(ut.run( - ut_sonar_test_reporter(), a_source_files => ut_varchar2_list(), - a_test_files => ut_varchar2_list('tests/test_package_1.pkb','tests/test_package_2.pkb','tests/test_package_3.pkb') - )); - - for i in 1 .. l_output_data.count loop - if l_output_data(i) like '%tests/test_package_1.pkb%' escape '\' - or l_output_data(i) like '%tests/test_package_2.pkb%' - or l_output_data(i) like '%tests/test_package_3.pkb%' then - l_packages_reported := l_packages_reported + 1; - end if; - end loop; - - if l_packages_reported = 3 then - :test_result := ut_utils.gc_success; - else - for i in 1 .. l_output_data.count loop - dbms_output.put_line(l_output_data(i)); - end loop; - dbms_output.put_line('Failed: not all package paths were found in the outputs. Expected 3, got '||l_packages_reported); - end if; -end; -/ diff --git a/old_tests/ut/ut.run.function.AcceptsCoverageFileListWithSutePaths.sql b/old_tests/ut/ut.run.function.AcceptsCoverageFileListWithSutePaths.sql deleted file mode 100644 index e3f0055c1..000000000 --- a/old_tests/ut/ut.run.function.AcceptsCoverageFileListWithSutePaths.sql +++ /dev/null @@ -1,29 +0,0 @@ -declare - l_output_data ut_varchar2_list; - l_packages_reported integer := 0; -begin - --act - select * bulk collect into l_output_data - from table(ut.run( - ut_varchar2_list('test_package_1','test_package_3'), ut_sonar_test_reporter(), - a_source_files => ut_varchar2_list(), a_test_files => ut_varchar2_list('tests/test_package_1.pkb','tests/test_package_2.pkb','tests/test_package_3.pkb') - )); - - for i in 1 .. l_output_data.count loop - if l_output_data(i) like '%tests/test_package_1.pkb%' escape '\' - or l_output_data(i) like '%tests/test_package_2.pkb%' - or l_output_data(i) like '%tests/test_package_3.pkb%' then - l_packages_reported := l_packages_reported + 1; - end if; - end loop; - - if l_packages_reported = 3 then - :test_result := ut_utils.gc_success; - else - for i in 1 .. l_output_data.count loop - dbms_output.put_line(l_output_data(i)); - end loop; - dbms_output.put_line('Failed: not all package paths were found in the outputs. Expected 3, got '||l_packages_reported); - end if; -end; -/ diff --git a/old_tests/ut/ut.run.function.AcceptsSutePaths.sql b/old_tests/ut/ut.run.function.AcceptsSutePaths.sql deleted file mode 100644 index 98abbae39..000000000 --- a/old_tests/ut/ut.run.function.AcceptsSutePaths.sql +++ /dev/null @@ -1,26 +0,0 @@ -declare - l_output_data ut_varchar2_list; - l_packages_executed integer := 0; -begin - --act - select * bulk collect into l_output_data - from table(ut.run(ut_varchar2_list('test_package_1','test_package_3'),ut_teamcity_reporter())); - - for i in 1 .. l_output_data.count loop - if l_output_data(i) like '%Finished %''%test\_package\_1''%' escape '\' - or l_output_data(i) like '%Finished %''%test_package_2''%' - or l_output_data(i) like '%Finished %''%test_package_3''%' then - l_packages_executed := l_packages_executed + 1; - end if; - end loop; - - if l_packages_executed = 3 then - :test_result := ut_utils.gc_success; - else - for i in 1 .. l_output_data.count loop - dbms_output.put_line(l_output_data(i)); - end loop; - dbms_output.put_line('Failed: not all packages were found in the outputs. Expected 3, got '||l_packages_executed); - end if; -end; -/ diff --git a/old_tests/ut/ut.run.function.WithGivenReporter.ExectutesAllInCurrentSchemaUsingReporter.sql b/old_tests/ut/ut.run.function.WithGivenReporter.ExectutesAllInCurrentSchemaUsingReporter.sql deleted file mode 100644 index a4d779f93..000000000 --- a/old_tests/ut/ut.run.function.WithGivenReporter.ExectutesAllInCurrentSchemaUsingReporter.sql +++ /dev/null @@ -1,26 +0,0 @@ -declare - l_output_data ut_varchar2_list; - l_packages_executed integer := 0; -begin - --act - select * bulk collect into l_output_data - from table(ut.run(ut_teamcity_reporter())); - - for i in 1 .. l_output_data.count loop - if l_output_data(i) like '%Finished %''%test\_package\_1''%' escape '\' - or l_output_data(i) like '%Finished %''%test_package_2''%' - or l_output_data(i) like '%Finished %''%test_package_3''%' then - l_packages_executed := l_packages_executed + 1; - end if; - end loop; - - if l_packages_executed = 3 then - :test_result := ut_utils.gc_success; - else - for i in 1 .. l_output_data.count loop - dbms_output.put_line(l_output_data(i)); - end loop; - dbms_output.put_line('Failed: not all packages were found in the outputs. Expected 3, got '||l_packages_executed); - end if; -end; -/ diff --git a/old_tests/ut/ut.run.function.WithNoParams.ExecutesAllFromCurrentSchema.sql b/old_tests/ut/ut.run.function.WithNoParams.ExecutesAllFromCurrentSchema.sql deleted file mode 100644 index c9e80068e..000000000 --- a/old_tests/ut/ut.run.function.WithNoParams.ExecutesAllFromCurrentSchema.sql +++ /dev/null @@ -1,26 +0,0 @@ -declare - l_output_data ut_varchar2_list; - l_packages_executed integer := 0; -begin - --act - select * bulk collect into l_output_data - from table(ut.run()); - - for i in 1 .. l_output_data.count loop - if l_output_data(i) like '%test\_package\_1%' escape '\' - or l_output_data(i) like '%test_package_2%' - or l_output_data(i) like '%test_package_3%' then - l_packages_executed := l_packages_executed + 1; - end if; - end loop; - - if l_packages_executed = 3 then - :test_result := ut_utils.gc_success; - else - for i in 1 .. l_output_data.count loop - dbms_output.put_line(l_output_data(i)); - end loop; - dbms_output.put_line('Failed: not all packages were found in the outputs. Expected 3, got '||l_packages_executed); - end if; -end; -/ diff --git a/old_tests/ut/ut.run.function.WithPackageName.ExecutesAllFromGivenPackage.sql b/old_tests/ut/ut.run.function.WithPackageName.ExecutesAllFromGivenPackage.sql deleted file mode 100644 index f630baeb6..000000000 --- a/old_tests/ut/ut.run.function.WithPackageName.ExecutesAllFromGivenPackage.sql +++ /dev/null @@ -1,26 +0,0 @@ -declare - l_output_data ut_varchar2_list; - l_packages_executed integer := 0; -begin - --act - select * bulk collect into l_output_data - from table(ut.run(user||'.test_package_3')); - - for i in 1 .. l_output_data.count loop - if l_output_data(i) like '%test\_package\_1%' escape '\' - or l_output_data(i) like '%test_package_2%' - or l_output_data(i) like '%test_package_3%' then - l_packages_executed := l_packages_executed + 1; - end if; - end loop; - - if l_packages_executed = 1 then - :test_result := ut_utils.gc_success; - else - for i in 1 .. l_output_data.count loop - dbms_output.put_line(l_output_data(i)); - end loop; - dbms_output.put_line('Failed: not all packages were found in the outputs. Expected 1, got '||l_packages_executed); - end if; -end; -/ diff --git a/old_tests/ut/ut.run.function.WithPackageName.ExecutesAllFromGivenPackageOnly.sql b/old_tests/ut/ut.run.function.WithPackageName.ExecutesAllFromGivenPackageOnly.sql deleted file mode 100644 index 2cdc8e717..000000000 --- a/old_tests/ut/ut.run.function.WithPackageName.ExecutesAllFromGivenPackageOnly.sql +++ /dev/null @@ -1,26 +0,0 @@ -declare - l_output_data ut_varchar2_list; - l_packages_executed integer := 0; -begin - --act - select * bulk collect into l_output_data - from table(ut.run(user||'.test_package_1')); - - for i in 1 .. l_output_data.count loop - if l_output_data(i) like '%test\_package\_1%' escape '\' - or l_output_data(i) like '%test_package_2%' - or l_output_data(i) like '%test_package_3%' then - l_packages_executed := l_packages_executed + 1; - end if; - end loop; - - if l_packages_executed = 1 then - :test_result := ut_utils.gc_success; - else - for i in 1 .. l_output_data.count loop - dbms_output.put_line(l_output_data(i)); - end loop; - dbms_output.put_line('Failed: more than just package test_package_1 was executed. Expected 1, got '||l_packages_executed); - end if; -end; -/ diff --git a/old_tests/ut/ut.run.function.WithSchemaName.ExecutesAllFromGivenSchema.sql b/old_tests/ut/ut.run.function.WithSchemaName.ExecutesAllFromGivenSchema.sql deleted file mode 100644 index bccf6583a..000000000 --- a/old_tests/ut/ut.run.function.WithSchemaName.ExecutesAllFromGivenSchema.sql +++ /dev/null @@ -1,26 +0,0 @@ -declare - l_output_data ut_varchar2_list; - l_packages_executed integer := 0; -begin - --act - select * bulk collect into l_output_data - from table(ut.run(user)); - - for i in 1 .. l_output_data.count loop - if l_output_data(i) like '%test\_package\_1%' escape '\' - or l_output_data(i) like '%test_package_2%' - or l_output_data(i) like '%test_package_3%' then - l_packages_executed := l_packages_executed + 1; - end if; - end loop; - - if l_packages_executed = 3 then - :test_result := ut_utils.gc_success; - else - for i in 1 .. l_output_data.count loop - dbms_output.put_line(l_output_data(i)); - end loop; - dbms_output.put_line('Failed: not all packages were found in the outputs. Expected 3, got '||l_packages_executed); - end if; -end; -/ diff --git a/old_tests/ut/ut.run.function.WithSuitePath.ExecutesAllFromGivenPath.sql b/old_tests/ut/ut.run.function.WithSuitePath.ExecutesAllFromGivenPath.sql deleted file mode 100644 index f44c13e79..000000000 --- a/old_tests/ut/ut.run.function.WithSuitePath.ExecutesAllFromGivenPath.sql +++ /dev/null @@ -1,26 +0,0 @@ -declare - l_output_data ut_varchar2_list; - l_packages_executed integer := 0; -begin - --act - select * bulk collect into l_output_data - from table(ut.run(user||':tests.test_package_1')); - - for i in 1 .. l_output_data.count loop - if l_output_data(i) like '%test\_package\_1%' escape '\' - or l_output_data(i) like '%test_package_2%' - or l_output_data(i) like '%test_package_3%' then - l_packages_executed := l_packages_executed + 1; - end if; - end loop; - - if l_packages_executed = 2 then - :test_result := ut_utils.gc_success; - else - for i in 1 .. l_output_data.count loop - dbms_output.put_line(l_output_data(i)); - end loop; - dbms_output.put_line('Failed: not all packages were found in the outputs. Expected 2, got '||l_packages_executed); - end if; -end; -/ diff --git a/old_tests/ut/ut.version.sql b/old_tests/ut/ut.version.sql deleted file mode 100644 index 22d04056e..000000000 --- a/old_tests/ut/ut.version.sql +++ /dev/null @@ -1,11 +0,0 @@ -declare - l_expected varchar2(100) := '%.%.%.%'; -begin ---Assert - if ut.version() like l_expected then - :test_result := ut_utils.gc_success; - else - dbms_output.put_line('expected version like '''||l_expected ||''' got: '''||ut.version()||'''' ); - end if; -end; -/ diff --git a/old_tests/ut_expectation_processor/who_called_expectation.parseStackTrace.sql b/old_tests/ut_expectation_processor/who_called_expectation.parseStackTrace.sql deleted file mode 100644 index 9333a9b6a..000000000 --- a/old_tests/ut_expectation_processor/who_called_expectation.parseStackTrace.sql +++ /dev/null @@ -1,34 +0,0 @@ -declare - l_stack_trace varchar2(4000); - l_source_line varchar2(4000); -begin -l_stack_trace := q'[----- PL/SQL Call Stack ----- - object line object - handle number name -34f88e4420 124 package body SCH_TEST.UT_EXPECTATION_PROCESSOR -353dfeb2f8 26 SCH_TEST.UT_EXPECTATION_RESULT -cba249ce0 112 SCH_TEST.UT_EXPECTATION -3539881cf0 21 SCH_TEST.UT_EXPECTATION_NUMBER -351a608008 28 package body SCH_TEST.TPKG_PRIOR_YEAR_GENERATION -351a6862b8 6 anonymous block -351fe31010 1825 package body SYS.DBMS_SQL -20befbe4d8 129 SCH_TEST.UT_EXECUTABLE -20befbe4d8 65 SCH_TEST.UT_EXECUTABLE -34f8ab7cd8 80 SCH_TEST.UT_TEST -34f8ab98f0 48 SCH_TEST.UT_SUITE_ITEM -34f8ab9b10 74 SCH_TEST.UT_SUITE -34f8ab98f0 48 SCH_TEST.UT_SUITE_ITEM -cba24bfd0 75 SCH_TEST.UT_LOGICAL_SUITE -353dfecf30 59 SCH_TEST.UT_RUN -34f8ab98f0 48 SCH_TEST.UT_SUITE_ITEM -357f5421e8 77 package body SCH_TEST.UT_RUNNER -357f5421e8 111 package body SCH_TEST.UT_RUNNER -20be951ab0 292 package body SCH_TEST.UT -20be951ab0 320 package body SCH_TEST.UT -]'; - l_source_line := ut_expectation_processor.WHO_CALLED_EXPECTATION(l_stack_trace); - if l_source_line like 'at "SCH_TEST.TPKG_PRIOR_YEAR_GENERATION", line 28 %' then - :test_result := ut_utils.gc_success; - end if; -end; -/ diff --git a/old_tests/ut_expectation_processor/who_called_expectation.parseStackTraceWith0x.sql b/old_tests/ut_expectation_processor/who_called_expectation.parseStackTraceWith0x.sql deleted file mode 100644 index 1b9996a80..000000000 --- a/old_tests/ut_expectation_processor/who_called_expectation.parseStackTraceWith0x.sql +++ /dev/null @@ -1,28 +0,0 @@ -declare - l_stack_trace varchar2(4000); - l_source_line varchar2(4000); -begin -l_stack_trace := q'[----- PL/SQL Call Stack ----- - object line object - handle number name -0x80e701d8 26 UT3.UT_EXPECTATION_RESULT -0x85e10150 112 UT3.UT_EXPECTATION -0x8b54bad8 21 UT3.UT_EXPECTATION_NUMBER -0x85cfd238 20 package body UT3.UT_EXAMPLETEST -0x85def380 6 anonymous block -0x85e93750 1825 package body SYS.DBMS_SQL -0x80f4f608 129 UT3.UT_EXECUTABLE -0x80f4f608 65 UT3.UT_EXECUTABLE -0x8a116010 76 UT3.UT_TEST -0x8a3348a0 48 UT3.UT_SUITE_ITEM -0x887e9948 67 UT3.UT_LOGICAL_SUITE -0x8a26de20 59 UT3.UT_RUN -0x8a3348a0 48 UT3.UT_SUITE_ITEM -0x838d17c0 28 anonymous block -]'; - l_source_line := ut_expectation_processor.WHO_CALLED_EXPECTATION(l_stack_trace); - if l_source_line like 'at "UT3.UT_EXAMPLETEST", line 20 %' then - :test_result := ut_utils.gc_success; - end if; -end; -/ diff --git a/old_tests/ut_expectations/common/ut.expect.not_to_equal.scalar.common.sql b/old_tests/ut_expectations/common/ut.expect.not_to_equal.scalar.common.sql deleted file mode 100644 index 2921d9745..000000000 --- a/old_tests/ut_expectations/common/ut.expect.not_to_equal.scalar.common.sql +++ /dev/null @@ -1,17 +0,0 @@ ---Arrange -declare - l_actual &&1 := &&2; - l_expected &&1 := &&3; - l_result integer; -begin ---Act - ut.expect(l_actual).not_to_equal(l_expected); - l_result := ut_expectation_processor.get_status(); ---Assert - if nvl(:test_result, ut_utils.gc_success) = ut_utils.gc_success and l_result = &&4 then - :test_result := ut_utils.gc_success; - else - dbms_output.put_line('expected: '''||&&4||''', got: '''||l_result||'''' ); - end if; -end; -/ diff --git a/old_tests/ut_expectations/common/ut.expect.to_equal.different_scalars.common.sql b/old_tests/ut_expectations/common/ut.expect.to_equal.different_scalars.common.sql deleted file mode 100644 index da139a647..000000000 --- a/old_tests/ut_expectations/common/ut.expect.to_equal.different_scalars.common.sql +++ /dev/null @@ -1,20 +0,0 @@ ---Arrange -declare - l_actual &&1 := &&3; - l_expected &&2 := &&4; - l_result integer; - l_message varchar2(32767); -begin ---Act - ut.expect(l_actual).&&5.to_equal(l_expected); - l_result := ut_expectation_processor.get_status(); - l_message := ut_expectation_processor.get_failed_expectations()(1).get_result_clob; ---Assert - if nvl(:test_result, ut_utils.gc_success) = ut_utils.gc_success and l_result = ut_utils.gc_failure - and l_message like 'Actual (%) cannot be compared to Expected (%) using matcher%' then - :test_result := ut_utils.gc_success; - else - dbms_output.put_line('expected: '''||ut_utils.gc_failure||''', got: '''||l_result||'''' ); - end if; -end; -/ diff --git a/old_tests/ut_expectations/common/ut.expect.to_equal.scalar.common.sql b/old_tests/ut_expectations/common/ut.expect.to_equal.scalar.common.sql deleted file mode 100644 index 0632246f9..000000000 --- a/old_tests/ut_expectations/common/ut.expect.to_equal.scalar.common.sql +++ /dev/null @@ -1,17 +0,0 @@ ---Arrange -declare - l_actual &&1 := &&2; - l_expected &&1 := &&3; - l_result integer; -begin ---Act - ut.expect(l_actual).to_equal(l_expected); - l_result := ut_expectation_processor.get_status(); ---Assert - if nvl(:test_result, ut_utils.gc_success) = ut_utils.gc_success and l_result = &&4 then - :test_result := ut_utils.gc_success; - else - dbms_output.put_line('expected: '''||&&4||''', got: '''||l_result||'''' ); - end if; -end; -/ diff --git a/old_tests/ut_expectations/common/ut.expect.to_equal.scalar.null_value_text.common.sql b/old_tests/ut_expectations/common/ut.expect.to_equal.scalar.null_value_text.common.sql deleted file mode 100644 index bfac42e68..000000000 --- a/old_tests/ut_expectations/common/ut.expect.to_equal.scalar.null_value_text.common.sql +++ /dev/null @@ -1,17 +0,0 @@ ---Arrange -declare - l_actual &&1 := &&2; - l_expected &&1 := &&3; - l_result ut_expectation_result; -begin ---Act - ut.expect(l_actual).to_equal(l_expected); - l_result := ut_expectation_processor.get_failed_expectations()(1); ---Assert - if nvl(:test_result, ut_utils.gc_success) = ut_utils.gc_success and l_result.get_result_clob like '&&4' then - :test_result := ut_utils.gc_success; - else - dbms_output.put_line('expected text like ''&&4'', but got '''||l_result.get_result_clob||'''' ); - end if; -end; -/ diff --git a/old_tests/ut_expectations/common/ut.expect.to_equal.scalar.with_message.common.sql b/old_tests/ut_expectations/common/ut.expect.to_equal.scalar.with_message.common.sql deleted file mode 100644 index 9b172bc8c..000000000 --- a/old_tests/ut_expectations/common/ut.expect.to_equal.scalar.with_message.common.sql +++ /dev/null @@ -1,19 +0,0 @@ ---Arrange -declare - l_expected &&1 := &&2; - l_actual &&1 := &&3; - l_results ut_expectation_results; - l_test_description varchar2(30) := 'A test message'; -begin ---Act - ut.expect(l_actual, l_test_description ).to_equal( l_expected); - l_results := ut_expectation_processor.get_failed_expectations(); ---Assert - if nvl(:test_result, ut_utils.gc_success) = ut_utils.gc_success - and treat(l_results(1) as ut_expectation_result).description like '' || l_test_description || '' then - :test_result := ut_utils.gc_success; - else - dbms_output.put_line('expected: '''||treat(l_results(1) as ut_expectation_result).description||''' to match ''%' || l_test_description || '%''' ); - end if; -end; -/ diff --git a/old_tests/ut_expectations/common/ut.expect.to_equal.scalar.with_nulls_equal.common.sql b/old_tests/ut_expectations/common/ut.expect.to_equal.scalar.with_nulls_equal.common.sql deleted file mode 100644 index 352ceaf05..000000000 --- a/old_tests/ut_expectations/common/ut.expect.to_equal.scalar.with_nulls_equal.common.sql +++ /dev/null @@ -1,19 +0,0 @@ ---Arrange -declare - l_expected &&1 := &&2; - l_actual &&1 := &&3; - l_result integer; - l_expected_result integer := &&4; - l_nulls_are_equal boolean := &&5; -begin ---Act - ut.expect(l_actual).to_equal(l_expected, l_nulls_are_equal); - l_result := ut_expectation_processor.get_status(); ---Assert - if nvl(:test_result, ut_utils.gc_success) = ut_utils.gc_success and l_result = l_expected_result then - :test_result := ut_utils.gc_success; - else - dbms_output.put_line('expected: '''||&&4||''', got: '''||l_result||'''' ); - end if; -end; -/ diff --git a/old_tests/ut_expectations/ut.expect.not_to_equal.GivesFailureForEqualValues.sql b/old_tests/ut_expectations/ut.expect.not_to_equal.GivesFailureForEqualValues.sql deleted file mode 100644 index d32655480..000000000 --- a/old_tests/ut_expectations/ut.expect.not_to_equal.GivesFailureForEqualValues.sql +++ /dev/null @@ -1,15 +0,0 @@ -@@lib/RunTest.sql "ut_expectations/common/ut.expect.not_to_equal.scalar.common.sql 'blob' 'to_blob(''Abc'')' 'to_blob(''abc'')' 'ut_utils.gc_failure'" -@@lib/RunTest.sql "ut_expectations/common/ut.expect.not_to_equal.scalar.common.sql 'boolean' 'false' 'false' 'ut_utils.gc_failure'" -@@lib/RunTest.sql "ut_expectations/common/ut.expect.not_to_equal.scalar.common.sql 'clob' '''Abc''' '''Abc''' 'ut_utils.gc_failure'" -@@lib/RunTest.sql "ut_expectations/common/ut.expect.not_to_equal.scalar.common.sql 'date' 'sysdate' 'sysdate' 'ut_utils.gc_failure'" -@@lib/RunTest.sql "ut_expectations/common/ut.expect.not_to_equal.scalar.common.sql 'number' '12345' '12345' 'ut_utils.gc_failure'" -@@lib/RunTest.sql "ut_expectations/common/ut.expect.not_to_equal.scalar.common.sql 'timestamp(9)' 'to_Timestamp(''2016 123456789'',''yyyy ff'')' 'to_Timestamp(''2016 123456789'',''yyyy ff'')' 'ut_utils.gc_failure'" -@@lib/RunTest.sql "ut_expectations/common/ut.expect.not_to_equal.scalar.common.sql 'timestamp(9) with local time zone' 'to_Timestamp(''2016 123456789'',''yyyy ff'')' 'to_Timestamp(''2016 123456789'',''yyyy ff'')' 'ut_utils.gc_failure'" -@@lib/RunTest.sql "ut_expectations/common/ut.expect.not_to_equal.scalar.common.sql 'timestamp(9) with time zone' 'to_Timestamp(''2016 123456789'',''yyyy ff'')' 'to_Timestamp(''2016 123456789'',''yyyy ff'')' 'ut_utils.gc_failure'" -@@lib/RunTest.sql "ut_expectations/common/ut.expect.not_to_equal.scalar.common.sql 'varchar2(4000)' '''Abc''' '''Abc''' 'ut_utils.gc_failure'" -@@lib/RunTest.sql "ut_expectations/common/ut.expect.not_to_equal.scalar.common.sql 'interval day to second' '''2 01:00:00''' '''2 01:00:00''' 'ut_utils.gc_failure'" -@@lib/RunTest.sql "ut_expectations/common/ut.expect.not_to_equal.scalar.common.sql 'interval year to month' '''1-1''' '''1-1''' 'ut_utils.gc_failure'" - - - - diff --git a/old_tests/ut_expectations/ut.expect.not_to_equal.GivesSuccessForDifferentValues.sql b/old_tests/ut_expectations/ut.expect.not_to_equal.GivesSuccessForDifferentValues.sql deleted file mode 100644 index e30b2c5e5..000000000 --- a/old_tests/ut_expectations/ut.expect.not_to_equal.GivesSuccessForDifferentValues.sql +++ /dev/null @@ -1,11 +0,0 @@ -@@lib/RunTest.sql "ut_expectations/common/ut.expect.not_to_equal.scalar.common.sql 'blob' 'to_blob(''abc'')' 'to_blob(''abd'')' 'ut_utils.gc_success'" -@@lib/RunTest.sql "ut_expectations/common/ut.expect.not_to_equal.scalar.common.sql 'boolean' 'true' 'false' 'ut_utils.gc_success'" -@@lib/RunTest.sql "ut_expectations/common/ut.expect.not_to_equal.scalar.common.sql 'clob' '''Abc''' '''abc''' 'ut_utils.gc_success'" -@@lib/RunTest.sql "ut_expectations/common/ut.expect.not_to_equal.scalar.common.sql 'date' 'sysdate' 'sysdate-1' 'ut_utils.gc_success'" -@@lib/RunTest.sql "ut_expectations/common/ut.expect.not_to_equal.scalar.common.sql 'number' '0.1' '0.3' 'ut_utils.gc_success'" -@@lib/RunTest.sql "ut_expectations/common/ut.expect.not_to_equal.scalar.common.sql 'timestamp' 'systimestamp' 'systimestamp' 'ut_utils.gc_success'" -@@lib/RunTest.sql "ut_expectations/common/ut.expect.not_to_equal.scalar.common.sql 'timestamp with local time zone' 'systimestamp' 'systimestamp' 'ut_utils.gc_success'" -@@lib/RunTest.sql "ut_expectations/common/ut.expect.not_to_equal.scalar.common.sql 'timestamp with time zone' 'systimestamp' 'systimestamp' 'ut_utils.gc_success'" -@@lib/RunTest.sql "ut_expectations/common/ut.expect.not_to_equal.scalar.common.sql 'varchar2(4000)' '''Abc''' '''abc''' 'ut_utils.gc_success'" -@@lib/RunTest.sql "ut_expectations/common/ut.expect.not_to_equal.scalar.common.sql 'interval day to second' '''2 01:00:00''' '''2 01:00:01''' 'ut_utils.gc_success'" -@@lib/RunTest.sql "ut_expectations/common/ut.expect.not_to_equal.scalar.common.sql 'interval year to month' '''1-1''' '''1-2''' 'ut_utils.gc_success'" diff --git a/old_tests/ut_expectations/ut.expect.not_to_equal.anydata.GivesFailureWhenComparingTheSameData.sql b/old_tests/ut_expectations/ut.expect.not_to_equal.anydata.GivesFailureWhenComparingTheSameData.sql deleted file mode 100644 index 9af3ed06d..000000000 --- a/old_tests/ut_expectations/ut.expect.not_to_equal.anydata.GivesFailureWhenComparingTheSameData.sql +++ /dev/null @@ -1,17 +0,0 @@ ---Arrange -declare - l_expected department$ := department$('hr'); - l_actual department$ := department$('hr'); - l_result integer; -begin ---Act - ut.expect( anydata.convertObject(l_actual) ).not_to_equal( anydata.convertObject(l_expected) ); - l_result := ut_expectation_processor.get_status(); ---Assert - if l_result = ut_utils.gc_failure then - :test_result := ut_utils.gc_success; - else - dbms_output.put_line('expected: '''||ut_utils.gc_success||''', got: '''||l_result||'''' ); - end if; -end; -/ diff --git a/old_tests/ut_expectations/ut.expect.to_be_false.GivesFailureWhenExpessionIsNotBoolean.sql b/old_tests/ut_expectations/ut.expect.to_be_false.GivesFailureWhenExpessionIsNotBoolean.sql deleted file mode 100644 index 58c15bffb..000000000 --- a/old_tests/ut_expectations/ut.expect.to_be_false.GivesFailureWhenExpessionIsNotBoolean.sql +++ /dev/null @@ -1,21 +0,0 @@ -PROMPT Gives a failre when expression evaluates to a boolean true ---Arrange -declare - l_result integer; -begin ---Act - ut.expect( 1 ).to_( be_false() ); - ut.expect( 1 ).not_to( be_true() ); - l_result := ut_expectation_processor.get_status(); ---Assert - if nvl(:test_result, ut_utils.gc_success) = ut_utils.gc_success and l_result = ut_utils.gc_failure then - :test_result := ut_utils.gc_success; - else - dbms_output.put_line('expected: '''||ut_utils.gc_failure||''', got: '''||l_result||'''' ); - end if; -end; -/ - - - - diff --git a/old_tests/ut_expectations/ut.expect.to_be_false.GivesFailureWhenExpessionIsNull.sql b/old_tests/ut_expectations/ut.expect.to_be_false.GivesFailureWhenExpessionIsNull.sql deleted file mode 100644 index 4b3cbbab2..000000000 --- a/old_tests/ut_expectations/ut.expect.to_be_false.GivesFailureWhenExpessionIsNull.sql +++ /dev/null @@ -1,21 +0,0 @@ -PROMPT Gives a failre when expression evaluates to a boolean null ---Arrange -declare - l_result integer; -begin ---Act - ut.expect( 1 = null ).to_be_false(); - ut.expect( 1 = null ).not_to_be_true(); - l_result := ut_expectation_processor.get_status(); ---Assert - if nvl(:test_result, ut_utils.gc_success) = ut_utils.gc_success and l_result = ut_utils.gc_failure then - :test_result := ut_utils.gc_success; - else - dbms_output.put_line('expected: '''||ut_utils.gc_failure||''', got: '''||l_result||'''' ); - end if; -end; -/ - - - - diff --git a/old_tests/ut_expectations/ut.expect.to_be_false.GivesFailureWhenExpessionIsTrue.sql b/old_tests/ut_expectations/ut.expect.to_be_false.GivesFailureWhenExpessionIsTrue.sql deleted file mode 100644 index 6b2357c20..000000000 --- a/old_tests/ut_expectations/ut.expect.to_be_false.GivesFailureWhenExpessionIsTrue.sql +++ /dev/null @@ -1,21 +0,0 @@ -PROMPT Gives a failre when expression evaluates to a boolean true ---Arrange -declare - l_result integer; -begin ---Act - ut.expect( 1 = 1 ).to_be_false(); - ut.expect( 1 = 1 ).not_to_be_true(); - l_result := ut_expectation_processor.get_status(); ---Assert - if nvl(:test_result, ut_utils.gc_success) = ut_utils.gc_success and l_result = ut_utils.gc_failure then - :test_result := ut_utils.gc_success; - else - dbms_output.put_line('expected: '''||ut_utils.gc_failure||''', got: '''||l_result||'''' ); - end if; -end; -/ - - - - diff --git a/old_tests/ut_expectations/ut.expect.to_be_false.GivesSuccessWhenExpessionIsFalse.sql b/old_tests/ut_expectations/ut.expect.to_be_false.GivesSuccessWhenExpessionIsFalse.sql deleted file mode 100644 index cdee68133..000000000 --- a/old_tests/ut_expectations/ut.expect.to_be_false.GivesSuccessWhenExpessionIsFalse.sql +++ /dev/null @@ -1,21 +0,0 @@ -PROMPT Gives a success when expression evaluates to a boolean false ---Arrange -declare - l_result integer; -begin ---Act - ut.expect( 1 = 0 ).to_be_false(); - ut.expect( 1 = 0 ).not_to_be_true(); - l_result := ut_expectation_processor.get_status(); ---Assert - if nvl(:test_result, ut_utils.gc_success) = ut_utils.gc_success and l_result = ut_utils.gc_success then - :test_result := ut_utils.gc_success; - else - dbms_output.put_line('expected: '''||ut_utils.gc_success||''', got: '''||l_result||'''' ); - end if; -end; -/ - - - - diff --git a/old_tests/ut_expectations/ut.expect.to_be_like.FailsForUnsupportedDatatype.sql b/old_tests/ut_expectations/ut.expect.to_be_like.FailsForUnsupportedDatatype.sql deleted file mode 100644 index 68aa1cc3a..000000000 --- a/old_tests/ut_expectations/ut.expect.to_be_like.FailsForUnsupportedDatatype.sql +++ /dev/null @@ -1,17 +0,0 @@ -declare - l_actual number := 1234; - l_pattern varchar2(32767) := '1234'; - l_escape_char varchar2(32767) := ''; - l_result integer; -begin ---Act - ut.expect( l_actual ).to_( be_like(l_pattern, l_escape_char) ); - l_result := ut_expectation_processor.get_status(); ---Assert - if l_result = ut_utils.gc_failure then - :test_result := ut_utils.gc_success; - else - dbms_output.put_line('expected: '''||l_actual||''', to be like '''||l_pattern||''' escape'''||l_escape_char||'''' ); - end if; -end; -/ diff --git a/old_tests/ut_expectations/ut.expect.to_be_null.anydata.GivesSuccessWhenAnydataIsNull.sql b/old_tests/ut_expectations/ut.expect.to_be_null.anydata.GivesSuccessWhenAnydataIsNull.sql deleted file mode 100644 index a338ee2ad..000000000 --- a/old_tests/ut_expectations/ut.expect.to_be_null.anydata.GivesSuccessWhenAnydataIsNull.sql +++ /dev/null @@ -1,16 +0,0 @@ -PROMPT Gives a success when the Anydata argument is null ---Arrange -declare - l_result integer; -begin ---Act - ut.expect( cast(null as anydata) ).to_be_null(); - l_result := ut_expectation_processor.get_status(); ---Assert - if l_result = ut_utils.gc_success then - :test_result := ut_utils.gc_success; - else - dbms_output.put_line('expected: '''||ut_utils.gc_success||''', got: '''||l_result||'''' ); - end if; -end; -/ diff --git a/old_tests/ut_expectations/ut.expect.to_be_null.anydata.GivesSuccessWhenCollectionPassedIsNull.sql b/old_tests/ut_expectations/ut.expect.to_be_null.anydata.GivesSuccessWhenCollectionPassedIsNull.sql deleted file mode 100644 index 29ef147fa..000000000 --- a/old_tests/ut_expectations/ut.expect.to_be_null.anydata.GivesSuccessWhenCollectionPassedIsNull.sql +++ /dev/null @@ -1,16 +0,0 @@ ---Arrange -declare - l_expected ut_varchar2_list; - l_result integer; -begin ---Act - ut.expect( anydata.convertCollection(l_expected) ).to_be_null(); - l_result := ut_expectation_processor.get_status(); ---Assert - if l_result = ut_utils.gc_success then - :test_result := ut_utils.gc_success; - else - dbms_output.put_line('expected: '''||ut_utils.gc_success||''', got: '''||l_result||'''' ); - end if; -end; -/ diff --git a/old_tests/ut_expectations/ut.expect.to_be_null.anydata.GivesSuccessWhenObjectPassedIsNull.sql b/old_tests/ut_expectations/ut.expect.to_be_null.anydata.GivesSuccessWhenObjectPassedIsNull.sql deleted file mode 100644 index 970216166..000000000 --- a/old_tests/ut_expectations/ut.expect.to_be_null.anydata.GivesSuccessWhenObjectPassedIsNull.sql +++ /dev/null @@ -1,16 +0,0 @@ ---Arrange -declare - l_expected department$; - l_result integer; -begin ---Act - ut.expect( anydata.convertObject(l_expected) ).to_be_null(); - l_result := ut_expectation_processor.get_status(); ---Assert - if l_result = ut_utils.gc_success then - :test_result := ut_utils.gc_success; - else - dbms_output.put_line('expected: '''||ut_utils.gc_success||''', got: '''||l_result||'''' ); - end if; -end; -/ diff --git a/old_tests/ut_expectations/ut.expect.to_be_null.refcursor.GivesSuccessWhenCursorIsNull.sql b/old_tests/ut_expectations/ut.expect.to_be_null.refcursor.GivesSuccessWhenCursorIsNull.sql deleted file mode 100644 index e5952b871..000000000 --- a/old_tests/ut_expectations/ut.expect.to_be_null.refcursor.GivesSuccessWhenCursorIsNull.sql +++ /dev/null @@ -1,17 +0,0 @@ -PROMPT Gives a success when the Cursor is null ---Arrange -declare - l_cursor sys_refcursor; - l_result integer; -begin ---Act - ut.expect( l_cursor ).to_be_null(); - l_result := ut_expectation_processor.get_status(); ---Assert - if l_result = ut_utils.gc_success then - :test_result := ut_utils.gc_success; - else - dbms_output.put_line('expected: '''||ut_utils.gc_success||''', got: '''||l_result||'''' ); - end if; -end; -/ diff --git a/old_tests/ut_expectations/ut.expect.to_be_true.GivesFailureWhenExpessionIsFalse.sql b/old_tests/ut_expectations/ut.expect.to_be_true.GivesFailureWhenExpessionIsFalse.sql deleted file mode 100644 index 9b7459868..000000000 --- a/old_tests/ut_expectations/ut.expect.to_be_true.GivesFailureWhenExpessionIsFalse.sql +++ /dev/null @@ -1,21 +0,0 @@ -PROMPT Gives a failre when expression evaluates to a boolean false ---Arrange -declare - l_result integer; -begin ---Act - ut.expect( 1 = 0 ).to_be_true(); - ut.expect( 1 = 0 ).not_to_be_false(); - l_result := ut_expectation_processor.get_status(); ---Assert - if nvl(:test_result, ut_utils.gc_success) = ut_utils.gc_success and l_result = ut_utils.gc_failure then - :test_result := ut_utils.gc_success; - else - dbms_output.put_line('expected: '''||ut_utils.gc_failure||''', got: '''||l_result||'''' ); - end if; -end; -/ - - - - diff --git a/old_tests/ut_expectations/ut.expect.to_be_true.GivesFailureWhenExpessionIsNotBoolean.sql b/old_tests/ut_expectations/ut.expect.to_be_true.GivesFailureWhenExpessionIsNotBoolean.sql deleted file mode 100644 index d099e7316..000000000 --- a/old_tests/ut_expectations/ut.expect.to_be_true.GivesFailureWhenExpessionIsNotBoolean.sql +++ /dev/null @@ -1,21 +0,0 @@ -PROMPT Gives a failre when expression evaluates to a boolean false ---Arrange -declare - l_result integer; -begin ---Act - ut.expect( 1 ).to_( be_true() ); - ut.expect( 1 ).not_to( be_false() ); - l_result := ut_expectation_processor.get_status(); ---Assert - if nvl(:test_result, ut_utils.gc_success) = ut_utils.gc_success and l_result = ut_utils.gc_failure then - :test_result := ut_utils.gc_success; - else - dbms_output.put_line('expected: '''||ut_utils.gc_failure||''', got: '''||l_result||'''' ); - end if; -end; -/ - - - - diff --git a/old_tests/ut_expectations/ut.expect.to_be_true.GivesFailureWhenExpessionIsNull.sql b/old_tests/ut_expectations/ut.expect.to_be_true.GivesFailureWhenExpessionIsNull.sql deleted file mode 100644 index 4ea53dff5..000000000 --- a/old_tests/ut_expectations/ut.expect.to_be_true.GivesFailureWhenExpessionIsNull.sql +++ /dev/null @@ -1,21 +0,0 @@ -PROMPT Gives a failre when expression evaluates to a boolean null ---Arrange -declare - l_result integer; -begin ---Act - ut.expect( 1 = null ).to_be_true(); - ut.expect( 1 = null ).not_to_be_false(); - l_result := ut_expectation_processor.get_status(); ---Assert - if nvl(:test_result, ut_utils.gc_success) = ut_utils.gc_success and l_result = ut_utils.gc_failure then - :test_result := ut_utils.gc_success; - else - dbms_output.put_line('expected: '''||ut_utils.gc_failure||''', got: '''||l_result||'''' ); - end if; -end; -/ - - - - diff --git a/old_tests/ut_expectations/ut.expect.to_be_true.GivesSuccessWhenExpessionIsTrue.sql b/old_tests/ut_expectations/ut.expect.to_be_true.GivesSuccessWhenExpessionIsTrue.sql deleted file mode 100644 index b4dc25197..000000000 --- a/old_tests/ut_expectations/ut.expect.to_be_true.GivesSuccessWhenExpessionIsTrue.sql +++ /dev/null @@ -1,21 +0,0 @@ -PROMPT Gives a success when expression evaluates to a boolean true ---Arrange -declare - l_result integer; -begin ---Act - ut.expect( 1 = 1 ).to_be_true(); - ut.expect( 1 = 1 ).not_to_be_false(); - l_result := ut_expectation_processor.get_status(); ---Assert - if nvl(:test_result, ut_utils.gc_success) = ut_utils.gc_success and l_result = ut_utils.gc_success then - :test_result := ut_utils.gc_success; - else - dbms_output.put_line('expected: '''||ut_utils.gc_success||''', got: '''||l_result||'''' ); - end if; -end; -/ - - - - diff --git a/old_tests/ut_expectations/ut.expect.to_equal.cursor.UsesDefaultNLSSettingsForDatesFormatting.sql b/old_tests/ut_expectations/ut.expect.to_equal.cursor.UsesDefaultNLSSettingsForDatesFormatting.sql deleted file mode 100644 index 09e58bcf8..000000000 --- a/old_tests/ut_expectations/ut.expect.to_equal.cursor.UsesDefaultNLSSettingsForDatesFormatting.sql +++ /dev/null @@ -1,19 +0,0 @@ ---Arrange -declare - l_actual SYS_REFCURSOR; - l_expected SYS_REFCURSOR; - l_result integer; -begin ---Act - open l_actual for select sysdate as some_date from dual; - open l_expected for select to_char(sysdate) some_date from dual; - ut.expect(l_actual).to_equal(l_expected); - l_result := ut_expectation_processor.get_status(); ---Assert - if nvl(:test_result, ut_utils.gc_success) = ut_utils.gc_success and l_result = ut_utils.gc_success then - :test_result := ut_utils.gc_success; - else - dbms_output.put_line('expected: '''||ut_utils.gc_success||''', got: '''||l_result||'''' ); - end if; -end; -/ diff --git a/old_tests/ut_expectations/ut.expect.to_equal.cursor.worksOnLargeDatasets.sql b/old_tests/ut_expectations/ut.expect.to_equal.cursor.worksOnLargeDatasets.sql deleted file mode 100644 index f4ad730d3..000000000 --- a/old_tests/ut_expectations/ut.expect.to_equal.cursor.worksOnLargeDatasets.sql +++ /dev/null @@ -1,21 +0,0 @@ ---Arrange -declare - l_actual sys_refcursor; - l_expected sys_refcursor; - l_result integer; -begin ---Act - open l_actual for select object_name from all_objects where rownum <=1100; - open l_expected for select object_name from all_objects where rownum <=1100; - ut.expect(l_actual).to_equal(l_expected); - ---Assert - l_result := ut_expectation_processor.get_status(); ---Assert - if l_result = ut_utils.gc_success then - :test_result := ut_utils.gc_success; - else - dbms_output.put_line('expected 1 data and got: '||l_result ); - end if; -end; -/ diff --git a/old_tests/ut_expectations/ut.expect.to_match.FailsForUnsupportedDatatype.sql b/old_tests/ut_expectations/ut.expect.to_match.FailsForUnsupportedDatatype.sql deleted file mode 100644 index 0d8a93ac2..000000000 --- a/old_tests/ut_expectations/ut.expect.to_match.FailsForUnsupportedDatatype.sql +++ /dev/null @@ -1,17 +0,0 @@ -declare - l_actual number := 1234; - l_pattern varchar2(32767) := '^1234'; - l_modifiers varchar2(32767) := 'i'; - l_result integer; -begin ---Act - ut.expect( l_actual ).to_( match(l_pattern, l_modifiers) ); - l_result := ut_expectation_processor.get_status(); ---Assert - if l_result = ut_utils.gc_failure then - :test_result := ut_utils.gc_success; - else - dbms_output.put_line('expected: '''||l_actual||''', to match: '''||l_pattern||''' using modifiers:'''||l_modifiers||'''' ); - end if; -end; -/ diff --git a/old_tests/ut_expectations/ut_data_value_object.compare.Gives0WhenComparingIdenticalObjects.sql b/old_tests/ut_expectations/ut_data_value_object.compare.Gives0WhenComparingIdenticalObjects.sql deleted file mode 100644 index d6b70de79..000000000 --- a/old_tests/ut_expectations/ut_data_value_object.compare.Gives0WhenComparingIdenticalObjects.sql +++ /dev/null @@ -1,22 +0,0 @@ ---Arrange -declare - l_expected department$ := department$('HR'); - l_actual department$ := department$('HR'); - l_result integer; -begin ---Act - l_result := - ut_data_value_object( - anydata.convertObject(l_actual) - ).compare_implementation( - ut_data_value_object( - anydata.convertObject(l_expected)) - ); ---Assert - if l_result = 0 then - :test_result := ut_utils.gc_success; - else - dbms_output.put_line( 'Expected comparison to give 0, got '||l_result ); - end if; -end; -/ diff --git a/old_tests/ut_matchers/be_between.sql b/old_tests/ut_matchers/be_between.sql deleted file mode 100644 index 0ec54cf27..000000000 --- a/old_tests/ut_matchers/be_between.sql +++ /dev/null @@ -1,72 +0,0 @@ ---failure when value out of range -@@lib/RunTest.sql "ut_matchers/common/ut.expect.common.be_between.sql 'date' 'sysdate' 'sysdate-2' 'sysdate-1' 'ut_utils.gc_failure' ''" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.common.be_between.sql 'number' '2.0' '1.99' '1.999' 'ut_utils.gc_failure' ''" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.common.be_between.sql 'varchar2(1)' '''c''' '''a''' '''b''' 'ut_utils.gc_failure' ''" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.common.be_between.sql 'timestamp' 'systimestamp+1' 'systimestamp-1' 'systimestamp' 'ut_utils.gc_failure' ''" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.common.be_between.sql 'timestamp with local time zone' 'systimestamp+1' 'systimestamp-1' 'systimestamp' 'ut_utils.gc_failure' ''" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.common.be_between.sql 'timestamp with time zone' 'systimestamp+1' 'systimestamp-1' 'systimestamp' 'ut_utils.gc_failure' ''" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.common.be_between.sql 'interval year to month' '''2-2''' '''2-0''' '''2-1''' 'ut_utils.gc_failure' ''" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.common.be_between.sql 'interval day to second' '''2 01:00:00''' '''2 00:59:58''' '''2 00:59:59''' 'ut_utils.gc_failure' ''" ---success when value in range -@@lib/RunTest.sql "ut_matchers/common/ut.expect.common.be_between.sql 'date' 'sysdate' 'sysdate-1' 'sysdate+1' 'ut_utils.gc_success' ''" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.common.be_between.sql 'number' '2.0' '1.99' '2.01' 'ut_utils.gc_success' ''" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.common.be_between.sql 'varchar2(1)' '''b''' '''a''' '''c''' 'ut_utils.gc_success' ''" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.common.be_between.sql 'timestamp' 'systimestamp' 'systimestamp-1' 'systimestamp+1' 'ut_utils.gc_success' ''" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.common.be_between.sql 'timestamp with local time zone' 'systimestamp' 'systimestamp-1' 'systimestamp+1' 'ut_utils.gc_success' ''" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.common.be_between.sql 'timestamp with time zone' 'systimestamp' 'systimestamp-1' 'systimestamp+1' 'ut_utils.gc_success' ''" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.common.be_between.sql 'interval year to month' '''2-1''' '''2-0''' '''2-2''' 'ut_utils.gc_success' ''" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.common.be_between.sql 'interval day to second' '''2 01:00:00''' '''2 00:59:58''' '''2 01:00:01''' 'ut_utils.gc_success' ''" ---success when value not in range -@@lib/RunTest.sql "ut_matchers/common/ut.expect.common.be_between.sql 'date' 'sysdate' 'sysdate-2' 'sysdate-1' 'ut_utils.gc_success' 'not_'" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.common.be_between.sql 'number' '2.0' '1.99' '1.999' 'ut_utils.gc_success' 'not_'" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.common.be_between.sql 'varchar2(1)' '''c''' '''a''' '''b''' 'ut_utils.gc_success' 'not_'" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.common.be_between.sql 'timestamp' 'systimestamp+1' 'systimestamp-1' 'systimestamp' 'ut_utils.gc_success' 'not_'" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.common.be_between.sql 'timestamp with local time zone' 'systimestamp+1' 'systimestamp-1' 'systimestamp' 'ut_utils.gc_success' 'not_'" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.common.be_between.sql 'timestamp with time zone' 'systimestamp+1' 'systimestamp-1' 'systimestamp' 'ut_utils.gc_success' 'not_'" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.common.be_between.sql 'interval year to month' '''2-2''' '''2-0''' '''2-1''' 'ut_utils.gc_success' 'not_'" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.common.be_between.sql 'interval day to second' '''2 01:00:00''' '''2 00:59:58''' '''2 00:59:59''' 'ut_utils.gc_success' 'not_'" ---failure when value not out of range -@@lib/RunTest.sql "ut_matchers/common/ut.expect.common.be_between.sql 'date' 'sysdate' 'sysdate-1' 'sysdate+1' 'ut_utils.gc_failure' 'not_'" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.common.be_between.sql 'number' '2.0' '1.99' '2.01' 'ut_utils.gc_failure' 'not_'" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.common.be_between.sql 'varchar2(1)' '''b''' '''a''' '''c''' 'ut_utils.gc_failure' 'not_'" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.common.be_between.sql 'timestamp' 'systimestamp' 'systimestamp-1' 'systimestamp+1' 'ut_utils.gc_failure' 'not_'" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.common.be_between.sql 'timestamp with local time zone' 'systimestamp' 'systimestamp-1' 'systimestamp+1' 'ut_utils.gc_failure' 'not_'" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.common.be_between.sql 'timestamp with time zone' 'systimestamp' 'systimestamp-1' 'systimestamp+1' 'ut_utils.gc_failure' 'not_'" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.common.be_between.sql 'interval year to month' '''2-1''' '''2-0''' '''2-2''' 'ut_utils.gc_failure' 'not_'" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.common.be_between.sql 'interval day to second' '''2 01:00:00''' '''2 00:59:58''' '''2 01:00:01''' 'ut_utils.gc_failure' 'not_'" - ---failure when value is null -@@lib/RunTest.sql "ut_matchers/common/ut.expect.common.be_between.sql 'date' 'null' 'sysdate-1' 'sysdate+1' 'ut_utils.gc_failure' ''" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.common.be_between.sql 'number' 'null' '1.99' '2.01' 'ut_utils.gc_failure' ''" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.common.be_between.sql 'varchar2(1)' 'null' '''a''' '''c''' 'ut_utils.gc_failure' ''" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.common.be_between.sql 'timestamp' 'null' 'systimestamp-1' 'systimestamp+1' 'ut_utils.gc_failure' ''" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.common.be_between.sql 'timestamp with local time zone' 'null' 'systimestamp-1' 'systimestamp+1' 'ut_utils.gc_failure' ''" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.common.be_between.sql 'timestamp with time zone' 'null' 'systimestamp-1' 'systimestamp+1' 'ut_utils.gc_failure' ''" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.common.be_between.sql 'interval year to month' 'null' '''2-0''' '''2-2''' 'ut_utils.gc_failure' ''" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.common.be_between.sql 'interval day to second' 'null' '''2 00:59:58''' '''2 01:00:01''' 'ut_utils.gc_failure' ''" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.common.be_between.sql 'date' 'null' 'sysdate-2' 'sysdate-1' 'ut_utils.gc_failure' 'not_'" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.common.be_between.sql 'number' 'null' '1.99' '1.999' 'ut_utils.gc_failure' 'not_'" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.common.be_between.sql 'varchar2(1)' 'null' '''a''' '''b''' 'ut_utils.gc_failure' 'not_'" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.common.be_between.sql 'timestamp' 'null' 'systimestamp-1' 'systimestamp' 'ut_utils.gc_failure' 'not_'" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.common.be_between.sql 'timestamp with local time zone' 'null' 'systimestamp-1' 'systimestamp' 'ut_utils.gc_failure' 'not_'" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.common.be_between.sql 'timestamp with time zone' 'null' 'systimestamp-1' 'systimestamp' 'ut_utils.gc_failure' 'not_'" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.common.be_between.sql 'interval year to month' 'null' '''2-0''' '''2-1''' 'ut_utils.gc_failure' 'not_'" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.common.be_between.sql 'interval day to second' 'null' '''2 00:59:58''' '''2 00:59:59''' 'ut_utils.gc_failure' 'not_'" - ---failure when lower bound is null -@@lib/RunTest.sql "ut_matchers/common/ut.expect.common.be_between.sql 'date' 'sysdate' 'null' 'sysdate+1' 'ut_utils.gc_failure' ''" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.common.be_between.sql 'number' '2.0' 'null' '2.01' 'ut_utils.gc_failure' ''" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.common.be_between.sql 'varchar2(1)' '''b''' 'null' '''c''' 'ut_utils.gc_failure' ''" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.common.be_between.sql 'timestamp' 'systimestamp' 'null' 'systimestamp+1' 'ut_utils.gc_failure' ''" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.common.be_between.sql 'timestamp with local time zone' 'systimestamp' 'null' 'systimestamp+1' 'ut_utils.gc_failure' ''" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.common.be_between.sql 'timestamp with time zone' 'systimestamp' 'null' 'systimestamp+1' 'ut_utils.gc_failure' ''" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.common.be_between.sql 'interval year to month' '''2-1''' 'null' '''2-2''' 'ut_utils.gc_failure' ''" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.common.be_between.sql 'interval day to second' '''2 01:00:00''' 'null' '''2 01:00:01''' 'ut_utils.gc_failure' ''" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.common.be_between.sql 'date' 'sysdate' 'null' 'sysdate-1' 'ut_utils.gc_failure' 'not_'" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.common.be_between.sql 'number' '2.0' 'null' '1.999' 'ut_utils.gc_failure' 'not_'" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.common.be_between.sql 'varchar2(1)' '''b''' 'null' '''b''' 'ut_utils.gc_failure' 'not_'" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.common.be_between.sql 'timestamp' 'systimestamp+1' 'null' 'systimestamp' 'ut_utils.gc_failure' 'not_'" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.common.be_between.sql 'timestamp with local time zone' 'systimestamp+1' 'null' 'systimestamp' 'ut_utils.gc_failure' 'not_'" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.common.be_between.sql 'timestamp with time zone' 'systimestamp+1' 'null' 'systimestamp' 'ut_utils.gc_failure' 'not_'" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.common.be_between.sql 'interval year to month' '''2-2''' 'null' '''2-1''' 'ut_utils.gc_failure' 'not_'" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.common.be_between.sql 'interval day to second' '''2 01:00:00''' 'null' '''2 00:59:59''' 'ut_utils.gc_failure' 'not_'" diff --git a/old_tests/ut_matchers/be_like.sql b/old_tests/ut_matchers/be_like.sql deleted file mode 100644 index 186e3e24a..000000000 --- a/old_tests/ut_matchers/be_like.sql +++ /dev/null @@ -1,19 +0,0 @@ -@@lib/RunTest.sql "ut_matchers/common/ut.expect.to_be_like.common.sql 'varchar2(100)' '''Stephen_King''' 'Ste__en%' '' 'ut_utils.gc_success' ''" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.to_be_like.common.sql 'varchar2(100)' '''Stephen_King''' 'Ste__en\_K%' '\' 'ut_utils.gc_success' ''" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.to_be_like.common.sql 'clob' 'rpad(''a'',32767,''a'')||''Stephen_King''' 'a%Ste__en%' '' 'ut_utils.gc_success' ''" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.to_be_like.common.sql 'clob' 'rpad(''a'',32767,''a'')||''Stephen_King''' 'a%Ste__en\_K%' '\' 'ut_utils.gc_success' ''" - -@@lib/RunTest.sql "ut_matchers/common/ut.expect.to_be_like.common.sql 'varchar2(100)' '''Stephen_King''' 'Ste_en%' '' 'ut_utils.gc_failure' ''" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.to_be_like.common.sql 'varchar2(100)' '''Stephen_King''' 'Stephe\__%' '\' 'ut_utils.gc_failure' ''" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.to_be_like.common.sql 'clob' 'rpad(''a'',32767,''a'')||''Stephen_King''' 'a%Ste_en%' '' 'ut_utils.gc_failure' ''" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.to_be_like.common.sql 'clob' 'rpad(''a'',32767,''a'')||''Stephen_King''' 'a%Stephe\__%' '\' 'ut_utils.gc_failure' ''" - -@@lib/RunTest.sql "ut_matchers/common/ut.expect.to_be_like.common.sql 'varchar2(100)' '''Stephen_King''' 'Ste__en%' '' 'ut_utils.gc_failure' 'not_'" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.to_be_like.common.sql 'varchar2(100)' '''Stephen_King''' 'Ste__en\_K%' '\' 'ut_utils.gc_failure' 'not_'" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.to_be_like.common.sql 'clob' 'rpad(''a'',32767,''a'')||''Stephen_King''' 'a%Ste__en%' '' 'ut_utils.gc_failure' 'not_'" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.to_be_like.common.sql 'clob' 'rpad(''a'',32767,''a'')||''Stephen_King''' 'a%Ste__en\_K%' '\' 'ut_utils.gc_failure' 'not_'" - -@@lib/RunTest.sql "ut_matchers/common/ut.expect.to_be_like.common.sql 'varchar2(100)' '''Stephen_King''' 'Ste_en%' '' 'ut_utils.gc_success' 'not_'" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.to_be_like.common.sql 'varchar2(100)' '''Stephen_King''' 'Stephe\__%' '\' 'ut_utils.gc_success' 'not_'" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.to_be_like.common.sql 'clob' 'rpad(''a'',32767,''a'')||''Stephen_King''' 'a%Ste_en%' '' 'ut_utils.gc_success' 'not_'" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.to_be_like.common.sql 'clob' 'rpad(''a'',32767,''a'')||''Stephen_King''' 'a%Stephe\__%' '\' 'ut_utils.gc_success' 'not_'" diff --git a/old_tests/ut_matchers/common/ut.expect.common.be_between.sql b/old_tests/ut_matchers/common/ut.expect.common.be_between.sql deleted file mode 100644 index 9a2b33ab4..000000000 --- a/old_tests/ut_matchers/common/ut.expect.common.be_between.sql +++ /dev/null @@ -1,17 +0,0 @@ ---Arrange -declare - l_value1 &&1 := &&2; - l_value_lower &&1 := &&3; - l_value_upper &&1 := &&4; -begin ---Act - ut.expect(l_value1).&&6.to_be_between(l_value_lower,l_value_upper); ---Assert - if ut_expectation_processor.get_status = &&5 then - :test_result := ut_utils.gc_success; - else - :test_result := ut_utils.gc_failure; - dbms_output.put_line('expected: '''||&&5||''', got: '''||ut_expectation_processor.get_status||'''' ); - end if; -end; -/ diff --git a/old_tests/ut_matchers/common/ut.expect.to_be_like.common.sql b/old_tests/ut_matchers/common/ut.expect.to_be_like.common.sql deleted file mode 100644 index d76e9a530..000000000 --- a/old_tests/ut_matchers/common/ut.expect.to_be_like.common.sql +++ /dev/null @@ -1,17 +0,0 @@ -declare - l_actual &1 := &2; - l_pattern varchar2(32767) := '&3'; - l_escape_char varchar2(32767) := '&4'; - l_result integer; -begin ---Act - ut.expect( l_actual ).&&6.to_be_like(l_pattern, l_escape_char); - l_result := ut_expectation_processor.get_status(); ---Assert - if l_result = &5 then - :test_result := ut_utils.gc_success; - else - dbms_output.put_line('expected: '''||l_actual||''', to be like '''||l_pattern||''' escape'''||l_escape_char||'''' ); - end if; -end; -/ diff --git a/old_tests/ut_matchers/common/ut.expect.to_match.common.sql b/old_tests/ut_matchers/common/ut.expect.to_match.common.sql deleted file mode 100644 index 441d0205f..000000000 --- a/old_tests/ut_matchers/common/ut.expect.to_match.common.sql +++ /dev/null @@ -1,17 +0,0 @@ -declare - l_actual &1 := &2; - l_pattern varchar2(32767) := '&3'; - l_modifiers varchar2(32767) := '&4'; - l_result integer; -begin ---Act - ut.expect( l_actual ).&&6.to_match(l_pattern, l_modifiers); - l_result := ut_expectation_processor.get_status(); ---Assert - if l_result = &5 then - :test_result := ut_utils.gc_success; - else - dbms_output.put_line('expected: '''||l_actual||''', to match: '''||l_pattern||''' using modifiers:'''||l_modifiers||'''' ); - end if; -end; -/ diff --git a/old_tests/ut_matchers/match.sql b/old_tests/ut_matchers/match.sql deleted file mode 100644 index 29028762e..000000000 --- a/old_tests/ut_matchers/match.sql +++ /dev/null @@ -1,19 +0,0 @@ -@@lib/RunTest.sql "ut_matchers/common/ut.expect.to_match.common.sql 'varchar2(100)' '''Stephen''' '^Ste(v|ph)en$' '' 'ut_utils.gc_success' ''" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.to_match.common.sql 'varchar2(100)' '''sTEPHEN''' '^Ste(v|ph)en$' 'i' 'ut_utils.gc_success' ''" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.to_match.common.sql 'clob' 'rpad('' '',32767)||''Stephen''' 'Ste(v|ph)en$' '' 'ut_utils.gc_success' ''" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.to_match.common.sql 'clob' 'rpad('' '',32767)||''sTEPHEN''' 'Ste(v|ph)en$' 'i' 'ut_utils.gc_success' ''" - -@@lib/RunTest.sql "ut_matchers/common/ut.expect.to_match.common.sql 'varchar2(100)' '''Stephen''' '^Steven$' '' 'ut_utils.gc_failure' ''" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.to_match.common.sql 'varchar2(100)' '''sTEPHEN''' '^Steven$' 'i' 'ut_utils.gc_failure' ''" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.to_match.common.sql 'clob' 'to_clob(rpad('' '',32767)||''Stephen'')' '^Stephen' '' 'ut_utils.gc_failure' ''" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.to_match.common.sql 'clob' 'to_clob(rpad('' '',32767)||''sTEPHEN'')' '^Stephen' 'i' 'ut_utils.gc_failure' ''" - -@@lib/RunTest.sql "ut_matchers/common/ut.expect.to_match.common.sql 'varchar2(100)' '''Stephen''' '^Ste(v|ph)en$' '' 'ut_utils.gc_failure' 'not_'" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.to_match.common.sql 'varchar2(100)' '''sTEPHEN''' '^Ste(v|ph)en$' 'i' 'ut_utils.gc_failure' 'not_'" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.to_match.common.sql 'clob' 'rpad('' '',32767)||''Stephen''' 'Ste(v|ph)en$' '' 'ut_utils.gc_failure' 'not_'" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.to_match.common.sql 'clob' 'rpad('' '',32767)||''sTEPHEN''' 'Ste(v|ph)en$' 'i' 'ut_utils.gc_failure' 'not_'" - -@@lib/RunTest.sql "ut_matchers/common/ut.expect.to_match.common.sql 'varchar2(100)' '''Stephen''' '^Steven$' '' 'ut_utils.gc_success' 'not_'" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.to_match.common.sql 'varchar2(100)' '''sTEPHEN''' '^Steven$' 'i' 'ut_utils.gc_success' 'not_'" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.to_match.common.sql 'clob' 'to_clob(rpad('' '',32767)||''Stephen'')' '^Stephen' '' 'ut_utils.gc_success' 'not_'" -@@lib/RunTest.sql "ut_matchers/common/ut.expect.to_match.common.sql 'clob' 'to_clob(rpad('' '',32767)||''sTEPHEN'')' '^Stephen' 'i' 'ut_utils.gc_success' 'not_'" diff --git a/old_tests/ut_matchers/timestamp_between.sql b/old_tests/ut_matchers/timestamp_between.sql deleted file mode 100644 index 622b8092d..000000000 --- a/old_tests/ut_matchers/timestamp_between.sql +++ /dev/null @@ -1,17 +0,0 @@ ---Arrange -declare - l_value timestamp := to_timestamp('1997-01-31 09:26:50.13','YYYY-MM-DD HH24.MI.SS.FF'); - l_value_lower timestamp := to_timestamp('1997-01-31 09:26:50.11','YYYY-MM-DD HH24.MI.SS.FF'); - l_value_upper timestamp := to_timestamp('1997-01-31 09:26:50.14','YYYY-MM-DD HH24.MI.SS.FF'); -begin - --Act - ut.expect(l_value).to_be_between(l_value_lower,l_value_upper); - --Assert - if ut_expectation_processor.get_status = ut_utils.gc_success then - :test_result := ut_utils.gc_success; - else - dbms_output.put_line('expected: '''||ut_utils.gc_success||''', got: '''||ut_expectation_processor.get_status||'''' ); - end if; -end; -/ - diff --git a/old_tests/ut_matchers/timestamp_ltz_between.sql b/old_tests/ut_matchers/timestamp_ltz_between.sql deleted file mode 100644 index e4ab6b566..000000000 --- a/old_tests/ut_matchers/timestamp_ltz_between.sql +++ /dev/null @@ -1,16 +0,0 @@ ---Arrange -declare - l_value timestamp with local time zone := to_timestamp_tz('1997-01-31 09:26:50.12 +02:00','YYYY-MM-DD HH24.MI.SS.FF TZR'); - l_value_lower timestamp with local time zone := to_timestamp_tz('1997-01-31 09:26:50.12 +03:00','YYYY-MM-DD HH24.MI.SS.FF TZR'); - l_value_upper timestamp with local time zone := to_timestamp_tz('1997-01-31 09:26:50.12 +01:00','YYYY-MM-DD HH24.MI.SS.FF TZR'); -begin - --Act - ut.expect(l_value).to_be_between(l_value_lower,l_value_upper); - --Assert - if ut_expectation_processor.get_status = ut_utils.gc_success then - :test_result := ut_utils.gc_success; - else - dbms_output.put_line('expected: '''||ut_utils.gc_success||''', got: '''||ut_expectation_processor.get_status||'''' ); - end if; -end; -/ diff --git a/old_tests/ut_matchers/timestamp_ltz_not_between.sql b/old_tests/ut_matchers/timestamp_ltz_not_between.sql deleted file mode 100644 index 6d7f71a62..000000000 --- a/old_tests/ut_matchers/timestamp_ltz_not_between.sql +++ /dev/null @@ -1,17 +0,0 @@ ---Arrange -declare - l_value_tlz timestamp with local time zone := to_timestamp_tz('1997-01-31 09:26:50.12 +01:00','YYYY-MM-DD HH24.MI.SS.FF TZR'); - l_value_lower_tlz timestamp with local time zone := to_timestamp_tz('1997-01-31 09:26:50.12 +02:00','YYYY-MM-DD HH24.MI.SS.FF TZR'); - l_value_upper_tlz timestamp with local time zone := to_timestamp_tz('1997-01-31 09:26:50.12 +03:00','YYYY-MM-DD HH24.MI.SS.FF TZR'); -begin - --Act - ut.expect(l_value_tlz).to_be_between(l_value_lower_tlz,l_value_upper_tlz); - --Assert - if ut_expectation_processor.get_status = ut_utils.gc_failure then - :test_result := ut_utils.gc_success; - else - dbms_output.put_line('expected: '''||ut_utils.gc_failure||''', got: '''||ut_expectation_processor.get_status||'''' ); - end if; -end; -/ - diff --git a/old_tests/ut_matchers/timestamp_not_between.sql b/old_tests/ut_matchers/timestamp_not_between.sql deleted file mode 100644 index 7365e63ce..000000000 --- a/old_tests/ut_matchers/timestamp_not_between.sql +++ /dev/null @@ -1,17 +0,0 @@ ---Arrange -declare - l_value timestamp := to_timestamp('1997-01-31 09:26:50.13','YYYY-MM-DD HH24.MI.SS.FF'); - l_value_lower timestamp := to_timestamp('1997-01-31 09:26:50.11','YYYY-MM-DD HH24.MI.SS.FF'); - l_value_upper timestamp := to_timestamp('1997-01-31 09:26:50.12','YYYY-MM-DD HH24.MI.SS.FF'); -begin - --Act - ut.expect(l_value).to_be_between(l_value_lower,l_value_upper); - --Assert - if ut_expectation_processor.get_status = ut_utils.gc_failure then - :test_result := ut_utils.gc_success; - else - dbms_output.put_line('expected: '''||ut_utils.gc_failure||''', got: '''||ut_expectation_processor.get_status||'''' ); - end if; -end; -/ - diff --git a/old_tests/ut_matchers/timestamp_tz_between.sql b/old_tests/ut_matchers/timestamp_tz_between.sql deleted file mode 100644 index 0c178dace..000000000 --- a/old_tests/ut_matchers/timestamp_tz_between.sql +++ /dev/null @@ -1,17 +0,0 @@ ---Arrange -declare - l_value timestamp with time zone := to_timestamp_tz('1997-01-31 09:26:50.12 +02:00','YYYY-MM-DD HH24.MI.SS.FF TZR'); - l_value_lower timestamp with time zone := to_timestamp_tz('1997-01-31 09:26:50.12 +03:00','YYYY-MM-DD HH24.MI.SS.FF TZR'); - l_value_upper timestamp with time zone := to_timestamp_tz('1997-01-31 09:26:50.12 +01:00','YYYY-MM-DD HH24.MI.SS.FF TZR'); -begin - --Act - ut.expect(l_value).to_be_between(l_value_lower,l_value_upper); - --Assert - if ut_expectation_processor.get_status = ut_utils.gc_success then - :test_result := ut_utils.gc_success; - else - dbms_output.put_line('expected: '''||ut_utils.gc_success||''', got: '''||ut_expectation_processor.get_status||'''' ); - end if; -end; -/ - diff --git a/old_tests/ut_matchers/timestamp_tz_not_between.sql b/old_tests/ut_matchers/timestamp_tz_not_between.sql deleted file mode 100644 index 8ac3fac6d..000000000 --- a/old_tests/ut_matchers/timestamp_tz_not_between.sql +++ /dev/null @@ -1,18 +0,0 @@ ---Arrange -declare - l_value_tz timestamp with time zone := to_timestamp_tz('1997-01-31 09:26:50.12 +01:00','YYYY-MM-DD HH24.MI.SS.FF TZR'); - l_value_lower_tz timestamp with time zone := to_timestamp_tz('1997-01-31 09:26:50.12 +02:00','YYYY-MM-DD HH24.MI.SS.FF TZR'); - l_value_upper_tz timestamp with time zone := to_timestamp_tz('1997-01-31 09:26:50.12 +03:00','YYYY-MM-DD HH24.MI.SS.FF TZR'); -begin - --Act - ut.expect(l_value_tz).to_be_between(l_value_lower_tz,l_value_upper_tz); - --Assert - if ut_expectation_processor.get_status = ut_utils.gc_failure then - :test_result := ut_utils.gc_success; - else - :test_result := ut_utils.gc_failure; - dbms_output.put_line('expected: '''||ut_utils.gc_failure||''', got: '''||ut_expectation_processor.get_status||'''' ); - end if; -end; -/ - diff --git a/old_tests/ut_output_buffer/get_lines.RecievesALineFromBufferTableAndDeletes.sql b/old_tests/ut_output_buffer/get_lines.RecievesALineFromBufferTableAndDeletes.sql deleted file mode 100644 index 81aac7d7d..000000000 --- a/old_tests/ut_output_buffer/get_lines.RecievesALineFromBufferTableAndDeletes.sql +++ /dev/null @@ -1,33 +0,0 @@ ---Arrange -declare - l_result varchar2(4000); - l_remaining integer; - l_expected varchar2(4000); - l_output ut_output_buffer_base := ut_output_table_buffer(); -begin - --Act - l_expected := lpad('a text',4000,',a text'); - l_output.send_line(l_expected); - - select * into l_result from table(l_output.get_lines(a_timeout_sec => 0)); - select count(1) into l_remaining from ut_output_buffer_tmp where output_id = l_output.output_id; - - --Assert - ut.expect(l_result).to_equal(l_expected); - ut.expect(l_remaining).to_equal(0); - - if ut_expectation_processor.get_status = ut_utils.gc_success then - :test_result := ut_utils.gc_success; - else - dbms_output.put_line(ut_expectation_processor.get_failed_expectations()(1).get_result_clob); - end if; - - delete from ut_output_buffer_tmp where output_id = l_output.output_id; - commit; -exception - when others then - delete from ut_output_buffer_tmp where output_id = l_output.output_id; - commit; - raise; -end; -/ diff --git a/old_tests/ut_output_buffer/get_lines.WaitsForMoreDataToAppearForSpecifiedTime.sql b/old_tests/ut_output_buffer/get_lines.WaitsForMoreDataToAppearForSpecifiedTime.sql deleted file mode 100644 index 24284f38b..000000000 --- a/old_tests/ut_output_buffer/get_lines.WaitsForMoreDataToAppearForSpecifiedTime.sql +++ /dev/null @@ -1,24 +0,0 @@ ---Arrange -declare - l_result integer; - l_dummy integer; - l_output ut_output_buffer_base := ut_output_table_buffer(); - l_start_time timestamp := localtimestamp; - l_wait_seconds integer := 1; -begin - --Act - l_output.send_line(lpad('a text',4000,',a text')); - - select count(*) into l_dummy from table( l_output.get_lines( a_initial_timeout => 0, a_timeout_sec => l_wait_seconds )); - l_result := round(extract(second from (localtimestamp - l_start_time))); - - --Assert - ut.expect(l_result).to_equal(l_wait_seconds); - - if ut_expectation_processor.get_status = ut_utils.gc_success then - :test_result := ut_utils.gc_success; - else - dbms_output.put_line(ut_expectation_processor.get_failed_expectations()(1).get_result_clob); - end if; -end; -/ diff --git a/old_tests/ut_output_buffer/get_lines.WaitsForTheDataToAppearForSpecifiedTime.sql b/old_tests/ut_output_buffer/get_lines.WaitsForTheDataToAppearForSpecifiedTime.sql deleted file mode 100644 index 20bf4ca6c..000000000 --- a/old_tests/ut_output_buffer/get_lines.WaitsForTheDataToAppearForSpecifiedTime.sql +++ /dev/null @@ -1,22 +0,0 @@ ---Arrange -declare - l_result integer; - l_dummy integer; - l_output ut_output_buffer_base := ut_output_table_buffer(); - l_start_time timestamp := localtimestamp; - l_wait_seconds integer := 1; -begin - --Act - select count(1) into l_dummy from table( l_output.get_lines( a_initial_timeout => l_wait_seconds, a_timeout_sec => 0 )); - l_result := round(extract(second from (localtimestamp - l_start_time))); - - --Assert - ut.expect(l_result).to_equal(l_wait_seconds); - - if ut_expectation_processor.get_status = ut_utils.gc_success then - :test_result := ut_utils.gc_success; - else - dbms_output.put_line(ut_expectation_processor.get_failed_expectations()(1).get_result_clob); - end if; -end; -/ diff --git a/old_tests/ut_output_buffer/send_line.DoesNotSendLineIfNullTextGiven.sql b/old_tests/ut_output_buffer/send_line.DoesNotSendLineIfNullTextGiven.sql deleted file mode 100644 index 5bdbba31a..000000000 --- a/old_tests/ut_output_buffer/send_line.DoesNotSendLineIfNullTextGiven.sql +++ /dev/null @@ -1,21 +0,0 @@ ---Arrange -declare - l_result integer; - l_output ut_output_buffer_base := ut_output_table_buffer(); -begin - delete from ut_output_buffer_tmp; - --Act - l_output.send_line(null); - - select count(1) into l_result from ut_output_buffer_tmp; - - --Assert - ut.expect(l_result).to_equal(0); - if ut_expectation_processor.get_status = ut_utils.gc_success then - :test_result := ut_utils.gc_success; - else - dbms_output.put_line(ut_expectation_processor.get_failed_expectations()(1).get_result_clob); - end if; - -end; -/ diff --git a/old_tests/ut_output_buffer/send_line.SendsALineIntoBufferTable.sql b/old_tests/ut_output_buffer/send_line.SendsALineIntoBufferTable.sql deleted file mode 100644 index 8c2348143..000000000 --- a/old_tests/ut_output_buffer/send_line.SendsALineIntoBufferTable.sql +++ /dev/null @@ -1,24 +0,0 @@ ---Arrange -declare - l_result varchar2(4000); - l_expected varchar2(4000); - l_output ut_output_buffer_base := ut_output_table_buffer(); -begin - --Act - l_expected := lpad('a text',4000,',a text'); - l_output.send_line(l_expected); - - select text into l_result from ut_output_buffer_tmp where output_id = l_output.output_id; - - --Assert - ut.expect(l_result).to_equal(l_expected); - if ut_expectation_processor.get_status = ut_utils.gc_success then - :test_result := ut_utils.gc_success; - else - dbms_output.put_line(ut_expectation_processor.get_failed_expectations()(1).get_result_clob); - end if; - - delete from ut_output_buffer_tmp where output_id = l_output.output_id; - commit; -end; -/ diff --git a/old_tests/ut_reporters/ut_teamcity_reporter.ProducesExpectedOutputs.sql b/old_tests/ut_reporters/ut_teamcity_reporter.ProducesExpectedOutputs.sql deleted file mode 100644 index 4a3b682ba..000000000 --- a/old_tests/ut_reporters/ut_teamcity_reporter.ProducesExpectedOutputs.sql +++ /dev/null @@ -1,52 +0,0 @@ -declare - l_output_data ut_varchar2_list; - l_output clob; - l_expected varchar2(32767); -begin - l_expected := q'{%##teamcity[testSuiteStarted timestamp='%' name='org'] -%##teamcity[testSuiteStarted timestamp='%' name='org.utplsql'] -%##teamcity[testSuiteStarted timestamp='%' name='org.utplsql.utplsql'] -%##teamcity[testSuiteStarted timestamp='%' name='org.utplsql.utplsql.test'] -%##teamcity[testSuiteStarted timestamp='%' name='A suite for testing different outcomes from reporters'] -%##teamcity[testStarted timestamp='%' captureStandardOutput='true' name='ut3.test_reporters.passing_test'] - - - - - -%##teamcity[testFinished timestamp='%' duration='%' name='ut3.test_reporters.passing_test'] -%##teamcity[testStarted timestamp='%' captureStandardOutput='true' name='ut3.test_reporters.failing_test'] - - - -%##teamcity[testFailed timestamp='%' message='Fails as values are different' name='ut3.test_reporters.failing_test'] -%##teamcity[testFinished timestamp='%' duration='%' name='ut3.test_reporters.failing_test'] -%##teamcity[testStarted timestamp='%' captureStandardOutput='true' name='ut3.test_reporters.erroring_test'] - - - -%##teamcity[testStdErr timestamp='%' name='ut3.test_reporters.erroring_test' out='Test exception:|rORA-06512: at |"UT3.TEST_REPORTERS|", line %|rORA-06512: at %|r|r'] -%##teamcity[testFailed timestamp='%' details='Test exception:|rORA-06512: at |"UT3.TEST_REPORTERS|", line %|rORA-06512: at %|r|r' message='Error occured' name='ut3.test_reporters.erroring_test'] -%##teamcity[testFinished timestamp='%' duration='%' name='ut3.test_reporters.erroring_test'] -%##teamcity[testStarted timestamp='%' captureStandardOutput='true' name='ut3.test_reporters.disabled_test'] -%##teamcity[testIgnored timestamp='%' name='ut3.test_reporters.disabled_test'] -%##teamcity[testSuiteFinished timestamp='%' name='A suite for testing different outcomes from reporters'] -%##teamcity[testSuiteFinished timestamp='%' name='org.utplsql.utplsql.test'] -%##teamcity[testSuiteFinished timestamp='%' name='org.utplsql.utplsql'] -%##teamcity[testSuiteFinished timestamp='%' name='org.utplsql'] -%##teamcity[testSuiteFinished timestamp='%' name='org']}'; - --act - select * - bulk collect into l_output_data - from table(ut.run('test_reporters',ut_teamcity_reporter())); - - l_output := ut_utils.table_to_clob(l_output_data); - --assert - if l_output like l_expected then - :test_result := ut_utils.gc_success; - else - dbms_output.put_line(l_output); - end if; - -end; -/ diff --git a/old_tests/ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheSchema.sql b/old_tests/ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheSchema.sql deleted file mode 100644 index 8afb6b622..000000000 --- a/old_tests/ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheSchema.sql +++ /dev/null @@ -1,44 +0,0 @@ -PROMPT Prepare runner for the schema - ---Arrange -declare - c_path varchar2(100) := USER; - l_objects_to_run ut_suite_items; - - l_test0_suite ut_logical_suite; - l_test1_suite ut_logical_suite; - l_test2_suite ut_logical_suite; -begin - --Act - l_objects_to_run := ut_suite_manager.configure_execution_by_path(ut_varchar2_list(c_path)); - - --Assert - for i in 1 .. l_objects_to_run.count loop - if l_test0_suite is of (ut_logical_suite) then - l_test0_suite := treat(l_objects_to_run(i) as ut_logical_suite); - --assume there are only two logical suites in the test - ut.expect(l_test0_suite.name in ('tests', 'tests2')).to_be_true; - - l_test1_suite := treat(l_test0_suite.items(1) as ut_logical_suite); - - case l_test0_suite.name - when 'tests' then - ut.expect(l_test1_suite.name).to_equal('test_package_1'); - ut.expect(l_test1_suite.items.count).to_equal(3); - l_test2_suite := treat(l_test1_suite.items(3) as ut_logical_suite); - - ut.expect(l_test2_suite.name).to_equal('test_package_2'); - ut.expect(l_test2_suite.items.count).to_equal(2); - when 'tests2' then - ut.expect(l_test1_suite.name).to_equal('test_package_3'); - ut.expect(l_test1_suite.items.count).to_equal(3); - end case; - end if; - end loop; - - if ut_expectation_processor.get_status = ut_utils.gc_success then - :test_result := ut_utils.gc_success; - end if; - -end; -/ diff --git a/old_tests/ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTop2PackageByName.sql b/old_tests/ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTop2PackageByName.sql deleted file mode 100644 index 61d46b201..000000000 --- a/old_tests/ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTop2PackageByName.sql +++ /dev/null @@ -1,36 +0,0 @@ -PROMPT Prepare runner for the top 2 package by package name - ---Arrange -declare - c_path varchar2(100) := USER||'.test_package_2'; - l_objects_to_run ut_suite_items; - - l_test0_suite ut_logical_suite; - l_test1_suite ut_logical_suite; - l_test2_suite ut_logical_suite; -begin ---Act - l_objects_to_run := ut_suite_manager.configure_execution_by_path(ut_varchar2_list(c_path)); - ---Assert - ut.expect(l_objects_to_run.count).to_equal(1); - l_test0_suite := treat(l_objects_to_run(1) as ut_logical_suite); - - ut.expect(l_test0_suite.name).to_equal('tests'); - ut.expect(l_test0_suite.items.count).to_equal(1); - l_test1_suite := treat(l_test0_suite.items(1) as ut_logical_suite); - - ut.expect(l_test1_suite.name).to_equal('test_package_1'); - ut.expect(l_test1_suite.items.count).to_equal(1); - l_test2_suite := treat(l_test1_suite.items(1) as ut_logical_suite); - - ut.expect(l_test2_suite.name).to_equal('test_package_2'); - ut.expect(l_test2_suite.items.count).to_equal(2); - - - if ut_expectation_processor.get_status = ut_utils.gc_success then - :test_result := ut_utils.gc_success; - end if; - -end; -/ diff --git a/old_tests/ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTop2PackageByNameCurUser.sql b/old_tests/ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTop2PackageByNameCurUser.sql deleted file mode 100644 index 9762a3397..000000000 --- a/old_tests/ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTop2PackageByNameCurUser.sql +++ /dev/null @@ -1,36 +0,0 @@ -PROMPT Prepare runner for the top 2 package by package name for current user - ---Arrange -declare - c_path varchar2(100) := 'test_package_2'; - l_objects_to_run ut_suite_items; - - l_test0_suite ut_logical_suite; - l_test1_suite ut_logical_suite; - l_test2_suite ut_logical_suite; -begin ---Act - l_objects_to_run := ut_suite_manager.configure_execution_by_path(ut_varchar2_list(c_path)); - ---Assert - ut.expect(l_objects_to_run.count).to_equal(1); - l_test0_suite := treat(l_objects_to_run(1) as ut_logical_suite); - - ut.expect(l_test0_suite.name).to_equal('tests'); - ut.expect(l_test0_suite.items.count).to_equal(1); - l_test1_suite := treat(l_test0_suite.items(1) as ut_logical_suite); - - ut.expect(l_test1_suite.name).to_equal('test_package_1'); - ut.expect(l_test1_suite.items.count).to_equal(1); - l_test2_suite := treat(l_test1_suite.items(1) as ut_logical_suite); - - ut.expect(l_test2_suite.name).to_equal('test_package_2'); - ut.expect(l_test2_suite.items.count).to_equal(2); - - - if ut_expectation_processor.get_status = ut_utils.gc_success then - :test_result := ut_utils.gc_success; - end if; - -end; -/ diff --git a/old_tests/ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTop2PackageByPath.sql b/old_tests/ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTop2PackageByPath.sql deleted file mode 100644 index dbc6c3486..000000000 --- a/old_tests/ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTop2PackageByPath.sql +++ /dev/null @@ -1,36 +0,0 @@ -PROMPT Prepare runner for the top 2 package by path - ---Arrange -declare - c_path varchar2(100) := USER||':tests.test_package_1.test_package_2'; - l_objects_to_run ut_suite_items; - - l_test0_suite ut_logical_suite; - l_test1_suite ut_logical_suite; - l_test2_suite ut_logical_suite; -begin ---Act - l_objects_to_run := ut_suite_manager.configure_execution_by_path(ut_varchar2_list(c_path)); - ---Assert - ut.expect(l_objects_to_run.count).to_equal(1); - l_test0_suite := treat(l_objects_to_run(1) as ut_logical_suite); - - ut.expect(l_test0_suite.name).to_equal('tests'); - ut.expect(l_test0_suite.items.count).to_equal(1); - l_test1_suite := treat(l_test0_suite.items(1) as ut_logical_suite); - - ut.expect(l_test1_suite.name).to_equal('test_package_1'); - ut.expect(l_test1_suite.items.count).to_equal(1); - l_test2_suite := treat(l_test1_suite.items(1) as ut_logical_suite); - - ut.expect(l_test2_suite.name).to_equal('test_package_2'); - ut.expect(l_test2_suite.items.count).to_equal(2); - - - if ut_expectation_processor.get_status = ut_utils.gc_success then - :test_result := ut_utils.gc_success; - end if; - -end; -/ diff --git a/old_tests/ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTop2PackageByPathCurUser.sql b/old_tests/ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTop2PackageByPathCurUser.sql deleted file mode 100644 index 68a0443dd..000000000 --- a/old_tests/ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTop2PackageByPathCurUser.sql +++ /dev/null @@ -1,36 +0,0 @@ -PROMPT Prepare runner for the top 2 package by path for current user - ---Arrange -declare - c_path varchar2(100) := ':tests.test_package_1.test_package_2'; - l_objects_to_run ut_suite_items; - - l_test0_suite ut_logical_suite; - l_test1_suite ut_logical_suite; - l_test2_suite ut_logical_suite; -begin ---Act - l_objects_to_run := ut_suite_manager.configure_execution_by_path(ut_varchar2_list(c_path)); - ---Assert - ut.expect(l_objects_to_run.count).to_equal(1); - l_test0_suite := treat(l_objects_to_run(1) as ut_logical_suite); - - ut.expect(l_test0_suite.name).to_equal('tests'); - ut.expect(l_test0_suite.items.count).to_equal(1); - l_test1_suite := treat(l_test0_suite.items(1) as ut_logical_suite); - - ut.expect(l_test1_suite.name).to_equal('test_package_1'); - ut.expect(l_test1_suite.items.count).to_equal(1); - l_test2_suite := treat(l_test1_suite.items(1) as ut_logical_suite); - - ut.expect(l_test2_suite.name).to_equal('test_package_2'); - ut.expect(l_test2_suite.items.count).to_equal(2); - - - if ut_expectation_processor.get_status = ut_utils.gc_success then - :test_result := ut_utils.gc_success; - end if; - -end; -/ diff --git a/old_tests/ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTop2PackageProcedureByPath.sql b/old_tests/ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTop2PackageProcedureByPath.sql deleted file mode 100644 index 7de3aab68..000000000 --- a/old_tests/ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTop2PackageProcedureByPath.sql +++ /dev/null @@ -1,52 +0,0 @@ -PROMPT Prepare runner for the top 2 package procedure by path - ---Arrange -declare - c_path varchar2(100) := USER||':tests.test_package_1.test_package_2.test2'; - l_objects_to_run ut_suite_items; - - l_test0_suite ut_logical_suite; - l_test1_suite ut_logical_suite; - l_test2_suite ut_logical_suite; - l_test_proc ut_test; -begin ---Act - l_objects_to_run := ut_suite_manager.configure_execution_by_path(ut_varchar2_list(c_path)); - ---Assert - ut.expect(l_objects_to_run.count).to_equal(1); - l_test0_suite := treat(l_objects_to_run(1) as ut_logical_suite); - - ut.expect(l_test0_suite.name).to_equal('tests'); - ut.expect(l_test0_suite.items.count).to_equal(1); - l_test1_suite := treat(l_test0_suite.items(1) as ut_logical_suite); - - ut.expect(l_test1_suite.name).to_equal('test_package_1'); - ut.expect(l_test1_suite.items.count).to_equal(1); - l_test2_suite := treat(l_test1_suite.items(1) as ut_logical_suite); - - ut.expect(l_test2_suite.name).to_equal('test_package_2'); - ut.expect(l_test2_suite.items.count).to_equal(1); - - l_test_proc := treat(l_test2_suite.items(1) as ut_test); - ut.expect(l_test_proc.name).to_equal('test2'); - ut.expect(l_test_proc.before_test_list.count).to_equal(1); - ut.expect(l_test_proc.after_test_list.count).to_equal(1); - - if ut_expectation_processor.get_status = ut_utils.gc_success then - :test_result := ut_utils.gc_success; - else - dbms_output.put_line(q'[ut.expect(l_objects_to_run.count).to_equal(1);=]'||l_objects_to_run.count); - dbms_output.put_line(q'[ut.expect(l_test0_suite.name).to_equal('tests');=]'||l_test0_suite.name); - dbms_output.put_line(q'[ut.expect(l_test0_suite.items.count).to_equal(1);=]'||l_test0_suite.items.count); - dbms_output.put_line(q'[ut.expect(l_test1_suite.name).to_equal('test_package_1');=]'||l_test1_suite.name); - dbms_output.put_line(q'[ut.expect(l_test1_suite.items.count).to_equal(1);=]'||l_test1_suite.items.count); - dbms_output.put_line(q'[ut.expect(l_test2_suite.name).to_equal('test_package_2');=]'||l_test2_suite.name); - dbms_output.put_line(q'[ut.expect(l_test2_suite.items.count).to_equal(1);=]'||l_test2_suite.items.count); - dbms_output.put_line(q'[ut.expect(l_test_proc.name).to_equal('test2');=]'||l_test_proc.name); - dbms_output.put_line(q'[ut.expect(l_test_proc.before_test is not null).to_be_true;=]'||ut_utils.to_string(l_test_proc.before_test_list.count())); - dbms_output.put_line(q'[ut.expect(l_test_proc.after_test is not null).to_be_true;=]'||ut_utils.to_string(l_test_proc.after_test_list.count())); - end if; - -end; -/ diff --git a/old_tests/ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTop2PackageProcedureByPathCurUser.sql b/old_tests/ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTop2PackageProcedureByPathCurUser.sql deleted file mode 100644 index d476c064d..000000000 --- a/old_tests/ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTop2PackageProcedureByPathCurUser.sql +++ /dev/null @@ -1,52 +0,0 @@ -PROMPT Prepare runner for the top 2 package procedure by path for current user - ---Arrange -declare - c_path varchar2(100) := ':tests.test_package_1.test_package_2.test2'; - l_objects_to_run ut_suite_items; - - l_test0_suite ut_logical_suite; - l_test1_suite ut_logical_suite; - l_test2_suite ut_logical_suite; - l_test_proc ut_test; -begin ---Act - l_objects_to_run := ut_suite_manager.configure_execution_by_path(ut_varchar2_list(c_path)); - ---Assert - ut.expect(l_objects_to_run.count).to_equal(1); - l_test0_suite := treat(l_objects_to_run(1) as ut_logical_suite); - - ut.expect(l_test0_suite.name).to_equal('tests'); - ut.expect(l_test0_suite.items.count).to_equal(1); - l_test1_suite := treat(l_test0_suite.items(1) as ut_logical_suite); - - ut.expect(l_test1_suite.name).to_equal('test_package_1'); - ut.expect(l_test1_suite.items.count).to_equal(1); - l_test2_suite := treat(l_test1_suite.items(1) as ut_logical_suite); - - ut.expect(l_test2_suite.name).to_equal('test_package_2'); - ut.expect(l_test2_suite.items.count).to_equal(1); - - l_test_proc := treat(l_test2_suite.items(1) as ut_test); - ut.expect(l_test_proc.name).to_equal('test2'); - ut.expect(l_test_proc.before_test_list.count).to_equal(1); - ut.expect(l_test_proc.after_test_list.count).to_equal(1); - - if ut_expectation_processor.get_status = ut_utils.gc_success then - :test_result := ut_utils.gc_success; - else - dbms_output.put_line(q'[ut.expect(l_objects_to_run.count).to_equal(1);=]'||l_objects_to_run.count); - dbms_output.put_line(q'[ut.expect(l_test0_suite.name).to_equal('tests');=]'||l_test0_suite.name); - dbms_output.put_line(q'[ut.expect(l_test0_suite.items.count).to_equal(1);=]'||l_test0_suite.items.count); - dbms_output.put_line(q'[ut.expect(l_test1_suite.name).to_equal('test_package_1');=]'||l_test1_suite.name); - dbms_output.put_line(q'[ut.expect(l_test1_suite.items.count).to_equal(1);=]'||l_test1_suite.items.count); - dbms_output.put_line(q'[ut.expect(l_test2_suite.name).to_equal('test_package_2');=]'||l_test2_suite.name); - dbms_output.put_line(q'[ut.expect(l_test2_suite.items.count).to_equal(1);=]'||l_test2_suite.items.count); - dbms_output.put_line(q'[ut.expect(l_test_proc.name).to_equal('test2');=]'||l_test_proc.name); - dbms_output.put_line(q'[ut.expect(l_test_proc.before_test is not null).to_be_true;=]'||ut_utils.to_string(l_test_proc.before_test_list.count())); - dbms_output.put_line(q'[ut.expect(l_test_proc.after_test is not null).to_be_true;=]'||ut_utils.to_string(l_test_proc.after_test_list.count())); - end if; - -end; -/ diff --git a/old_tests/ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTopPackageByName.sql b/old_tests/ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTopPackageByName.sql deleted file mode 100644 index 969524f5e..000000000 --- a/old_tests/ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTopPackageByName.sql +++ /dev/null @@ -1,65 +0,0 @@ -PROMPT Prepare runner for the top package by package name - ---Arrange -declare - c_path varchar2(100) := USER||'.test_package_1'; - l_objects_to_run ut_suite_items; - - l_test0_suite ut_logical_suite; - l_test1_suite ut_suite; - l_test2_suite ut_suite; -begin ---Act - l_objects_to_run := ut_suite_manager.configure_execution_by_path(ut_varchar2_list(c_path)); - ---Assert - ut.expect(l_objects_to_run.count).to_equal(1); - l_test0_suite := treat(l_objects_to_run(1) as ut_logical_suite); - - ut.expect(l_test0_suite.name).to_equal('tests'); - ut.expect(l_test0_suite.items.count).to_equal(1); - l_test1_suite := treat(l_test0_suite.items(1) as ut_suite); - - ut.expect(l_test1_suite.name).to_equal('test_package_1'); - ut.expect(l_test1_suite.items.count).to_equal(3); - - ut.expect(l_test1_suite.items(1).name).to_equal('test1'); - ut.expect(l_test1_suite.items(1).description).to_equal('Test1 from test package 1'); - ut.expect(treat(l_test1_suite.items(1) as ut_test).before_test_list.count()).to_equal(0); - ut.expect(treat(l_test1_suite.items(1) as ut_test).after_test_list.count()).to_equal(0); - ut.expect(treat(l_test1_suite.items(1) as ut_test).before_each_list.count()).to_equal(1); - ut.expect(treat(l_test1_suite.items(1) as ut_test).disabled_flag).to_equal(0); - - ut.expect(l_test1_suite.items(2).name).to_equal('test2'); - ut.expect(l_test1_suite.items(2).description).to_equal('Test2 from test package 1'); - ut.expect(treat(l_test1_suite.items(2) as ut_test).before_test_list.count()).to_equal(1); - ut.expect(treat(l_test1_suite.items(2) as ut_test).after_test_list.count()).to_equal(1); - ut.expect(treat(l_test1_suite.items(2) as ut_test).before_each_list.count()).to_equal(1); - ut.expect(treat(l_test1_suite.items(2) as ut_test).disabled_flag).to_equal(0); - - -- temporary behavior. - -- decided that when executed by package, not path, only that package has to execute - l_test2_suite := treat(l_test1_suite.items(3) as ut_suite); - - ut.expect(l_test2_suite.name).to_equal('test_package_2'); - ut.expect(l_test2_suite.items.count).to_equal(2); - - - if ut_expectation_processor.get_status = ut_utils.gc_success then - :test_result := ut_utils.gc_success; - else - declare - l_results ut_expectation_results; - begin - l_results := ut_expectation_processor.get_failed_expectations; - for i in 1..l_results.count loop - if l_results(i).result > ut_utils.gc_success then - dbms_output.put_line(l_results(i).get_result_clob); - end if; - end loop; - end; - - end if; - -end; -/ diff --git a/old_tests/ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTopPackageByNameCurUser.sql b/old_tests/ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTopPackageByNameCurUser.sql deleted file mode 100644 index c918529b5..000000000 --- a/old_tests/ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTopPackageByNameCurUser.sql +++ /dev/null @@ -1,65 +0,0 @@ -PROMPT Prepare runner for the top package by package name for current user - ---Arrange -declare - c_path varchar2(100) := 'test_package_1'; - l_objects_to_run ut_suite_items; - - l_test0_suite ut_logical_suite; - l_test1_suite ut_suite; - l_test2_suite ut_suite; -begin ---Act - l_objects_to_run := ut_suite_manager.configure_execution_by_path(ut_varchar2_list(c_path)); - ---Assert - ut.expect(l_objects_to_run.count).to_equal(1); - l_test0_suite := treat(l_objects_to_run(1) as ut_logical_suite); - - ut.expect(l_test0_suite.name).to_equal('tests'); - ut.expect(l_test0_suite.items.count).to_equal(1); - l_test1_suite := treat(l_test0_suite.items(1) as ut_suite); - - ut.expect(l_test1_suite.name).to_equal('test_package_1'); - ut.expect(l_test1_suite.items.count).to_equal(3); - - ut.expect(l_test1_suite.items(1).name).to_equal('test1'); - ut.expect(l_test1_suite.items(1).description).to_equal('Test1 from test package 1'); - ut.expect(treat(l_test1_suite.items(1) as ut_test).before_test_list.count()).to_equal(0); - ut.expect(treat(l_test1_suite.items(1) as ut_test).after_test_list.count()).to_equal(0); - ut.expect(treat(l_test1_suite.items(1) as ut_test).before_each_list.count()).to_equal(1); - ut.expect(treat(l_test1_suite.items(1) as ut_test).disabled_flag).to_equal(0); - - ut.expect(l_test1_suite.items(2).name).to_equal('test2'); - ut.expect(l_test1_suite.items(2).description).to_equal('Test2 from test package 1'); - ut.expect(treat(l_test1_suite.items(2) as ut_test).before_test_list.count()).to_equal(1); - ut.expect(treat(l_test1_suite.items(2) as ut_test).after_test_list.count()).to_equal(1); - ut.expect(treat(l_test1_suite.items(2) as ut_test).before_each_list.count()).to_equal(1); - ut.expect(treat(l_test1_suite.items(2) as ut_test).disabled_flag).to_equal(0); - - -- temporary behavior. - -- decided that when executed by package, not path, only that package has to execute - l_test2_suite := treat(l_test1_suite.items(3) as ut_suite); - - ut.expect(l_test2_suite.name).to_equal('test_package_2'); - ut.expect(l_test2_suite.items.count).to_equal(2); - - - if ut_expectation_processor.get_status = ut_utils.gc_success then - :test_result := ut_utils.gc_success; - else - declare - l_results ut_expectation_results; - begin - l_results := ut_expectation_processor.get_failed_expectations; - for i in 1..l_results.count loop - if l_results(i).result > ut_utils.gc_success then - dbms_output.put_line(l_results(i).get_result_clob); - end if; - end loop; - end; - - end if; - -end; -/ diff --git a/old_tests/ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTopPackageByPath.sql b/old_tests/ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTopPackageByPath.sql deleted file mode 100644 index 3f035c932..000000000 --- a/old_tests/ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTopPackageByPath.sql +++ /dev/null @@ -1,36 +0,0 @@ -PROMPT Prepare runner for the top package by path - ---Arrange -declare - c_path varchar2(100) := USER||':tests'; - l_objects_to_run ut_suite_items; - - l_test0_suite ut_logical_suite; - l_test1_suite ut_logical_suite; - l_test2_suite ut_logical_suite; -begin ---Act - l_objects_to_run := ut_suite_manager.configure_execution_by_path(ut_varchar2_list(c_path)); - ---Assert - ut.expect(l_objects_to_run.count).to_equal(1); - l_test0_suite := treat(l_objects_to_run(1) as ut_logical_suite); - - ut.expect(l_test0_suite.name).to_equal('tests'); - ut.expect(l_test0_suite.items.count).to_equal(1); - l_test1_suite := treat(l_test0_suite.items(1) as ut_logical_suite); - - ut.expect(l_test1_suite.name).to_equal('test_package_1'); - ut.expect(l_test1_suite.items.count).to_equal(3); - l_test2_suite := treat(l_test1_suite.items(3) as ut_logical_suite); - - ut.expect(l_test2_suite.name).to_equal('test_package_2'); - ut.expect(l_test2_suite.items.count).to_equal(2); - - - if ut_expectation_processor.get_status = ut_utils.gc_success then - :test_result := ut_utils.gc_success; - end if; - -end; -/ diff --git a/old_tests/ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTopPackageByPathCurUser.sql b/old_tests/ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTopPackageByPathCurUser.sql deleted file mode 100644 index 28dc17442..000000000 --- a/old_tests/ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTopPackageByPathCurUser.sql +++ /dev/null @@ -1,36 +0,0 @@ -PROMPT Prepare runner for the top package by path for current user - ---Arrange -declare - c_path varchar2(100) := ':tests'; - l_objects_to_run ut_suite_items; - - l_test0_suite ut_logical_suite; - l_test1_suite ut_logical_suite; - l_test2_suite ut_logical_suite; -begin ---Act - l_objects_to_run := ut_suite_manager.configure_execution_by_path(ut_varchar2_list(c_path)); - ---Assert - ut.expect(l_objects_to_run.count).to_equal(1); - l_test0_suite := treat(l_objects_to_run(1) as ut_logical_suite); - - ut.expect(l_test0_suite.name).to_equal('tests'); - ut.expect(l_test0_suite.items.count).to_equal(1); - l_test1_suite := treat(l_test0_suite.items(1) as ut_logical_suite); - - ut.expect(l_test1_suite.name).to_equal('test_package_1'); - ut.expect(l_test1_suite.items.count).to_equal(3); - l_test2_suite := treat(l_test1_suite.items(3) as ut_logical_suite); - - ut.expect(l_test2_suite.name).to_equal('test_package_2'); - ut.expect(l_test2_suite.items.count).to_equal(2); - - - if ut_expectation_processor.get_status = ut_utils.gc_success then - :test_result := ut_utils.gc_success; - end if; - -end; -/ diff --git a/old_tests/ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTopPackageProcedureByPath.sql b/old_tests/ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTopPackageProcedureByPath.sql deleted file mode 100644 index 58958881f..000000000 --- a/old_tests/ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTopPackageProcedureByPath.sql +++ /dev/null @@ -1,38 +0,0 @@ -PROMPT Prepare runner for the top package procedure by path - ---Arrange -declare - c_path varchar2(100) := USER||':tests.test_package_1.test2'; - l_objects_to_run ut_suite_items; - - l_test0_suite ut_logical_suite; - l_test1_suite ut_logical_suite; - l_test2_suite ut_logical_suite; - l_test_proc ut_test; -begin ---Act - l_objects_to_run := ut_suite_manager.configure_execution_by_path(ut_varchar2_list(c_path)); - ---Assert - ut.expect(l_objects_to_run.count).to_equal(1); - l_test0_suite := treat(l_objects_to_run(1) as ut_logical_suite); - - ut.expect(l_test0_suite.name).to_equal('tests'); - ut.expect(l_test0_suite.items.count).to_equal(1); - l_test1_suite := treat(l_test0_suite.items(1) as ut_logical_suite); - - ut.expect(l_test1_suite.name).to_equal('test_package_1'); - ut.expect(l_test1_suite.items.count).to_equal(1); - l_test_proc := treat(l_test1_suite.items(1) as ut_test); - - ut.expect(l_test_proc.name).to_equal('test2'); - ut.expect(l_test_proc.description).to_equal('Test2 from test package 1'); - ut.expect(l_test_proc.before_test_list.count).to_equal(1); - ut.expect(l_test_proc.after_test_list.count).to_equal(1); - - if ut_expectation_processor.get_status = ut_utils.gc_success then - :test_result := ut_utils.gc_success; - end if; - -end; -/ diff --git a/old_tests/ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTopPackageProcedureByPathCurUser.sql b/old_tests/ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTopPackageProcedureByPathCurUser.sql deleted file mode 100644 index 009078767..000000000 --- a/old_tests/ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTopPackageProcedureByPathCurUser.sql +++ /dev/null @@ -1,38 +0,0 @@ -PROMPT Prepare runner for the top package procedure by path for current user - ---Arrange -declare - c_path varchar2(100) := ':tests.test_package_1.test2'; - l_objects_to_run ut_suite_items; - - l_test0_suite ut_logical_suite; - l_test1_suite ut_logical_suite; - l_test2_suite ut_logical_suite; - l_test_proc ut_test; -begin ---Act - l_objects_to_run := ut_suite_manager.configure_execution_by_path(ut_varchar2_list(c_path)); - ---Assert - ut.expect(l_objects_to_run.count).to_equal(1); - l_test0_suite := treat(l_objects_to_run(1) as ut_logical_suite); - - ut.expect(l_test0_suite.name).to_equal('tests'); - ut.expect(l_test0_suite.items.count).to_equal(1); - l_test1_suite := treat(l_test0_suite.items(1) as ut_logical_suite); - - ut.expect(l_test1_suite.name).to_equal('test_package_1'); - ut.expect(l_test1_suite.items.count).to_equal(1); - l_test_proc := treat(l_test1_suite.items(1) as ut_test); - - ut.expect(l_test_proc.name).to_equal('test2'); - ut.expect(l_test_proc.description).to_equal('Test2 from test package 1'); - ut.expect(l_test_proc.before_test_list.count).to_equal(1); - ut.expect(l_test_proc.after_test_list.count).to_equal(1); - - if ut_expectation_processor.get_status = ut_utils.gc_success then - :test_result := ut_utils.gc_success; - end if; - -end; -/ diff --git a/old_tests/ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTopPackageProcedureWithoutSubsuitesByName.sql b/old_tests/ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTopPackageProcedureWithoutSubsuitesByName.sql deleted file mode 100644 index 986b497a0..000000000 --- a/old_tests/ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTopPackageProcedureWithoutSubsuitesByName.sql +++ /dev/null @@ -1,36 +0,0 @@ -PROMPT Prepare runner for the top package procedure without sub-suites by package name - ---Arrange -declare - c_path varchar2(100) := USER||'.test_package_2.test2'; - l_objects_to_run ut_suite_items; - - l_test0_suite ut_logical_suite; - l_test1_suite ut_logical_suite; - l_test_proc ut_test; -begin ---Act - l_objects_to_run := ut_suite_manager.configure_execution_by_path(ut_varchar2_list(c_path)); - ---Assert - ut.expect(l_objects_to_run.count).to_equal(1); - l_test0_suite := treat(l_objects_to_run(1) as ut_logical_suite); - - ut.expect(l_test0_suite.name).to_equal('tests'); - ut.expect(l_test0_suite.items.count).to_equal(1); - l_test1_suite := treat(l_test0_suite.items(1) as ut_logical_suite); - - ut.expect(l_test1_suite.name).to_equal('test_package_3'); - ut.expect(l_test1_suite.items.count).to_equal(1); - - l_test_proc := treat(l_test1_suite.items(1) as ut_test); - ut.expect(l_test_proc.name).to_equal('test2'); - ut.expect(l_test_proc.before_test_list.count).to_equal(1); - ut.expect(l_test_proc.after_test_list.count).to_equal(1); - - if ut_expectation_processor.get_status = ut_utils.gc_success then - :test_result := ut_utils.gc_success; - end if; - -end; -/ diff --git a/old_tests/ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTopPackageProcedureWithoutSubsuitesByNameCurUser.sql b/old_tests/ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTopPackageProcedureWithoutSubsuitesByNameCurUser.sql deleted file mode 100644 index f1b536e21..000000000 --- a/old_tests/ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTopPackageProcedureWithoutSubsuitesByNameCurUser.sql +++ /dev/null @@ -1,36 +0,0 @@ -PROMPT Prepare runner for the top package procedure without sub-suites by package name for current user - ---Arrange -declare - c_path varchar2(100) := 'test_package_2.test2'; - l_objects_to_run ut_suite_items; - - l_test0_suite ut_logical_suite; - l_test1_suite ut_logical_suite; - l_test_proc ut_test; -begin ---Act - l_objects_to_run := ut_suite_manager.configure_execution_by_path(ut_varchar2_list(c_path)); - ---Assert - ut.expect(l_objects_to_run.count).to_equal(1); - l_test0_suite := treat(l_objects_to_run(1) as ut_logical_suite); - - ut.expect(l_test0_suite.name).to_equal('tests'); - ut.expect(l_test0_suite.items.count).to_equal(1); - l_test1_suite := treat(l_test0_suite.items(1) as ut_logical_suite); - - ut.expect(l_test1_suite.name).to_equal('test_package_3'); - ut.expect(l_test1_suite.items.count).to_equal(1); - - l_test_proc := treat(l_test1_suite.items(1) as ut_test); - ut.expect(l_test_proc.name).to_equal('test2'); - ut.expect(l_test_proc.before_test_list.count).to_equal(1); - ut.expect(l_test_proc.after_test_list.count).to_equal(1); - - if ut_expectation_processor.get_status = ut_utils.gc_success then - :test_result := ut_utils.gc_success; - end if; - -end; -/ diff --git a/old_tests/ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTopPackageWithoutSubsuitesByName.sql b/old_tests/ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTopPackageWithoutSubsuitesByName.sql deleted file mode 100644 index 4f95592fe..000000000 --- a/old_tests/ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTopPackageWithoutSubsuitesByName.sql +++ /dev/null @@ -1,40 +0,0 @@ -PROMPT Prepare runner for the top package without sub-suites by package name - ---Arrange -declare - c_path varchar2(100) := USER||'.test_package_3'; - l_objects_to_run ut_suite_items; - - l_test0_suite ut_logical_suite; - l_test1_suite ut_logical_suite; - l_test1 ut_test; - l_test3 ut_test; -begin ---Act - l_objects_to_run := ut_suite_manager.configure_execution_by_path(ut_varchar2_list(c_path)); - ---Assert - ut.expect(l_objects_to_run.count).to_equal(1); - l_test0_suite := treat(l_objects_to_run(1) as ut_logical_suite); - - ut.expect(l_test0_suite.name).to_equal('tests2'); - ut.expect(l_test0_suite.items.count).to_equal(1); - l_test1_suite := treat(l_test0_suite.items(1) as ut_logical_suite); - - ut.expect(l_test1_suite.name).to_equal('test_package_3'); - ut.expect(l_test1_suite.items.count).to_equal(3); - - l_test1 := treat(l_test1_suite.items(1) as ut_test); - ut.expect(l_test1.name).to_equal('test1'); - ut.expect(l_test1.disabled_flag).to_equal(0); - - l_test3 := treat(l_test1_suite.items(3) as ut_test); - ut.expect(l_test3.name).to_equal('disabled_test'); - ut.expect(l_test3.disabled_flag).to_equal(1); - - if ut_expectation_processor.get_status = ut_utils.gc_success then - :test_result := ut_utils.gc_success; - end if; - -end; -/ diff --git a/old_tests/ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTopPackageWithoutSubsuitesByNameCurUser.sql b/old_tests/ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTopPackageWithoutSubsuitesByNameCurUser.sql deleted file mode 100644 index 48da40bad..000000000 --- a/old_tests/ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTopPackageWithoutSubsuitesByNameCurUser.sql +++ /dev/null @@ -1,40 +0,0 @@ -PROMPT Prepare runner for the top package without sub-suites by package name for current user - ---Arrange -declare - c_path varchar2(100) := 'test_package_3'; - l_objects_to_run ut_suite_items; - - l_test0_suite ut_logical_suite; - l_test1_suite ut_logical_suite; - l_test1 ut_test; - l_test3 ut_test; -begin ---Act - l_objects_to_run := ut_suite_manager.configure_execution_by_path(ut_varchar2_list(c_path)); - ---Assert - ut.expect(l_objects_to_run.count).to_equal(1); - l_test0_suite := treat(l_objects_to_run(1) as ut_logical_suite); - - ut.expect(l_test0_suite.name).to_equal('tests2'); - ut.expect(l_test0_suite.items.count).to_equal(1); - l_test1_suite := treat(l_test0_suite.items(1) as ut_logical_suite); - - ut.expect(l_test1_suite.name).to_equal('test_package_3'); - ut.expect(l_test1_suite.items.count).to_equal(3); - - l_test1 := treat(l_test1_suite.items(1) as ut_test); - ut.expect(l_test1.name).to_equal('test1'); - ut.expect(l_test1.disabled_flag).to_equal(0); - - l_test3 := treat(l_test1_suite.items(3) as ut_test); - ut.expect(l_test3.name).to_equal('disabled_test'); - ut.expect(l_test3.disabled_flag).to_equal(1); - - if ut_expectation_processor.get_status = ut_utils.gc_success then - :test_result := ut_utils.gc_success; - end if; - -end; -/ diff --git a/old_tests/ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTopPackageWithoutSubsuitesByPath.sql b/old_tests/ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTopPackageWithoutSubsuitesByPath.sql deleted file mode 100644 index c5e8a3c0a..000000000 --- a/old_tests/ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTopPackageWithoutSubsuitesByPath.sql +++ /dev/null @@ -1,40 +0,0 @@ -PROMPT Prepare runner for the top package without subsuites by path - ---Arrange -declare - c_path varchar2(100) := USER||':tests2.test_package_3'; - l_objects_to_run ut_suite_items; - - l_test0_suite ut_logical_suite; - l_test1_suite ut_logical_suite; - l_test1 ut_test; - l_test3 ut_test; -begin ---Act - l_objects_to_run := ut_suite_manager.configure_execution_by_path(ut_varchar2_list(c_path)); - ---Assert - ut.expect(l_objects_to_run.count).to_equal(1); - l_test0_suite := treat(l_objects_to_run(1) as ut_logical_suite); - - ut.expect(l_test0_suite.name).to_equal('tests2'); - ut.expect(l_test0_suite.items.count).to_equal(1); - l_test1_suite := treat(l_test0_suite.items(1) as ut_logical_suite); - - ut.expect(l_test1_suite.name).to_equal('test_package_3'); - ut.expect(l_test1_suite.items.count).to_equal(3); - - l_test1 := treat(l_test1_suite.items(1) as ut_test); - ut.expect(l_test1.name).to_equal('test1'); - ut.expect(l_test1.disabled_flag).to_equal(0); - - l_test3 := treat(l_test1_suite.items(3) as ut_test); - ut.expect(l_test3.name).to_equal('disabled_test'); - ut.expect(l_test3.disabled_flag).to_equal(1); - - if ut_expectation_processor.get_status = ut_utils.gc_success then - :test_result := ut_utils.gc_success; - end if; - -end; -/ diff --git a/old_tests/ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTopPackageWithoutSubsuitesByPathCurUser.sql b/old_tests/ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTopPackageWithoutSubsuitesByPathCurUser.sql deleted file mode 100644 index ff8cd6f75..000000000 --- a/old_tests/ut_suite_manager/ut_suite_manager.configure_execution_by_path.PrepareRunnerForTheTopPackageWithoutSubsuitesByPathCurUser.sql +++ /dev/null @@ -1,40 +0,0 @@ -PROMPT Prepare runner for the top package without subsuites by path for current user - ---Arrange -declare - c_path varchar2(100) := ':tests2.test_package_3'; - l_objects_to_run ut_suite_items; - - l_test0_suite ut_logical_suite; - l_test1_suite ut_logical_suite; - l_test1 ut_test; - l_test3 ut_test; -begin ---Act - l_objects_to_run := ut_suite_manager.configure_execution_by_path(ut_varchar2_list(c_path)); - ---Assert - ut.expect(l_objects_to_run.count).to_equal(1); - l_test0_suite := treat(l_objects_to_run(1) as ut_logical_suite); - - ut.expect(l_test0_suite.name).to_equal('tests2'); - ut.expect(l_test0_suite.items.count).to_equal(1); - l_test1_suite := treat(l_test0_suite.items(1) as ut_logical_suite); - - ut.expect(l_test1_suite.name).to_equal('test_package_3'); - ut.expect(l_test1_suite.items.count).to_equal(3); - - l_test1 := treat(l_test1_suite.items(1) as ut_test); - ut.expect(l_test1.name).to_equal('test1'); - ut.expect(l_test1.disabled_flag).to_equal(0); - - l_test3 := treat(l_test1_suite.items(3) as ut_test); - ut.expect(l_test3.name).to_equal('disabled_test'); - ut.expect(l_test3.disabled_flag).to_equal(1); - - if ut_expectation_processor.get_status = ut_utils.gc_success then - :test_result := ut_utils.gc_success; - end if; - -end; -/ diff --git a/source/api/ut.pkb b/source/api/ut.pkb index 1159182fa..6fd4eab08 100644 --- a/source/api/ut.pkb +++ b/source/api/ut.pkb @@ -107,7 +107,7 @@ create or replace package body ut is procedure run_autonomous( a_paths ut_varchar2_list, - a_reporter ut_reporter_base, + a_reporter in out nocopy ut_reporter_base, a_color_console integer, a_coverage_schemes ut_varchar2_list := null, a_source_file_mappings ut_file_mappings, @@ -119,9 +119,10 @@ create or replace package body ut is pragma autonomous_transaction; c_fail_on_errors constant boolean := false; begin + a_reporter := coalesce(a_reporter,ut_documentation_reporter()); ut_runner.run( a_paths, - ut_reporters(coalesce(a_reporter,ut_documentation_reporter())), + ut_reporters(a_reporter), ut_utils.int_to_boolean(a_color_console), a_coverage_schemes, a_source_file_mappings, @@ -136,7 +137,7 @@ create or replace package body ut is procedure run_autonomous( a_paths ut_varchar2_list, - a_reporter ut_reporter_base, + a_reporter in out nocopy ut_reporter_base, a_color_console integer, a_coverage_schemes ut_varchar2_list := null, a_source_files ut_varchar2_list, @@ -148,9 +149,10 @@ create or replace package body ut is pragma autonomous_transaction; c_fail_on_errors constant boolean := false; begin + a_reporter := coalesce(a_reporter,ut_documentation_reporter()); ut_runner.run( a_paths, - ut_reporters(coalesce(a_reporter,ut_documentation_reporter())), + ut_reporters(a_reporter), ut_utils.int_to_boolean(a_color_console), a_coverage_schemes, ut_file_mapper.build_file_mappings(a_source_files), @@ -173,14 +175,12 @@ create or replace package body ut is a_exclude_objects ut_varchar2_list := null, a_client_character_set varchar2 := null ) return ut_varchar2_rows pipelined is - l_reporter ut_reporter_base := coalesce(a_reporter, - ut_documentation_reporter()); - l_paths ut_varchar2_list := ut_varchar2_list(sys_context('userenv', 'current_schema')); + l_reporter ut_reporter_base := a_reporter; l_lines sys_refcursor; l_line varchar2(4000); begin run_autonomous( - l_paths, + ut_varchar2_list(), l_reporter, a_color_console, a_coverage_schemes, @@ -213,13 +213,12 @@ create or replace package body ut is a_exclude_objects ut_varchar2_list := null, a_client_character_set varchar2 := null ) return ut_varchar2_rows pipelined is - l_reporter ut_reporter_base := coalesce(a_reporter, ut_documentation_reporter()); - l_paths ut_varchar2_list := ut_varchar2_list(sys_context('userenv', 'current_schema')); + l_reporter ut_reporter_base := a_reporter; l_lines sys_refcursor; l_line varchar2(4000); begin run_autonomous( - l_paths, + ut_varchar2_list(), l_reporter, a_color_console, a_coverage_schemes, @@ -253,7 +252,7 @@ create or replace package body ut is a_exclude_objects ut_varchar2_list := null, a_client_character_set varchar2 := null ) return ut_varchar2_rows pipelined is - l_reporter ut_reporter_base := coalesce(a_reporter, ut_documentation_reporter()); + l_reporter ut_reporter_base := a_reporter; l_lines sys_refcursor; l_line varchar2(4000); begin @@ -292,7 +291,7 @@ create or replace package body ut is a_exclude_objects ut_varchar2_list := null, a_client_character_set varchar2 := null ) return ut_varchar2_rows pipelined is - l_reporter ut_reporter_base := coalesce(a_reporter, ut_documentation_reporter()); + l_reporter ut_reporter_base := a_reporter; l_lines sys_refcursor; l_line varchar2(4000); begin @@ -331,14 +330,12 @@ create or replace package body ut is a_exclude_objects ut_varchar2_list := null, a_client_character_set varchar2 := null ) return ut_varchar2_rows pipelined is - l_reporter ut_reporter_base := coalesce(a_reporter, - ut_documentation_reporter()); - l_paths ut_varchar2_list := ut_varchar2_list(coalesce(a_path, sys_context('userenv', 'current_schema'))); + l_reporter ut_reporter_base := a_reporter; l_lines sys_refcursor; l_line varchar2(4000); begin run_autonomous( - l_paths, + ut_varchar2_list(a_path), l_reporter, a_color_console, a_coverage_schemes, @@ -372,13 +369,12 @@ create or replace package body ut is a_exclude_objects ut_varchar2_list := null, a_client_character_set varchar2 := null ) return ut_varchar2_rows pipelined is - l_reporter ut_reporter_base := coalesce(a_reporter, ut_documentation_reporter()); - l_paths ut_varchar2_list := ut_varchar2_list(coalesce(a_path, sys_context('userenv', 'current_schema'))); + l_reporter ut_reporter_base := a_reporter; l_lines sys_refcursor; l_line varchar2(4000); begin run_autonomous( - l_paths, + ut_varchar2_list(a_path), l_reporter, a_color_console, a_coverage_schemes, @@ -412,7 +408,7 @@ create or replace package body ut is a_exclude_objects ut_varchar2_list := null, a_client_character_set varchar2 := null ) is - l_reporter ut_reporter_base := coalesce(a_reporter, ut_documentation_reporter()); + l_reporter ut_reporter_base := a_reporter; begin run_autonomous( a_paths, @@ -442,7 +438,7 @@ create or replace package body ut is a_exclude_objects ut_varchar2_list := null, a_client_character_set varchar2 := null ) is - l_reporter ut_reporter_base := coalesce(a_reporter, ut_documentation_reporter()); + l_reporter ut_reporter_base := a_reporter; begin run_autonomous( a_paths, @@ -473,7 +469,7 @@ create or replace package body ut is ) is begin ut.run( - ut_varchar2_list(sys_context('userenv', 'current_schema')), + ut_varchar2_list(), a_reporter, a_color_console, a_coverage_schemes, @@ -497,7 +493,7 @@ create or replace package body ut is ) is begin ut.run( - ut_varchar2_list(sys_context('userenv', 'current_schema')), + ut_varchar2_list(), a_reporter, a_color_console, a_coverage_schemes, @@ -520,10 +516,9 @@ create or replace package body ut is a_exclude_objects ut_varchar2_list := null, a_client_character_set varchar2 := null ) is - l_paths ut_varchar2_list := ut_varchar2_list(coalesce(a_path, sys_context('userenv', 'current_schema'))); begin ut.run( - l_paths, + ut_varchar2_list(a_path), a_reporter, a_color_console, a_coverage_schemes, @@ -546,10 +541,9 @@ create or replace package body ut is a_exclude_objects ut_varchar2_list := null, a_client_character_set varchar2 := null ) is - l_paths ut_varchar2_list := ut_varchar2_list(coalesce(a_path, sys_context('userenv', 'current_schema'))); begin ut.run( - l_paths, + ut_varchar2_list(a_path), a_reporter, a_color_console, a_coverage_schemes, diff --git a/source/api/ut_runner.pkb b/source/api/ut_runner.pkb index ca0d6dccf..ec02af30e 100644 --- a/source/api/ut_runner.pkb +++ b/source/api/ut_runner.pkb @@ -92,13 +92,17 @@ create or replace package body ut_runner is l_paths ut_varchar2_list := ut_varchar2_list(); begin ut_event_manager.initialize(); - begin - ut_expectation_processor.reset_invalidation_exception(); - ut_utils.save_dbms_output_to_cache(); - + if a_paths is null or a_paths is empty or a_paths.count = 1 and a_paths(1) is null then + l_paths := ut_varchar2_list(sys_context('userenv', 'current_schema')); + else for i in 1..a_paths.COUNT loop l_paths := l_paths multiset union ut_utils.string_to_table(a_string => a_paths(i),a_delimiter => ','); end loop; + end if; + + begin + ut_expectation_processor.reset_invalidation_exception(); + ut_utils.save_dbms_output_to_cache(); ut_console_reporter_base.set_color_enabled(a_color_console); if a_reporters is null or a_reporters.count = 0 then diff --git a/source/core/types/ut_executable.tpb b/source/core/types/ut_executable.tpb index 610b7ab96..b31322331 100644 --- a/source/core/types/ut_executable.tpb +++ b/source/core/types/ut_executable.tpb @@ -29,42 +29,6 @@ create or replace type body ut_executable is return; end; - member function is_defined(self in out nocopy ut_executable) return boolean is - l_result boolean := false; - l_message_part varchar2(4000) := 'Call params for ' || self.executable_type || ' are not valid: '; - begin - - if self.object_name is null then - self.error_stack := l_message_part || 'package is not defined'; - elsif self.procedure_name is null then - self.error_stack := l_message_part || 'procedure is not defined'; - else - l_result := true; - end if; - - return l_result; - end is_defined; - - /** - * We will check if error raised because package was invalid if not we let it propagate. - **/ - member function is_invalid(self in out nocopy ut_executable) return boolean is - l_result boolean := true; - l_message_part varchar2(4000) := 'Call params for ' || self.executable_type || ' are not valid: '; - begin - - if not ut_metadata.package_valid(self.owner_name, self.object_name) then - self.error_stack := l_message_part || 'package does not exist or is invalid: ' ||upper(self.owner_name||'.'||self.object_name); - elsif not ut_metadata.procedure_exists(self.owner_name, self.object_name, self.procedure_name) then - self.error_stack := l_message_part || 'procedure does not exist ' - || upper(self.owner_name || '.' || self.object_name || '.' ||self.procedure_name); - else - l_result := false; - end if; - - return l_result; - end is_invalid; - member function form_name return varchar2 is begin return ut_metadata.form_name(owner_name, object_name, procedure_name); @@ -84,22 +48,54 @@ create or replace type body ut_executable is l_failed_with_invalid_pck boolean := true; l_start_transaction_id varchar2(250); l_end_transaction_id varchar2(250); - + + function is_defined return boolean is + l_result boolean := false; + l_message_part varchar2(4000) := 'Call params for ' || self.executable_type || ' are not valid: '; + begin + + if self.object_name is null then + self.error_stack := l_message_part || 'package is not defined'; + elsif self.procedure_name is null then + self.error_stack := l_message_part || 'procedure is not defined'; + else + l_result := true; + end if; + + return l_result; + end is_defined; + + function is_invalid return boolean is + l_result boolean := true; + l_message_part varchar2(4000) := 'Call params for ' || self.executable_type || ' are not valid: '; + begin + + if not ut_metadata.package_valid(self.owner_name, self.object_name) then + self.error_stack := l_message_part || 'package does not exist or is invalid: ' ||upper(self.owner_name||'.'||self.object_name); + elsif not ut_metadata.procedure_exists(self.owner_name, self.object_name, self.procedure_name) then + self.error_stack := l_message_part || 'procedure does not exist ' + || upper(self.owner_name || '.' || self.object_name || '.' ||self.procedure_name); + else + l_result := false; + end if; + + return l_result; + end is_invalid; + procedure save_dbms_output is l_status number; l_line varchar2(32767); begin - dbms_lob.createtemporary(self.serveroutput, true, dur => dbms_lob.session); - - loop - dbms_output.get_line(line => l_line, status => l_status); - exit when l_status = 1; + dbms_output.get_line(line => l_line, status => l_status); + if l_status != 1 then + dbms_lob.createtemporary(self.serveroutput, true, dur => dbms_lob.session); + end if; + while l_status != 1 loop if l_line is not null then - ut_utils.append_to_clob(self.serveroutput, l_line); + ut_utils.append_to_clob(self.serveroutput, l_line||chr(10)); end if; - - dbms_lob.writeappend(self.serveroutput,1,chr(10)); + dbms_output.get_line(line => l_line, status => l_status); end loop; end save_dbms_output; begin @@ -111,7 +107,7 @@ create or replace type body ut_executable is --listener - before call to executable ut_event_manager.trigger_event('before_'||self.executable_type, self); - l_completed_without_errors := self.is_defined(); + l_completed_without_errors := is_defined(); if l_completed_without_errors then l_statement := 'declare' || chr(10) || @@ -119,7 +115,7 @@ create or replace type body ut_executable is ' l_error_backtrace varchar2(32767);' || chr(10) || 'begin' || chr(10) || ' begin' || chr(10) || - ' ' || ut_metadata.form_name(self.owner_name, self.object_name, self.procedure_name) || ';' || chr(10) || + ' ' || self.form_name() || ';' || chr(10) || ' exception' || chr(10) || ' when others then ' || chr(10) || ' l_error_stack := dbms_utility.format_error_stack;' || chr(10) || @@ -149,7 +145,7 @@ create or replace type body ut_executable is dbms_sql.close_cursor(l_cursor_number); exception when ut_utils.ex_invalid_package then - l_failed_with_invalid_pck := self.is_invalid(); + l_failed_with_invalid_pck := is_invalid(); dbms_sql.close_cursor(l_cursor_number); if not l_failed_with_invalid_pck then raise; diff --git a/source/core/types/ut_executable.tps b/source/core/types/ut_executable.tps index 5dbda5eff..976ccf396 100644 --- a/source/core/types/ut_executable.tps +++ b/source/core/types/ut_executable.tps @@ -26,8 +26,6 @@ create or replace type ut_executable under ut_event_item( error_stack varchar2(4000), serveroutput clob, constructor function ut_executable( self in out nocopy ut_executable, a_owner varchar2, a_package varchar2, a_procedure_name varchar2, a_executable_type varchar2) return self as result, - member function is_invalid(self in out nocopy ut_executable) return boolean, - member function is_defined(self in out nocopy ut_executable) return boolean, member function form_name return varchar2, member procedure do_execute(self in out nocopy ut_executable, a_item in out nocopy ut_suite_item), /** diff --git a/source/core/ut_file_mapper.pks b/source/core/ut_file_mapper.pks index 573b0528f..f16913e98 100644 --- a/source/core/ut_file_mapper.pks +++ b/source/core/ut_file_mapper.pks @@ -16,10 +16,10 @@ create or replace package ut_file_mapper authid current_user is limitations under the License. */ - gc_file_mapping_regex constant varchar2(100) := '/((\w+)\.)?(\w+)\.(\w{3})$'; + gc_file_mapping_regex constant varchar2(100) := '/(((\w|[$#])+)\.)?((\w|[$#])+)\.(\w{3})$'; gc_regex_owner_subexpression constant positive := 2; - gc_regex_name_subexpression constant positive := 3; - gc_regex_type_subexpression constant positive := 4; + gc_regex_name_subexpression constant positive := 4; + gc_regex_type_subexpression constant positive := 6; function default_file_to_obj_type_map return ut_key_value_pairs; diff --git a/source/core/ut_suite_builder.pkb b/source/core/ut_suite_builder.pkb index 5baf7d349..3a9593906 100644 --- a/source/core/ut_suite_builder.pkb +++ b/source/core/ut_suite_builder.pkb @@ -328,21 +328,6 @@ create or replace package body ut_suite_builder is return l_result; end; - procedure add_executable( - a_executables in out nocopy ut_executables, - a_owner t_object_name, - a_package_name t_object_name, - a_procedure_name t_object_name, - a_executable_type ut_utils.t_executable_type - ) is - begin - if a_executables is null then - a_executables := ut_executables(); - end if; - a_executables.extend; - a_executables(a_executables.last) := ut_executable(a_owner, a_package_name, a_procedure_name, a_executable_type); - end; - function add_executables( a_owner t_object_name, a_package_name t_object_name, diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb index 0e8eba809..bde359738 100644 --- a/source/expectations/data_values/ut_compound_data_helper.pkb +++ b/source/expectations/data_values/ut_compound_data_helper.pkb @@ -162,9 +162,7 @@ create or replace package body ut_compound_data_helper is begin select replace((extract(a_item_data,a_join_by_xpath).getclobval()),chr(10)) into l_pk_value from dual; return l_pk_value; - exception when no_data_found then - return 'null'; - end; + end; function get_rows_diff( a_expected_dataset_guid raw, a_actual_dataset_guid raw, a_diff_id raw, diff --git a/source/expectations/data_values/ut_curr_usr_compound_helper.pkb b/source/expectations/data_values/ut_curr_usr_compound_helper.pkb index c910aca65..b610ee13c 100644 --- a/source/expectations/data_values/ut_curr_usr_compound_helper.pkb +++ b/source/expectations/data_values/ut_curr_usr_compound_helper.pkb @@ -59,22 +59,6 @@ create or replace package body ut_curr_usr_compound_helper is return l_result; end; - function get_descr_cursor(a_cursor in out nocopy sys_refcursor, a_desc_user_types boolean := false) return ut_key_anyval_pairs is - l_cursor_number integer; - l_columns_count pls_integer; - l_columns_desc dbms_sql.desc_tab3; - l_columns_tab ut_key_anyval_pairs; - begin - if a_cursor is null or not a_cursor%isopen then - return null; - end if; - l_cursor_number := dbms_sql.to_cursor_number( a_cursor ); - dbms_sql.describe_columns3( l_cursor_number, l_columns_count, l_columns_desc ); - a_cursor := dbms_sql.to_refcursor( l_cursor_number ); - l_columns_tab := get_columns_info( l_columns_desc, l_columns_count, a_desc_user_types); - return l_columns_tab; - end; - procedure get_descr_cursor( a_cursor in out nocopy sys_refcursor, a_columns_tab in out nocopy ut_key_anyval_pairs, @@ -128,25 +112,6 @@ create or replace package body ut_curr_usr_compound_helper is a_contains_collection := ut_utils.boolean_to_int(g_is_collection); end; - function get_columns_info(a_cursor in out nocopy sys_refcursor, a_desc_user_types boolean := false) return xmltype is - l_result xmltype; - l_result_tmp xmltype; - l_columns_tab ut_key_anyval_pairs; - begin - l_columns_tab := get_descr_cursor(a_cursor,a_desc_user_types); - - for i in 1..l_columns_tab.COUNT - loop - l_result_tmp := ut_compound_data_helper.get_column_info_xml(l_columns_tab(i)); - select xmlconcat(l_result,l_result_tmp) into l_result from dual; - end loop; - - select XMLELEMENT("ROW",l_result ) - into l_result from dual; - - return l_result; - end; - function get_anytype_attribute_count (a_anytype anytype) return pls_integer is l_attribute_typecode pls_integer; l_schema_name varchar2(32767); diff --git a/source/expectations/data_values/ut_curr_usr_compound_helper.pks b/source/expectations/data_values/ut_curr_usr_compound_helper.pks index 4bf32cf31..d662f51f9 100644 --- a/source/expectations/data_values/ut_curr_usr_compound_helper.pks +++ b/source/expectations/data_values/ut_curr_usr_compound_helper.pks @@ -7,9 +7,6 @@ create or replace package ut_curr_usr_compound_helper authid current_user is a_contains_collection out nocopy number ); - function get_columns_info(a_cursor in out nocopy sys_refcursor, - a_desc_user_types boolean := false) return xmltype; - function get_user_defined_type(a_owner varchar2, a_type_name varchar2) return xmltype; end; diff --git a/test/api/test_ut_run.pkb b/test/api/test_ut_run.pkb index 57d41b004..807f38696 100644 --- a/test/api/test_ut_run.pkb +++ b/test/api/test_ut_run.pkb @@ -1,5 +1,518 @@ create or replace package body test_ut_run is + --%test(ut.version() returns version of the framework) + procedure ut_version is + begin + ut.expect(ut3.ut.version()).to_match('^v\d+\.\d+\.\d+\.\d+(-\w+)?$'); + end; + + --%test(ut.fail() marks test as failed) + procedure ut_fail is + begin + --Act + ut3.ut.fail('Testing failure message'); + --Assert + ut.expect( + xmltype(anydata.convertCollection(ut3.ut_expectation_processor.get_failed_expectations())).getClobVal() + ).to_be_like('%2%Testing failure message%'); + --Cleanup + ut3.ut_expectation_processor.clear_expectations(); + end; + + + function get_dbms_output_as_clob return clob is + l_status number; + l_line varchar2(32767); + l_result clob; + begin + + dbms_output.get_line(line => l_line, status => l_status); + if l_status != 1 then + dbms_lob.createtemporary(l_result, true, dur => dbms_lob.session); + end if; + while l_status != 1 loop + if l_line is not null then + ut3.ut_utils.append_to_clob(l_result, l_line||chr(10)); + end if; + dbms_output.get_line(line => l_line, status => l_status); + end loop; + return l_result; + end; + + procedure create_ut3$user#_tests is + pragma autonomous_transaction; + begin + execute immediate q'[create or replace package ut3$user#.test_package_1 is + --%suite + --%suitepath(tests) + + --%test(Test1 from test package 1) + procedure test1; + + --%test(Test2 from test package 1) + procedure test2; + + procedure run(a_reporter ut3.ut_reporter_base := null); + procedure run(a_test_files ut3.ut_varchar2_list, a_reporter ut3.ut_reporter_base); + procedure run(a_path varchar2, a_reporter ut3.ut_reporter_base := null); + procedure run(a_path varchar2, a_test_files ut3.ut_varchar2_list, a_reporter ut3.ut_reporter_base); + procedure run(a_paths ut3.ut_varchar2_list, a_reporter ut3.ut_reporter_base := null); + procedure run(a_paths ut3.ut_varchar2_list, a_test_files ut3.ut_varchar2_list, a_reporter ut3.ut_reporter_base); + function run(a_reporter ut3.ut_reporter_base := null) return ut3.ut_varchar2_list; + function run(a_test_files ut3.ut_varchar2_list, a_reporter ut3.ut_reporter_base) return ut3.ut_varchar2_list; + function run(a_path varchar2, a_reporter ut3.ut_reporter_base := null) return ut3.ut_varchar2_list; + function run(a_path varchar2, a_test_files ut3.ut_varchar2_list, a_reporter ut3.ut_reporter_base) return ut3.ut_varchar2_list; + function run(a_paths ut3.ut_varchar2_list, a_reporter ut3.ut_reporter_base := null) return ut3.ut_varchar2_list; + function run(a_paths ut3.ut_varchar2_list, a_test_files ut3.ut_varchar2_list, a_reporter ut3.ut_reporter_base) return ut3.ut_varchar2_list; + + end test_package_1; + ]'; + execute immediate q'[create or replace package body ut3$user#.test_package_1 is + procedure test1 is + begin + dbms_output.put_line('test_package_1.test1 executed'); + end; + procedure test2 is + begin + dbms_output.put_line('test_package_1.test2 executed'); + end; + + procedure run(a_reporter ut3.ut_reporter_base := null) is + begin + ut3.ut.run(a_reporter); + end; + procedure run(a_test_files ut3.ut_varchar2_list, a_reporter ut3.ut_reporter_base) is + begin + ut3.ut.run( + a_reporter, a_source_files => ut3.ut_varchar2_list(), + a_test_files => a_test_files + ); + end; + procedure run(a_path varchar2, a_reporter ut3.ut_reporter_base := null) is + begin + ut3.ut.run(a_path, a_reporter); + end; + procedure run(a_path varchar2, a_test_files ut3.ut_varchar2_list, a_reporter ut3.ut_reporter_base) is + begin + ut3.ut.run( + a_path, + a_reporter, a_source_files => ut3.ut_varchar2_list(), + a_test_files => a_test_files + ); + end; + procedure run(a_paths ut3.ut_varchar2_list, a_reporter ut3.ut_reporter_base := null) is + begin + ut3.ut.run(a_paths, a_reporter); + end; + procedure run(a_paths ut3.ut_varchar2_list, a_test_files ut3.ut_varchar2_list, a_reporter ut3.ut_reporter_base) is + begin + ut3.ut.run( + a_paths, + a_reporter, a_source_files => ut3.ut_varchar2_list(), + a_test_files => a_test_files + ); + end; + + function run(a_reporter ut3.ut_reporter_base := null) return ut3.ut_varchar2_list is + l_results ut3.ut_varchar2_list; + begin + select * bulk collect into l_results from table (ut3.ut.run(a_reporter)); + return l_results; + end; + function run(a_test_files ut3.ut_varchar2_list, a_reporter ut3.ut_reporter_base) return ut3.ut_varchar2_list is + l_results ut3.ut_varchar2_list; + begin + select * bulk collect into l_results from table ( + ut3.ut.run( + a_reporter, a_source_files => ut3.ut_varchar2_list(), + a_test_files => a_test_files + )); + return l_results; + end; + function run(a_path varchar2, a_reporter ut3.ut_reporter_base := null) return ut3.ut_varchar2_list is + l_results ut3.ut_varchar2_list; + begin + select * bulk collect into l_results from table (ut3.ut.run(a_path, a_reporter)); + return l_results; + end; + function run(a_path varchar2, a_test_files ut3.ut_varchar2_list, a_reporter ut3.ut_reporter_base) return ut3.ut_varchar2_list is + l_results ut3.ut_varchar2_list; + begin + select * bulk collect into l_results from table ( + ut3.ut.run( + a_path, + a_reporter, a_source_files => ut3.ut_varchar2_list(), + a_test_files => a_test_files + )); + return l_results; + end; + function run(a_paths ut3.ut_varchar2_list, a_reporter ut3.ut_reporter_base := null) return ut3.ut_varchar2_list is + l_results ut3.ut_varchar2_list; + begin + select * bulk collect into l_results from table (ut3.ut.run(a_paths, a_reporter)); + return l_results; + end; + function run(a_paths ut3.ut_varchar2_list, a_test_files ut3.ut_varchar2_list, a_reporter ut3.ut_reporter_base) return ut3.ut_varchar2_list is + l_results ut3.ut_varchar2_list; + begin + select * bulk collect into l_results from table ( + ut3.ut.run( + a_paths, + a_reporter, a_source_files => ut3.ut_varchar2_list(), + a_test_files => a_test_files + )); + return l_results; + end; + end test_package_1; + ]'; + + execute immediate q'[create or replace package ut3$user#.test_package_2 is + --%suite + --%suitepath(tests.test_package_1) + + --%test + procedure test1; + + --%test + procedure test2; + + end test_package_2; + ]'; + execute immediate q'[create or replace package body ut3$user#.test_package_2 is + procedure test1 is + begin + dbms_output.put_line('test_package_2.test1 executed'); + end; + procedure test2 is + begin + dbms_output.put_line('test_package_2.test2 executed'); + end; + end test_package_2; + ]'; + + execute immediate q'[create or replace package ut3$user#.test_package_3 is + --%suite + --%suitepath(tests2) + + --%test + procedure test1; + + --%test + procedure test2; + + end test_package_3; + ]'; + execute immediate q'[create or replace package body ut3$user#.test_package_3 is + procedure test1 is + begin + dbms_output.put_line('test_package_3.test1 executed'); + end; + procedure test2 is + begin + dbms_output.put_line('test_package_3.test2 executed'); + end; + end test_package_3; + ]'; + end; + + procedure drop_ut3$user#_tests is + pragma autonomous_transaction; + begin + execute immediate q'[drop package ut3$user#.test_package_1]'; + execute immediate q'[drop package ut3$user#.test_package_2]'; + execute immediate q'[drop package ut3$user#.test_package_3]'; + end; + + procedure run_proc_no_params is + l_results clob; + begin + execute immediate 'begin ut3$user#.test_package_1.run(); end;'; + l_results := get_dbms_output_as_clob(); + --Assert + ut.expect( l_results ).to_be_like( '%test_package_1%test_package_2%test_package_3%' ); + end; + + procedure run_proc_specific_reporter is + l_results clob; + begin + --Act + execute immediate 'begin ut3$user#.test_package_1.run(:a_reporter); end;' + using in ut3.ut_documentation_reporter(); + l_results := get_dbms_output_as_clob(); + --Assert + ut.expect( l_results ).to_be_like( '%test_package_1%test_package_2%test_package_3%' ); + end; + + procedure run_proc_cov_file_list is + l_results clob; + begin + --Act + execute immediate 'begin ut3$user#.test_package_1.run(a_test_files=>:a_test_files, a_reporter=>:a_reporter); end;' + using + in ut3.ut_varchar2_list('tests/ut3$user#.test_package_1.pkb','tests/ut3$user#.test_package_2.pkb','tests/ut3$user#.test_package_3.pkb'), + in ut3.ut_sonar_test_reporter(); + l_results := get_dbms_output_as_clob(); + --Assert + ut.expect( l_results ).to_be_like( '%tests/ut3$user#.test_package_2.pkb%tests/ut3$user#.test_package_1.pkb%tests/ut3$user#.test_package_3.pkb%' ); + end; + + procedure run_proc_pkg_name is + l_results clob; + begin + execute immediate 'begin ut3$user#.test_package_1.run(:a_path); end;' + using in 'test_package_1'; + l_results := get_dbms_output_as_clob(); + --Assert + ut.expect( l_results ).to_be_like( '%test_package_1%' ); + ut.expect( l_results ).not_to_be_like( '%test_package_2%' ); + ut.expect( l_results ).not_to_be_like( '%test_package_3%' ); + end; + + procedure run_proc_pkg_name_file_list is + l_results clob; + begin + execute immediate 'begin ut3$user#.test_package_1.run(:a_path, :a_test_files, :a_reporter); end;' + using + in 'test_package_3', + in ut3.ut_varchar2_list('tests/ut3$user#.test_package_1.pkb','tests/ut3$user#.test_package_2.pkb','tests/ut3$user#.test_package_3.pkb'), + in ut3.ut_sonar_test_reporter(); + l_results := get_dbms_output_as_clob(); + --Assert + ut.expect( l_results ).to_be_like( '%tests/ut3$user#.test_package_3.pkb%' ); + ut.expect( l_results ).not_to_be_like( '%tests/ut3$user#.test_package_1.pkb%' ); + ut.expect( l_results ).not_to_be_like( '%tests/ut3$user#.test_package_2.pkb%' ); + end; + + procedure run_proc_path_list is + l_results clob; + begin + execute immediate 'begin ut3$user#.test_package_1.run(:a_paths); end;' + using in ut3.ut_varchar2_list(':tests.test_package_1',':tests'); + l_results := 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_3%' ); + end; + + procedure run_proc_path_list_file_list is + l_results clob; + begin + execute immediate 'begin ut3$user#.test_package_1.run(:a_paths, :a_test_files, :a_reporter); end;' + using + in ut3.ut_varchar2_list(':tests.test_package_1',':tests'), + in ut3.ut_varchar2_list('tests/ut3$user#.test_package_1.pkb','tests/ut3$user#.test_package_2.pkb','tests/ut3$user#.test_package_3.pkb'), + in ut3.ut_sonar_test_reporter(); + l_results := get_dbms_output_as_clob(); + --Assert + ut.expect( l_results ).to_be_like( '%tests/ut3$user#.test_package_1.pkb%' ); + ut.expect( l_results ).to_be_like( '%tests/ut3$user#.test_package_2.pkb%' ); + ut.expect( l_results ).not_to_be_like( '%tests/ut3$user#.test_package_3.pkb%' ); + end; + + procedure run_proc_null_reporter is + l_results clob; + begin + --Act + execute immediate 'begin ut3$user#.test_package_1.run(:a_reporter); end;' + using in cast(null as ut3.ut_reporter_base); + l_results := get_dbms_output_as_clob(); + --Assert + ut.expect( l_results ).to_be_like( '%tests%test_package_1%test_package_2%tests2%test_package_3%' ); + end; + + procedure run_proc_null_path is + l_results clob; + begin + --Act + execute immediate 'begin ut3$user#.test_package_1.run(:a_path); end;' + using in cast(null as varchar2); + l_results := get_dbms_output_as_clob(); + --Assert + ut.expect( l_results ).to_be_like( '%test_package_1%test_package_2%test_package_3%' ); + end; + + procedure run_proc_null_path_list is + l_results clob; + l_paths ut3.ut_varchar2_list; + begin + --Act + execute immediate 'begin ut3$user#.test_package_1.run(:a_paths); end;' + using in l_paths; + l_results := get_dbms_output_as_clob(); + --Assert + ut.expect( l_results ).to_be_like( '%test_package_1%test_package_2%test_package_3%' ); + end; + + procedure run_proc_empty_path_list is + l_results clob; + begin + --Act + execute immediate 'begin ut3$user#.test_package_1.run(:a_paths); end;' + using in ut3.ut_varchar2_list(); + l_results := get_dbms_output_as_clob(); + --Assert + ut.expect( l_results ).to_be_like( '%test_package_1%test_package_2%test_package_3%' ); + end; + + procedure run_func_no_params is + l_results ut3.ut_varchar2_list; + begin + execute immediate 'begin :l_results := ut3$user#.test_package_1.run(); end;' using out l_results; + --Assert + ut.expect( ut3.ut_utils.table_to_clob(l_results) ).to_be_like( '%test_package_1%test_package_2%test_package_3%' ); + end; + + procedure run_func_specific_reporter is + l_results ut3.ut_varchar2_list; + begin + --Act + execute immediate 'begin :l_results := ut3$user#.test_package_1.run(:a_reporter); end;' + using out l_results, in ut3.ut_documentation_reporter(); + --Assert + ut.expect( ut3.ut_utils.table_to_clob(l_results) ).to_be_like( '%test_package_1%test_package_2%test_package_3%' ); + end; + + procedure run_func_cov_file_list is + l_results ut3.ut_varchar2_list; + begin + --Act + execute immediate 'begin :l_results := ut3$user#.test_package_1.run(a_test_files=>:a_test_files, a_reporter=>:a_reporter); end;' + using out l_results, + in ut3.ut_varchar2_list('tests/ut3$user#.test_package_1.pkb','tests/ut3$user#.test_package_2.pkb','tests/ut3$user#.test_package_3.pkb'), + in ut3.ut_sonar_test_reporter(); + --Assert + ut.expect( ut3.ut_utils.table_to_clob(l_results) ).to_be_like( '%tests/ut3$user#.test_package_2.pkb%tests/ut3$user#.test_package_1.pkb%tests/ut3$user#.test_package_3.pkb%' ); + end; + + procedure run_func_pkg_name is + l_results ut3.ut_varchar2_list; + begin + execute immediate 'begin :l_results := ut3$user#.test_package_1.run(:a_path); end;' + using out l_results, in 'test_package_1'; + --Assert + ut.expect( ut3.ut_utils.table_to_clob(l_results) ).to_be_like( '%test_package_bal%' ); + ut.expect( ut3.ut_utils.table_to_clob(l_results) ).not_to_be_like( '%test_package_2%' ); + ut.expect( ut3.ut_utils.table_to_clob(l_results) ).not_to_be_like( '%test_package_3%' ); + end; + + procedure run_func_pkg_name_file_list is + l_results ut3.ut_varchar2_list; + begin + execute immediate 'begin :l_results := ut3$user#.test_package_1.run(:a_path, :a_test_files, :a_reporter); end;' + using out l_results, + in 'test_package_3', + in ut3.ut_varchar2_list('tests/ut3$user#.test_package_1.pkb','tests/ut3$user#.test_package_2.pkb','tests/ut3$user#.test_package_3.pkb'), + in ut3.ut_sonar_test_reporter(); + --Assert + ut.expect( ut3.ut_utils.table_to_clob(l_results) ).to_be_like( '%tests/ut3$user#.test_package_3.pkb%' ); + ut.expect( ut3.ut_utils.table_to_clob(l_results) ).not_to_be_like( '%tests/ut3$user#.test_package_1.pkb%' ); + ut.expect( ut3.ut_utils.table_to_clob(l_results) ).not_to_be_like( '%tests/ut3$user#.test_package_2.pkb%' ); + end; + + procedure run_func_path_list is + l_results ut3.ut_varchar2_list; + begin + execute immediate 'begin :l_results := ut3$user#.test_package_1.run(:a_paths); end;' + using out l_results, in ut3.ut_varchar2_list(':tests.test_package_1',':tests'); + --Assert + ut.expect( ut3.ut_utils.table_to_clob(l_results) ).to_be_like( '%test_package_1%' ); + ut.expect( ut3.ut_utils.table_to_clob(l_results) ).to_be_like( '%test_package_2%' ); + ut.expect( ut3.ut_utils.table_to_clob(l_results) ).not_to_be_like( '%test_package_3%' ); + end; + + procedure run_func_path_list_file_list is + l_results ut3.ut_varchar2_list; + begin + execute immediate 'begin :l_results := ut3$user#.test_package_1.run(:a_paths, :a_test_files, :a_reporter); end;' + using out l_results, + in ut3.ut_varchar2_list(':tests.test_package_1',':tests'), + in ut3.ut_varchar2_list('tests/ut3$user#.test_package_1.pkb','tests/ut3$user#.test_package_2.pkb','tests/ut3$user#.test_package_3.pkb'), + in ut3.ut_sonar_test_reporter(); + --Assert + ut.expect( ut3.ut_utils.table_to_clob(l_results) ).to_be_like( '%tests/ut3$user#.test_package_1.pkb%' ); + ut.expect( ut3.ut_utils.table_to_clob(l_results) ).to_be_like( '%tests/ut3$user#.test_package_2.pkb%' ); + ut.expect( ut3.ut_utils.table_to_clob(l_results) ).not_to_be_like( '%tests/ut3$user#.test_package_3.pkb%' ); + end; + + procedure run_func_null_reporter is + l_results ut3.ut_varchar2_list; + begin + --Act + execute immediate 'begin :l_results := ut3$user#.test_package_1.run(:a_reporter); end;' + using out l_results, in cast(null as ut3.ut_reporter_base); + --Assert + ut.expect( ut3.ut_utils.table_to_clob(l_results) ).to_be_like( '%tests%test_package_1%test_package_2%tests2%test_package_3%' ); + end; + + procedure run_func_null_path is + l_results ut3.ut_varchar2_list; + begin + --Act + execute immediate 'begin :l_results := ut3$user#.test_package_1.run(:a_path); end;' + using out l_results, in cast(null as varchar2); + --Assert + ut.expect( ut3.ut_utils.table_to_clob(l_results) ).to_be_like( '%test_package_1%test_package_2%test_package_3%' ); + end; + + procedure run_func_null_path_list is + l_results ut3.ut_varchar2_list; + l_paths ut3.ut_varchar2_list; + begin + --Act + execute immediate 'begin :l_results := ut3$user#.test_package_1.run(:a_paths); end;' + using out l_results, in l_paths; + --Assert + ut.expect( ut3.ut_utils.table_to_clob(l_results) ).to_be_like( '%test_package_1%test_package_2%test_package_3%' ); + end; + + procedure run_func_empty_path_list is + l_results ut3.ut_varchar2_list; + begin + --Act + execute immediate 'begin :l_results := ut3$user#.test_package_1.run(:a_paths); end;' + using out l_results, in ut3.ut_varchar2_list(); + --Assert + ut.expect( ut3.ut_utils.table_to_clob(l_results) ).to_be_like( '%test_package_1%test_package_2%test_package_3%' ); + end; + + procedure run_func_cov_file_lst_null_rep is + l_results ut3.ut_varchar2_list; + begin + --Act + execute immediate 'begin :l_results := ut3$user#.test_package_1.run(a_test_files=>:a_test_files, a_reporter=>:a_reporter); end;' + using out l_results, + in ut3.ut_varchar2_list('tests/ut3$user#.test_package_1.pkb','tests/ut3$user#.test_package_2.pkb','tests/ut3$user#.test_package_3.pkb'), + in cast(null as ut3.ut_reporter_base); + --Assert + ut.expect( ut3.ut_utils.table_to_clob(l_results) ).to_be_like( '%test_package_1%test_package_2%test_package_3%' ); + end; + + procedure run_func_empty_suite is + l_results ut3.ut_varchar2_list; + l_expected varchar2(32767); + pragma autonomous_transaction; + begin + --Arrange + execute immediate q'[create or replace package empty_suite as + -- %suite + + procedure not_a_test; + end;]'; + execute immediate q'[create or replace package body empty_suite as + procedure not_a_test is begin null; end; + end;]'; + l_expected := '%empty_suite%0 tests, 0 failed, 0 errored, 0 disabled, 0 warning(s)%'; + --Act + select * bulk collect into l_results from table(ut3.ut.run('empty_suite')); + + --Assert + ut.expect( ut3.ut_utils.table_to_clob(l_results) ).to_be_like( l_expected ); + + --Cleanup + execute immediate q'[drop package empty_suite]'; + end; + procedure create_test_suite is pragma autonomous_transaction; begin @@ -107,9 +620,7 @@ Failures:% l_actual clob; l_expected varchar2(32767); begin - select * - bulk collect into l_results - from table(ut3.ut.run('failing_invalid_spec')); + select * bulk collect into l_results from table(ut3.ut.run('failing_invalid_spec')); l_actual := ut3.ut_utils.table_to_clob(l_results); ut.expect(l_actual).to_be_like('%Call params for % are not valid: package does not exist or is invalid: %FAILING_INVALID_SPEC%'); @@ -122,19 +633,21 @@ Failures:% pragma autonomous_transaction; begin begin - execute immediate q'[create or replace package failing_invalid_spec as - --%suite - gv_glob_val non_existing_table.id%type := 0; + execute immediate q'[ + create or replace package failing_invalid_spec as + --%suite + gv_glob_val non_existing_table.id%type := 0; - --%test - procedure test1; -end;]'; + --%test + procedure test1; + end;]'; exception when ex_compilation_error then null; end; begin - execute immediate q'[create or replace package body failing_invalid_spec as - procedure test1 is begin ut.expect(1).to_equal(1); end; -end;]'; + execute immediate q'[ + create or replace package body failing_invalid_spec as + procedure test1 is begin ut.expect(1).to_equal(1); end; + end;]'; exception when ex_compilation_error then null; end; end; @@ -153,9 +666,7 @@ end;]'; and o.status = 'INVALID' and o.object_name= :object_name]' into l_is_invalid using user,'INVALID_PCKAG_THAT_REVALIDATES'; - select * - bulk collect into l_results - from table(ut3.ut.run('invalid_pckag_that_revalidates')); + select * bulk collect into l_results from table(ut3.ut.run('invalid_pckag_that_revalidates')); l_actual := ut3.ut_utils.table_to_clob(l_results); ut.expect(1).to_equal(l_is_invalid); @@ -171,33 +682,38 @@ end;]'; pragma autonomous_transaction; begin - execute immediate q'[create or replace package parent_specs as - c_test constant varchar2(1) := 'Y'; -end;]'; + execute immediate q'[ + create or replace package parent_specs as + c_test constant varchar2(1) := 'Y'; + end;]'; - execute immediate q'[create or replace package invalid_pckag_that_revalidates as - --%suite - g_var varchar2(1) := parent_specs.c_test; + execute immediate q'[ + create or replace package invalid_pckag_that_revalidates as + --%suite + g_var varchar2(1) := parent_specs.c_test; - --%test(invalidspecs) - procedure test1; -end;]'; + --%test(invalidspecs) + procedure test1; + end;]'; - execute immediate q'[create or replace package body invalid_pckag_that_revalidates as - procedure test1 is begin ut.expect('Y').to_equal(g_var); end; -end;]'; + execute immediate q'[ + create or replace package body invalid_pckag_that_revalidates as + procedure test1 is begin ut.expect('Y').to_equal(g_var); end; + end;]'; -- That should invalidate test package and we can then revers - execute immediate q'[create or replace package parent_specs as - c_test_error constant varchar2(1) := 'Y'; -end;]'; + execute immediate q'[ + create or replace package parent_specs as + c_test_error constant varchar2(1) := 'Y'; + end;]'; - execute immediate q'[create or replace package parent_specs as - c_test constant varchar2(1) := 'Y'; -end;]'; + execute immediate q'[ + create or replace package parent_specs as + c_test constant varchar2(1) := 'Y'; + end;]'; end; - procedure drop_test_package is + procedure drop_invalid_spec is pragma autonomous_transaction; begin execute immediate 'drop package invalid_pckag_that_revalidates'; diff --git a/test/api/test_ut_run.pks b/test/api/test_ut_run.pks index f4758ff3a..cd4a78ff3 100644 --- a/test/api/test_ut_run.pks +++ b/test/api/test_ut_run.pks @@ -1,27 +1,106 @@ create or replace package test_ut_run is - --%suite(ut_run) + --%suite(ut.run) + --%suitepath(utplsql.api) + + + --%test(ut.version() returns version of the framework) + procedure ut_version; + + --%test(ut.fail() marks test as failed) + procedure ut_fail; + + procedure create_ut3$user#_tests; + procedure drop_ut3$user#_tests; + + --%context(ut_run_procedure) + --%displayname(ut.run() procedure options) + --%beforeall(create_ut3$user#_tests) + --%afterall(drop_ut3$user#_tests) + + --%test(Runs all tests in current schema with default reporter when no parameters given) + procedure run_proc_no_params; + --%test(Runs all tests in current schema with specified reporter) + procedure run_proc_specific_reporter; + --%test(Runs all tests in current schema with coverage file list) + procedure run_proc_cov_file_list; + + --%disabled(TODO - currently it executes the package and all child packages) + --%test(Runs given package only with package name given as path) + procedure run_proc_pkg_name; + --%test(Runs all from given package with package name given as path and coverage file list) + procedure run_proc_pkg_name_file_list; + --%test(Runs tests from given paths only with paths list) + procedure run_proc_path_list; + --%test(Runs tests from given paths only with paths list and coverage file list) + procedure run_proc_path_list_file_list; + --%test(Runs all tests in current schema using default reporter when null reporter given) + procedure run_proc_null_reporter; + --%test(Runs all tests in current schema with null path provided) + procedure run_proc_null_path; + --%test(Runs all tests in current schema with null path list given) + procedure run_proc_null_path_list; + --%test(Runs all tests in current schema with empty path list given) + procedure run_proc_empty_path_list; + + --%endcontext - procedure create_test_suite; - procedure drop_test_suite; + + --%context(ut_run_function) + --%displayname(ut.run() function options) + --%beforeall(create_ut3$user#_tests) + --%afterall(drop_ut3$user#_tests) + + --%test(Runs all tests in current schema with default reporter when no parameters given) + procedure run_func_no_params; + --%test(Runs all tests in current schema with specified reporter) + procedure run_func_specific_reporter; + --%test(Runs all tests in current schema with coverage file list) + procedure run_func_cov_file_list; + + --%disabled(TODO - currently it executes the package and all child packages) + --%test(Runs given package only with package name given as path) + procedure run_func_pkg_name; + --%test(Runs all from given package with package name given as path and coverage file list) + procedure run_func_pkg_name_file_list; + --%test(Runs tests from given paths with paths list) + procedure run_func_path_list; + --%test(Runs tests from given paths with paths list and coverage file list) + procedure run_func_path_list_file_list; + --%test(Runs all tests in current schema using default reporter when null reporter given) + procedure run_func_null_reporter; + --%test(Runs all tests in current schema with null path provided) + procedure run_func_null_path; + --%test(Runs all tests in current schema with null path list given) + procedure run_func_null_path_list; + --%test(Runs all tests in current schema with empty path list given) + procedure run_func_empty_path_list; + --%test(Runs all tests in current schema with coverage file list and default reporter) + procedure run_func_cov_file_lst_null_rep; + --%test(Executes successfully an empty suite) + procedure run_func_empty_suite; --%test(ut.run - raises after completing all tests if a test fails with ORA-04068 or ORA-04061) --%beforetest(create_test_suite) --%aftertest(drop_test_suite) procedure raise_in_invalid_state; - - --%test(ut.run - run invalid package and fail expectation) + procedure create_test_suite; + procedure drop_test_suite; + + --%test(ut.run - Does not execute suite when specified package is not valid) --%beforetest(compile_invalid_package) --%aftertest(drop_invalid_package) procedure run_in_invalid_state; procedure compile_invalid_package; procedure drop_invalid_package; - - --%test( Invalidate package specs via rebuild but still execute package) + + --%test(Invalidate package specs via rebuild but still execute package) --%beforetest(generate_invalid_spec) - --%aftertest(drop_test_package) + --%aftertest(drop_invalid_spec) procedure run_and_revalidate_specs; procedure generate_invalid_spec; - procedure drop_test_package; - + procedure drop_invalid_spec; + + --%endcontext + end; / diff --git a/test/core/expectations/binary/test_be_greater_or_equal.pkb b/test/core/expectations/binary/test_be_greater_or_equal.pkb index 7e82adde7..f41878643 100644 --- a/test/core/expectations/binary/test_be_greater_or_equal.pkb +++ b/test/core/expectations/binary/test_be_greater_or_equal.pkb @@ -251,5 +251,13 @@ create or replace package body test_be_greater_or_equal is ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); end; + procedure actual_clob is + begin + --Act + ut3.ut.expect(to_clob('3')).to_( ut3.be_greater_or_equal(3) ); + --Assert + ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); + end; + end; / diff --git a/test/core/expectations/binary/test_be_greater_or_equal.pks b/test/core/expectations/binary/test_be_greater_or_equal.pks index 3aa21b486..077dff59c 100644 --- a/test/core/expectations/binary/test_be_greater_or_equal.pks +++ b/test/core/expectations/binary/test_be_greater_or_equal.pks @@ -90,5 +90,8 @@ create or replace package test_be_greater_or_equal is --%test(Negated - Gives failure when actual timestamp with local time zone is greater than expected) procedure not_actual_timestamp_ltz_gretr; + --%test(Gives failure when running against CLOB) + procedure actual_clob; + end; / diff --git a/test/core/expectations/binary/test_be_greater_than.pkb b/test/core/expectations/binary/test_be_greater_than.pkb index 688200707..5863b11b1 100644 --- a/test/core/expectations/binary/test_be_greater_than.pkb +++ b/test/core/expectations/binary/test_be_greater_than.pkb @@ -251,5 +251,13 @@ create or replace package body test_be_greater_than is ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); end; + procedure actual_clob is + begin + --Act + ut3.ut.expect(to_clob('3')).to_( ut3.be_greater_than(2) ); + --Assert + ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); + end; + end; / diff --git a/test/core/expectations/binary/test_be_greater_than.pks b/test/core/expectations/binary/test_be_greater_than.pks index cb3f666d5..6a1dfcc3e 100644 --- a/test/core/expectations/binary/test_be_greater_than.pks +++ b/test/core/expectations/binary/test_be_greater_than.pks @@ -90,5 +90,8 @@ create or replace package test_be_greater_than is --%test(Negated - Gives failure when actual timestamp with local time zone is greater than expected) procedure not_actual_timestamp_ltz_gretr; + --%test(Gives failure when running against CLOB) + procedure actual_clob; + end; / diff --git a/test/core/expectations/binary/test_be_less_or_equal.pkb b/test/core/expectations/binary/test_be_less_or_equal.pkb index f3ee4bc47..c72e0039b 100644 --- a/test/core/expectations/binary/test_be_less_or_equal.pkb +++ b/test/core/expectations/binary/test_be_less_or_equal.pkb @@ -251,5 +251,13 @@ create or replace package body test_be_less_or_equal is ut.expect( expectations.failed_expectations_data( ) ).to_be_empty(); end; + procedure actual_clob is + begin + --Act + ut3.ut.expect(to_clob('3')).to_( ut3.be_less_or_equal(3) ); + --Assert + ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); + end; + end; / diff --git a/test/core/expectations/binary/test_be_less_or_equal.pks b/test/core/expectations/binary/test_be_less_or_equal.pks index 74f98a412..a6ab01664 100644 --- a/test/core/expectations/binary/test_be_less_or_equal.pks +++ b/test/core/expectations/binary/test_be_less_or_equal.pks @@ -90,5 +90,8 @@ create or replace package test_be_less_or_equal is --%test(Negated - Gives success when actual timestamp with local time zone is greater than expected) procedure not_actual_timestamp_ltz_gretr; + --%test(Gives failure when running against CLOB) + procedure actual_clob; + end; / diff --git a/test/core/expectations/binary/test_equal.pkb b/test/core/expectations/binary/test_equal.pkb index 0e5ab2fdf..dd7dd7a82 100644 --- a/test/core/expectations/binary/test_equal.pkb +++ b/test/core/expectations/binary/test_equal.pkb @@ -95,6 +95,8 @@ create or replace package body test_equal is procedure equal_fail_on_type_diff is begin + test_to_equal_fail('boolean', 'integer', 'true', '1'); + test_to_equal_fail('integer', 'boolean', '1', 'true'); test_to_equal_fail('blob', 'clob', 'to_blob(''ABC'')', '''ABC'''); test_to_equal_fail('clob', 'blob', '''ABC''', 'to_blob(''ABC'')'); test_to_equal_fail('clob', 'anydata', '''ABC''', 'null'); @@ -115,6 +117,8 @@ create or replace package body test_equal is procedure not_equal_fail_on_type_diff is begin + test_not_to_equal_fail('boolean', 'integer', 'true', '1'); + test_not_to_equal_fail('integer', 'boolean', '1', 'true'); test_not_to_equal_fail('blob', 'clob', 'to_blob(''ABC'')', '''ABC'''); test_not_to_equal_fail('clob', 'blob', '''ABC''', 'to_blob(''ABC'')'); test_not_to_equal_fail('clob', 'anydata', '''ABC''', 'null'); @@ -136,6 +140,7 @@ create or replace package body test_equal is procedure failure_on_data_diff is begin test_to_equal_fail('blob', 'to_blob(''abc'')', 'to_blob(''abd'')'); + test_to_equal_fail('boolean', 'false', 'true'); test_to_equal_fail('boolean', 'true', 'false'); test_to_equal_fail('clob', '''Abc''', '''abc'''); test_to_equal_fail('date', 'sysdate', 'sysdate-1'); diff --git a/test/core/expectations/binary/test_expect_to_be_less_than.pkb b/test/core/expectations/binary/test_expect_to_be_less_than.pkb index 987cbf9cd..8f1278db4 100644 --- a/test/core/expectations/binary/test_expect_to_be_less_than.pkb +++ b/test/core/expectations/binary/test_expect_to_be_less_than.pkb @@ -251,5 +251,13 @@ create or replace package body test_expect_to_be_less_than is ut.expect( expectations.failed_expectations_data( ) ).to_be_empty( ); end; + procedure actual_clob is + begin + --Act + ut3.ut.expect(to_clob('3')).to_( ut3.be_less_than(4) ); + --Assert + ut.expect( expectations.failed_expectations_data( ) ).not_to_be_empty( ); + end; + end; / diff --git a/test/core/expectations/binary/test_expect_to_be_less_than.pks b/test/core/expectations/binary/test_expect_to_be_less_than.pks index 785c5c122..67e6b8776 100644 --- a/test/core/expectations/binary/test_expect_to_be_less_than.pks +++ b/test/core/expectations/binary/test_expect_to_be_less_than.pks @@ -90,5 +90,8 @@ create or replace package test_expect_to_be_less_than is --%test(Negated - Gives success when actual timestamp with local time zone is greater than expected) procedure not_actual_timestamp_ltz_gretr; + --%test(Gives failure when running against CLOB) + procedure actual_clob; + end; / diff --git a/test/core/expectations/test_expectation_processor.pkb b/test/core/expectations/test_expectation_processor.pkb new file mode 100644 index 000000000..17ffbec3c --- /dev/null +++ b/test/core/expectations/test_expectation_processor.pkb @@ -0,0 +1,71 @@ +create or replace package body test_expectation_processor is + + procedure who_called_expectation is + l_stack_trace varchar2(4000); + l_source_line varchar2(4000); + begin + l_stack_trace := q'[----- PL/SQL Call Stack ----- + object line object + handle number name +34f88e4420 124 package body SCH_TEST.UT_EXPECTATION_PROCESSOR +353dfeb2f8 26 SCH_TEST.UT_EXPECTATION_RESULT +cba249ce0 112 SCH_TEST.UT_EXPECTATION +3539881cf0 21 SCH_TEST.UT_EXPECTATION_NUMBER +351a608008 28 package body SCH_TEST.TPKG_PRIOR_YEAR_GENERATION +351a6862b8 6 anonymous block +351fe31010 1825 package body SYS.DBMS_SQL +20befbe4d8 129 SCH_TEST.UT_EXECUTABLE +20befbe4d8 65 SCH_TEST.UT_EXECUTABLE +34f8ab7cd8 80 SCH_TEST.UT_TEST +34f8ab98f0 48 SCH_TEST.UT_SUITE_ITEM +34f8ab9b10 74 SCH_TEST.UT_SUITE +34f8ab98f0 48 SCH_TEST.UT_SUITE_ITEM +cba24bfd0 75 SCH_TEST.UT_LOGICAL_SUITE +353dfecf30 59 SCH_TEST.UT_RUN +34f8ab98f0 48 SCH_TEST.UT_SUITE_ITEM +357f5421e8 77 package body SCH_TEST.UT_RUNNER +357f5421e8 111 package body SCH_TEST.UT_RUNNER +20be951ab0 292 package body SCH_TEST.UT +20be951ab0 320 package body SCH_TEST.UT +]'; + ut.expect( + ut3.ut_expectation_processor.who_called_expectation(l_stack_trace) + ).to_be_like('at "SCH_TEST.TPKG_PRIOR_YEAR_GENERATION", line 28 %'); + end; + + + procedure who_called_expectation_0x is + l_stack_trace varchar2(4000); + l_source_line varchar2(4000); + begin + l_stack_trace := q'[----- PL/SQL Call Stack ----- + object line object + handle number name +34f88e4420 124 package body SCH_TEST.UT_EXPECTATION_PROCESSOR +353dfeb2f8 26 SCH_TEST.UT_EXPECTATION_RESULT +cba249ce0 112 SCH_TEST.UT_EXPECTATION +3539881cf0 21 SCH_TEST.UT_EXPECTATION_NUMBER +351a608008 28 package body SCH_TEST.TPKG_PRIOR_YEAR_GENERATION +351a6862b8 6 anonymous block +351fe31010 1825 package body SYS.DBMS_SQL +20befbe4d8 129 SCH_TEST.UT_EXECUTABLE +20befbe4d8 65 SCH_TEST.UT_EXECUTABLE +34f8ab7cd8 80 SCH_TEST.UT_TEST +34f8ab98f0 48 SCH_TEST.UT_SUITE_ITEM +34f8ab9b10 74 SCH_TEST.UT_SUITE +34f8ab98f0 48 SCH_TEST.UT_SUITE_ITEM +cba24bfd0 75 SCH_TEST.UT_LOGICAL_SUITE +353dfecf30 59 SCH_TEST.UT_RUN +34f8ab98f0 48 SCH_TEST.UT_SUITE_ITEM +357f5421e8 77 package body SCH_TEST.UT_RUNNER +357f5421e8 111 package body SCH_TEST.UT_RUNNER +20be951ab0 292 package body SCH_TEST.UT +20be951ab0 320 package body SCH_TEST.UT +]'; + ut.expect( + ut3.ut_expectation_processor.who_called_expectation(l_stack_trace) + ).to_be_like('at "SCH_TEST.TPKG_PRIOR_YEAR_GENERATION", line 28 %'); + end; + +end; +/ diff --git a/test/core/expectations/test_expectation_processor.pks b/test/core/expectations/test_expectation_processor.pks new file mode 100644 index 000000000..ecde48153 --- /dev/null +++ b/test/core/expectations/test_expectation_processor.pks @@ -0,0 +1,17 @@ +create or replace package test_expectation_processor is + + --%suite(expectation_processor) + --%suitepath(utplsql.core.expectations) + + --%context(who_called_expectation) + + --%test(parses stack trace and returns object and line that called expectation) + procedure who_called_expectation; + + --%test(parses stack trace containing 0x and returns object and line that called expectation) + procedure who_called_expectation_0x; + + --%endcontext + +end; +/ diff --git a/test/core/expectations/test_expectations_cursor.pkb b/test/core/expectations/test_expectations_cursor.pkb index aa0615e4a..d18cef5fb 100644 --- a/test/core/expectations/test_expectations_cursor.pkb +++ b/test/core/expectations/test_expectations_cursor.pkb @@ -325,10 +325,10 @@ create or replace package body test_expectations_cursor is l_second number := 1/24/60/60; begin --Arrange - ut.set_nls; + ut3.ut.set_nls; open l_actual for select l_date as some_date from dual; open l_expected for select l_date-l_second some_date from dual; - ut.reset_nls; + ut3.ut.reset_nls; --Act ut3.ut.expect( l_actual ).to_equal( l_expected ); --Assert diff --git a/test/core/expectations/test_matchers.pkb b/test/core/expectations/test_matchers.pkb index cbc265319..e66f7c750 100644 --- a/test/core/expectations/test_matchers.pkb +++ b/test/core/expectations/test_matchers.pkb @@ -64,7 +64,7 @@ create or replace package body test_matchers is cleanup_expectations(); end exec_be_between2; - procedure exec_be_like(a_type varchar2, a_value varchar2, a_pattern varchar2, a_escape varchar2, a_result integer, a_prefix varchar2) is + procedure exec_be_like(a_type varchar2, a_value varchar2, a_pattern varchar2, a_escape varchar2, a_result integer, a_prefix varchar2 default null) is begin execute immediate 'declare @@ -156,6 +156,7 @@ create or replace package body test_matchers is exec_be_between2('timestamp with time zone', 'null', 'systimestamp-1', 'systimestamp+1', ut3.ut_utils.gc_failure, ''); exec_be_between2('interval year to month', 'null', '''2-0''', '''2-2''', ut3.ut_utils.gc_failure, ''); exec_be_between2('interval day to second', 'null', '''2 00:59:58''', '''2 01:00:01''', ut3.ut_utils.gc_failure, ''); + exec_be_between2('date', 'null', 'sysdate-2', 'sysdate-1', ut3.ut_utils.gc_failure, 'not_'); exec_be_between2('number', 'null', '1.99', '1.999', ut3.ut_utils.gc_failure, 'not_'); exec_be_between2('varchar2(1)', 'null', '''a''', '''b''', ut3.ut_utils.gc_failure, 'not_'); @@ -174,6 +175,7 @@ create or replace package body test_matchers is exec_be_between2('timestamp with time zone', 'systimestamp', 'null', 'systimestamp+1', ut3.ut_utils.gc_failure, ''); exec_be_between2('interval year to month', '''2-1''', 'null', '''2-2''', ut3.ut_utils.gc_failure, ''); exec_be_between2('interval day to second', '''2 01:00:00''', 'null', '''2 01:00:01''', ut3.ut_utils.gc_failure, ''); + exec_be_between2('date', 'sysdate', 'null', 'sysdate-1', ut3.ut_utils.gc_failure, 'not_'); exec_be_between2('number', '2.0', 'null', '1.999', ut3.ut_utils.gc_failure, 'not_'); exec_be_between2('varchar2(1)', '''b''', 'null', '''b''', ut3.ut_utils.gc_failure, 'not_'); @@ -182,19 +184,21 @@ create or replace package body test_matchers is exec_be_between2('timestamp with time zone', 'systimestamp+1', 'null', 'systimestamp', ut3.ut_utils.gc_failure, 'not_'); exec_be_between2('interval year to month', '''2-2''', 'null', '''2-1''', ut3.ut_utils.gc_failure, 'not_'); exec_be_between2('interval day to second', '''2 01:00:00''', 'null', '''2 00:59:59''', ut3.ut_utils.gc_failure, 'not_'); + --Fails for unsupported data-type + exec_be_between2('clob', '''b''', '''a''', '''c''', ut3.ut_utils.gc_failure, ''); end; procedure test_match is begin - exec_match('varchar2(100)', '''Stephen''', '^Ste(v|ph)en$', '', ut3.ut_utils.gc_success, ''); - exec_match('varchar2(100)', '''sTEPHEN''', '^Ste(v|ph)en$', 'i', ut3.ut_utils.gc_success, ''); - exec_match('clob', 'rpad('', '',32767)||''Stephen''', 'Ste(v|ph)en$', '', ut3.ut_utils.gc_success, ''); - exec_match('clob', 'rpad('', '',32767)||''sTEPHEN''', 'Ste(v|ph)en$', 'i', ut3.ut_utils.gc_success, ''); + exec_match('varchar2(100)', '''Stephen''', '^Ste(v|ph)en$', '', ut3.ut_utils.gc_success); + exec_match('varchar2(100)', '''sTEPHEN''', '^Ste(v|ph)en$', 'i', ut3.ut_utils.gc_success); + exec_match('clob', 'rpad('', '',32767)||''Stephen''', 'Ste(v|ph)en$', '', ut3.ut_utils.gc_success); + exec_match('clob', 'rpad('', '',32767)||''sTEPHEN''', 'Ste(v|ph)en$', 'i', ut3.ut_utils.gc_success); - exec_match('varchar2(100)', '''Stephen''', '^Steven$', '', ut3.ut_utils.gc_failure, ''); - exec_match('varchar2(100)', '''sTEPHEN''', '^Steven$', 'i', ut3.ut_utils.gc_failure, ''); - exec_match('clob', 'to_clob(rpad('', '',32767)||''Stephen'')', '^Stephen', '', ut3.ut_utils.gc_failure, ''); - exec_match('clob', 'to_clob(rpad('', '',32767)||''sTEPHEN'')', '^Stephen', 'i', ut3.ut_utils.gc_failure, ''); + exec_match('varchar2(100)', '''Stephen''', '^Steven$', '', ut3.ut_utils.gc_failure); + exec_match('varchar2(100)', '''sTEPHEN''', '^Steven$', 'i', ut3.ut_utils.gc_failure); + exec_match('clob', 'to_clob(rpad('', '',32767)||''Stephen'')', '^Stephen', '', ut3.ut_utils.gc_failure); + exec_match('clob', 'to_clob(rpad('', '',32767)||''sTEPHEN'')', '^Stephen', 'i', ut3.ut_utils.gc_failure); exec_match('varchar2(100)', '''Stephen''', '^Ste(v|ph)en$', '', ut3.ut_utils.gc_failure, 'not_'); exec_match('varchar2(100)', '''sTEPHEN''', '^Ste(v|ph)en$', 'i', ut3.ut_utils.gc_failure, 'not_'); @@ -205,19 +209,21 @@ create or replace package body test_matchers is exec_match('varchar2(100)', '''sTEPHEN''', '^Steven$', 'i', ut3.ut_utils.gc_success, 'not_'); exec_match('clob', 'to_clob(rpad('', '',32767)||''Stephen'')', '^Stephen', '', ut3.ut_utils.gc_success, 'not_'); exec_match('clob', 'to_clob(rpad('', '',32767)||''sTEPHEN'')', '^Stephen', 'i', ut3.ut_utils.gc_success, 'not_'); + --Fails for unsupported data-type + exec_match('number', '12345', '^123.*', 'i', ut3.ut_utils.gc_failure); end; procedure test_be_like is begin - exec_be_like('varchar2(100)', '''Stephen_King''', 'Ste__en%', '', ut3.ut_utils.gc_success, ''); - exec_be_like('varchar2(100)', '''Stephen_King''', 'Ste__en\_K%', '\', ut3.ut_utils.gc_success, ''); - exec_be_like('clob', 'rpad(''a'',32767,''a'')||''Stephen_King''', 'a%Ste__en%', '', ut3.ut_utils.gc_success, ''); - exec_be_like('clob', 'rpad(''a'',32767,''a'')||''Stephen_King''', 'a%Ste__en\_K%', '\', ut3.ut_utils.gc_success, ''); + exec_be_like('varchar2(100)', '''Stephen_King''', 'Ste__en%', '', ut3.ut_utils.gc_success); + exec_be_like('varchar2(100)', '''Stephen_King''', 'Ste__en\_K%', '\', ut3.ut_utils.gc_success); + exec_be_like('clob', 'rpad(''a'',32767,''a'')||''Stephen_King''', 'a%Ste__en%', '', ut3.ut_utils.gc_success); + exec_be_like('clob', 'rpad(''a'',32767,''a'')||''Stephen_King''', 'a%Ste__en\_K%', '\', ut3.ut_utils.gc_success); - exec_be_like('varchar2(100)', '''Stephen_King''', 'Ste_en%', '', ut3.ut_utils.gc_failure, ''); - exec_be_like('varchar2(100)', '''Stephen_King''', 'Stephe\__%', '\', ut3.ut_utils.gc_failure, ''); - exec_be_like('clob', 'rpad(''a'',32767,''a'')||''Stephen_King''', 'a%Ste_en%', '', ut3.ut_utils.gc_failure, ''); - exec_be_like('clob', 'rpad(''a'',32767,''a'')||''Stephen_King''', 'a%Stephe\__%', '\', ut3.ut_utils.gc_failure, ''); + exec_be_like('varchar2(100)', '''Stephen_King''', 'Ste_en%', '', ut3.ut_utils.gc_failure); + exec_be_like('varchar2(100)', '''Stephen_King''', 'Stephe\__%', '\', ut3.ut_utils.gc_failure); + exec_be_like('clob', 'rpad(''a'',32767,''a'')||''Stephen_King''', 'a%Ste_en%', '', ut3.ut_utils.gc_failure); + exec_be_like('clob', 'rpad(''a'',32767,''a'')||''Stephen_King''', 'a%Stephe\__%', '\', ut3.ut_utils.gc_failure); exec_be_like('varchar2(100)', '''Stephen_King''', 'Ste__en%', '', ut3.ut_utils.gc_failure, 'not_'); exec_be_like('varchar2(100)', '''Stephen_King''', 'Ste__en\_K%', '\', ut3.ut_utils.gc_failure, 'not_'); @@ -228,6 +234,9 @@ create or replace package body test_matchers is exec_be_like('varchar2(100)', '''Stephen_King''', 'Stephe\__%', '\', ut3.ut_utils.gc_success, 'not_'); exec_be_like('clob', 'rpad(''a'',32767,''a'')||''Stephen_King''', 'a%Ste_en%', '', ut3.ut_utils.gc_success, 'not_'); exec_be_like('clob', 'rpad(''a'',32767,''a'')||''Stephen_King''', 'a%Stephe\__%', '\', ut3.ut_utils.gc_success, 'not_'); + + --Fails for unsupported data-type + exec_be_like('number', '12345', '123%', '', ut3.ut_utils.gc_failure); end; procedure test_timestamp_between is diff --git a/test/core/reporters/test_teamcity_reporter.pkb b/test/core/reporters/test_teamcity_reporter.pkb new file mode 100644 index 000000000..e3c05003f --- /dev/null +++ b/test/core/reporters/test_teamcity_reporter.pkb @@ -0,0 +1,52 @@ +create or replace package body test_teamcity_reporter as + + procedure report_produces_expected_out is + l_output_data ut3.ut_varchar2_list; + l_output clob; + l_expected varchar2(32767); + begin + l_expected := q'{%##teamcity[testSuiteStarted timestamp='%' name='utplsqlorg'] +%##teamcity[testSuiteStarted timestamp='%' name='utplsqlorg.helpers'] +%##teamcity[testSuiteStarted timestamp='%' name='utplsqlorg.helpers.tests'] +%##teamcity[testSuiteStarted timestamp='%' name='utplsqlorg.helpers.tests.test'] +%##teamcity[testSuiteStarted timestamp='%' name='utplsqlorg.helpers.tests.test.test_reporters'] +%##teamcity[testSuiteStarted timestamp='%' name='A suite for testing different outcomes from reporters'] +%##teamcity[testStarted timestamp='%' captureStandardOutput='true' name='ut3_tester.test_reporters.passing_test'] + + + + + +%##teamcity[testFinished timestamp='%' duration='%' name='ut3_tester.test_reporters.passing_test'] +%##teamcity[testStarted timestamp='%' captureStandardOutput='true' name='ut3_tester.test_reporters.failing_test'] + + + +%##teamcity[testFailed timestamp='%' message='Fails as values are different' name='ut3_tester.test_reporters.failing_test'] +%##teamcity[testFinished timestamp='%' duration='%' name='ut3_tester.test_reporters.failing_test'] +%##teamcity[testStarted timestamp='%' captureStandardOutput='true' name='ut3_tester.test_reporters.erroring_test'] + + + +%##teamcity[testStdErr timestamp='%' name='ut3_tester.test_reporters.erroring_test' out='Test exception:|rORA-06512: at |"UT3_TESTER.TEST_REPORTERS|", line %|rORA-06512: at %|r|r'] +%##teamcity[testFailed timestamp='%' details='Test exception:|rORA-06512: at |"UT3_TESTER.TEST_REPORTERS|", line %|rORA-06512: at %|r|r' message='Error occured' name='ut3_tester.test_reporters.erroring_test'] +%##teamcity[testFinished timestamp='%' duration='%' name='ut3_tester.test_reporters.erroring_test'] +%##teamcity[testStarted timestamp='%' captureStandardOutput='true' name='ut3_tester.test_reporters.disabled_test'] +%##teamcity[testIgnored timestamp='%' name='ut3_tester.test_reporters.disabled_test'] +%##teamcity[testSuiteFinished timestamp='%' name='A suite for testing different outcomes from reporters'] +%##teamcity[testSuiteFinished timestamp='%' name='utplsqlorg.helpers.tests.test.test_reporters'] +%##teamcity[testSuiteFinished timestamp='%' name='utplsqlorg.helpers.tests.test'] +%##teamcity[testSuiteFinished timestamp='%' name='utplsqlorg.helpers.tests'] +%##teamcity[testSuiteFinished timestamp='%' name='utplsqlorg.helpers'] +%##teamcity[testSuiteFinished timestamp='%' name='utplsqlorg']}'; + --act + select * + bulk collect into l_output_data + from table(ut3.ut.run('test_reporters',ut3.ut_teamcity_reporter())); + + --assert + ut.expect(ut3.ut_utils.table_to_clob(l_output_data)).to_be_like(l_expected); + end; + +end; +/ diff --git a/test/core/reporters/test_teamcity_reporter.pks b/test/core/reporters/test_teamcity_reporter.pks new file mode 100644 index 000000000..277044417 --- /dev/null +++ b/test/core/reporters/test_teamcity_reporter.pks @@ -0,0 +1,10 @@ +create or replace package test_teamcity_reporter as + + --%suite(ut_teamcity_reporter) + --%suitepath(utplsql.core.reporters) + + --%test(Report produces expected output) + procedure report_produces_expected_out; + +end; +/ diff --git a/test/core/test_output_buffer.pks b/test/core/test_output_buffer.pks index 6311d2275..1392b39ad 100644 --- a/test/core/test_output_buffer.pks +++ b/test/core/test_output_buffer.pks @@ -3,7 +3,7 @@ create or replace package test_output_buffer is --%suite(output_buffer) --%suitepath(utplsql.core) - --%test(Recieves a line from buffer table and deletes) + --%test(Receives a line from buffer table and deletes) procedure test_recieve; --%test(Does not send line if null text given) diff --git a/test/core/test_suite_builder.pkb b/test/core/test_suite_builder.pkb index 4b9630194..19ea81aa0 100644 --- a/test/core/test_suite_builder.pkb +++ b/test/core/test_suite_builder.pkb @@ -664,15 +664,15 @@ create or replace package body test_suite_builder is begin --Arrange l_annotations := ut3.ut_annotations( - ut3.ut_annotation(1, 'suite','Cool', null), - ut3.ut_annotation(2, 'test','In suite', 'suite_level_test'), - ut3.ut_annotation(3, 'context','a_context', null), - ut3.ut_annotation(4, 'beforeall',null, 'context_beforeall'), - ut3.ut_annotation(5, 'beforeeach',null, 'context_beforeeach'), + ut3.ut_annotation(1, 'suite', 'Cool', null), + ut3.ut_annotation(2, 'test', 'In suite', 'suite_level_test'), + ut3.ut_annotation(3, 'context', 'a_context', null), + ut3.ut_annotation(4, 'beforeall', 'context_beforeall', null), + ut3.ut_annotation(5, 'beforeeach', null, 'context_beforeeach'), ut3.ut_annotation(6, 'test', 'In context', 'test_in_a_context'), - ut3.ut_annotation(7, 'aftereach',null, 'context_aftereach'), - ut3.ut_annotation(8, 'afterall',null, 'context_afterall'), - ut3.ut_annotation(9, 'endcontext',null, null) + ut3.ut_annotation(7, 'aftereach', 'context_aftereach' ,null), + ut3.ut_annotation(8, 'afterall', null, 'context_afterall'), + ut3.ut_annotation(9, 'endcontext', null, null) ); --Act l_actual := invoke_builder_for_annotations(l_annotations, 'SOME_PACKAGE'); diff --git a/test/core/test_ut_executable.pkb b/test/core/test_ut_executable.pkb new file mode 100644 index 000000000..b5f372c32 --- /dev/null +++ b/test/core/test_ut_executable.pkb @@ -0,0 +1,163 @@ +create or replace package body test_ut_executable is + + g_dbms_output_text varchar2(30) := 'Some output from procedure'; + + procedure exec_schema_package_proc is + l_executable ut3.ut_executable; + l_test ut3.ut_test; + l_result boolean; + begin + --Arrange + l_test := ut3.ut_test(a_object_name => 'test_ut_executable',a_name => 'test_ut_executable'); + l_executable := ut3.ut_executable_test( null, 'test_ut_executable', 'passing_proc', ut3.ut_utils.gc_test_execute ); + --Act + l_result := l_executable.do_execute(l_test); + --Assert + ut.expect(l_result).to_be_true; + ut.expect(l_executable.serveroutput).to_be_null; + ut.expect(l_executable.get_error_stack_trace()).to_be_null; + end; + + procedure exec_package_proc_output is + l_executable ut3.ut_executable; + l_test ut3.ut_test; + l_result boolean; + begin + --Arrange + l_test := ut3.ut_test(a_object_name => 'test_ut_executable',a_name => 'test_ut_executable'); + l_executable := ut3.ut_executable_test( user, 'test_ut_executable', 'output_proc', ut3.ut_utils.gc_test_execute ); + --Act + l_result := l_executable.do_execute(l_test); + --Assert + ut.expect(l_result).to_be_true; + ut.expect(l_executable.serveroutput).to_equal(to_clob(g_dbms_output_text||chr(10))); + ut.expect(l_executable.get_error_stack_trace()).to_be_null; + end; + + procedure exec_failing_proc is + l_executable ut3.ut_executable; + l_test ut3.ut_test; + l_result boolean; + begin + --Arrange + l_test := ut3.ut_test(a_object_name => 'test_ut_executable',a_name => 'test_ut_executable'); + l_executable := ut3.ut_executable_test( user, 'test_ut_executable', 'throwing_proc', ut3.ut_utils.gc_test_execute ); + --Act + l_result := l_executable.do_execute(l_test); + --Assert + ut.expect(l_result).to_be_false; + ut.expect(l_executable.serveroutput).to_be_null; + ut.expect(l_executable.get_error_stack_trace()).to_be_like('ORA-06501: PL/SQL: program error%'); + end; + + procedure create_state_dependant_pkg is + pragma autonomous_transaction; + begin + execute immediate q'[ + create or replace package stateful_package as + g_state varchar2(1) := 'A'; + end; + ]'; + execute immediate q'[ + create or replace package state_dependant_pkg as + procedure run; + end; + ]'; + execute immediate q'[ + create or replace package body state_dependant_pkg as + procedure run is + x varchar2(30); + begin + if stateful_package.g_state = 'A' then + dbms_output.put_line('stateful_package.g_state = "A"'); + end if; + end; + end; + ]'; + end; + + procedure modify_stateful_package is + l_job_name varchar2(30) := 'recreate_stateful_package'; + l_cnt integer := 1; + pragma autonomous_transaction; + begin + dbms_scheduler.create_job( + job_name => l_job_name, + job_type => 'PLSQL_BLOCK', + job_action => q'/ + begin + execute immediate q'[ + create or replace package stateful_package as + g_state varchar2(3) := 'abc'; + end;]'; + end;/', + start_date => localtimestamp, + enabled => TRUE, + auto_drop => TRUE, + comments => 'one-time job' + ); + dbms_lock.sleep(0.4); + while l_cnt > 0 loop + select count(1) into l_cnt + from dba_scheduler_running_jobs srj + where srj.job_name = l_job_name; + end loop; + end; + + procedure drop_state_dependant_pkg is + pragma autonomous_transaction; + begin + execute immediate 'drop package state_dependant_pkg'; + execute immediate 'drop package stateful_package'; + end; + + + procedure exec_invalid_state_proc is + l_executable ut3.ut_executable; + l_test ut3.ut_test; + l_result boolean; + begin + --Arrange + l_test := ut3.ut_test(a_object_name => 'state_dependant_pkg',a_name => 'state_dependant_pkg'); + l_executable := ut3.ut_executable_test( user, 'state_dependant_pkg', 'run', ut3.ut_utils.gc_test_execute ); + l_result := l_executable.do_execute(l_test); + ut.expect(l_result).to_be_true; + + modify_stateful_package; + + l_test := ut3.ut_test(a_object_name => 'state_dependant_pkg',a_name => 'state_dependant_pkg'); + l_executable := ut3.ut_executable_test( user, 'state_dependant_pkg', 'run', ut3.ut_utils.gc_test_execute ); + --Act + l_result := l_executable.do_execute(l_test); + --Assert + ut.expect(l_result).to_be_false; + ut.expect(l_executable.serveroutput).to_be_null; + ut.expect(l_executable.get_error_stack_trace()).to_be_like('ORA-04061: existing state of package "UT3_TESTER.STATEFUL_PACKAGE" has been invalidated%'); + ut.expect(ut3.ut_expectation_processor.invalidation_exception_found()).to_be_true; + end; + + procedure form_name is + begin + ut.expect(ut3.ut_executable_test( user, 'package', 'proc', null ).form_name()).to_equal(user||'.package.proc'); + ut.expect(ut3.ut_executable_test( null, 'package', 'proc', null ).form_name()).to_equal('package.proc'); + ut.expect(ut3.ut_executable_test( null, 'proc', null, null ).form_name()).to_equal('proc'); + ut.expect(ut3.ut_executable_test( user, 'proc', null, null ).form_name()).to_equal(user||'.proc'); + end; + + procedure passing_proc is + begin + null; + end; + + procedure output_proc is + begin + dbms_output.put_line(g_dbms_output_text); + end; + + procedure throwing_proc is + begin + raise program_error; + end; + +end; +/ diff --git a/test/core/test_ut_executable.pks b/test/core/test_ut_executable.pks new file mode 100644 index 000000000..51641ecbf --- /dev/null +++ b/test/core/test_ut_executable.pks @@ -0,0 +1,41 @@ +create or replace package test_ut_executable is + + --%suite(ut_executable) + --%suitepath(utplsql.core) + + --%context(do_execute) + + --%test(Executes procedure in current schema when user was not provided) + procedure exec_schema_package_proc; + + --%test(Executes procedure and saves dbms_output) + procedure exec_package_proc_output; + + --%test(Executes a procedure raising exception, saves dbms_output and exception stack trace) + procedure exec_failing_proc; + + --%test(Sets state invalid flag when package-state invalidated and saves exception stack trace) + --%beforetest(create_state_dependant_pkg) + --%aftertest(drop_state_dependant_pkg) + procedure exec_invalid_state_proc; + + procedure create_state_dependant_pkg; + procedure drop_state_dependant_pkg; + + --%endcontext + + --%context(form_name) + + --%test(Builds a name for the executable test) + procedure form_name; + + --%endcontext + + procedure passing_proc; + + procedure output_proc; + + procedure throwing_proc; + +end; +/ diff --git a/test/install_tests.sql b/test/install_tests.sql index 1640c6794..e0a5d6d9f 100644 --- a/test/install_tests.sql +++ b/test/install_tests.sql @@ -23,10 +23,12 @@ whenever oserror exit failure rollback @@core/annotations/test_annotation_parser.pks @@core/annotations/test_annotation_manager.pks @@core/annotations/test_before_after_test_annotation.pks +@@core/expectations/test_expectation_processor.pks @@core/expectations/test_matchers.pks @@core/test_output_buffer.pks @@core/test_file_mapper.pks @@core/test_suite_manager.pks +@@core/test_ut_executable.pks @@core/test_suite_builder.pks @@core/reporters.pks @@core/reporters/test_coverage.pks @@ -43,6 +45,7 @@ set define on set define off @@core/reporters/test_tfs_junit_reporter.pks @@core/reporters/test_sonar_test_reporter.pks +@@core/reporters/test_teamcity_reporter.pks @@core/expectations.pks @@core/expectations/binary/test_be_greater_or_equal.pks @@core/expectations/binary/test_be_greater_than.pks @@ -67,11 +70,13 @@ set define off @@core/test_ut_test.pkb @@core/annotations/test_annotation_parser.pkb @@core/annotations/test_annotation_manager.pkb +@@core/expectations/test_expectation_processor.pkb @@core/expectations/test_matchers.pkb @@core/annotations/test_before_after_test_annotation.pkb @@core/test_output_buffer.pkb @@core/test_file_mapper.pkb @@core/test_suite_manager.pkb +@@core/test_ut_executable.pkb @@core/test_suite_builder.pkb @@core/reporters.pkb @@core/reporters/test_coverage.pkb @@ -88,6 +93,7 @@ set define on set define off @@core/reporters/test_tfs_junit_reporter.pkb @@core/reporters/test_sonar_test_reporter.pkb +@@core/reporters/test_teamcity_reporter.pkb @@core/expectations.pkb @@core/expectations/binary/test_be_greater_or_equal.pkb @@core/expectations/binary/test_be_greater_than.pkb