From 09cad44fd32433629387f67281c84e6b9715cf52 Mon Sep 17 00:00:00 2001 From: Jacek Date: Wed, 18 Oct 2017 09:46:59 +0100 Subject: [PATCH] Removed overloaded procedures `ut_runner.run` Now there are only two methods to call run: * with `a_source_files` and `a_test_files` * with `a_source_file_mappings` or `a_test_file_mappings` Checked with both clients: `utPLSQL-cli` and `utPLSQL-sql-cli` The change has no impact on client and is just a cleanup operation to remove redundant code. Resolves #478 While reviewing code, fixed failing example (demo_equal_matcher). --- .../demo_equal_matcher.sql | 2 +- ...al.cursor.SupportsSQLandPLSQLdatatypes.sql | 2 +- source/api/ut.pkb | 6 +- source/api/ut_runner.pkb | 79 ------------------- source/api/ut_runner.pks | 38 --------- 5 files changed, 6 insertions(+), 121 deletions(-) diff --git a/examples/demo_of_expectations/demo_equal_matcher.sql b/examples/demo_of_expectations/demo_equal_matcher.sql index fdc438204..0836eeb52 100644 --- a/examples/demo_of_expectations/demo_equal_matcher.sql +++ b/examples/demo_of_expectations/demo_equal_matcher.sql @@ -98,7 +98,7 @@ create or replace package body demo_equal_matcher as l_expected demo_department; l_actual demo_department; begin - ut.expect(anydata.convertObject(l_actual)).to_equal(anydata.convertObject(l_expected),false); + ut.expect(anydata.convertObject(l_actual)).to_equal(anydata.convertObject(l_expected),a_nulls_are_equal => false); end; diff --git a/old_tests/ut_expectations/ut.expect.to_equal.cursor.SupportsSQLandPLSQLdatatypes.sql b/old_tests/ut_expectations/ut.expect.to_equal.cursor.SupportsSQLandPLSQLdatatypes.sql index 3ef820b9b..1b62f7c95 100644 --- a/old_tests/ut_expectations/ut.expect.to_equal.cursor.SupportsSQLandPLSQLdatatypes.sql +++ b/old_tests/ut_expectations/ut.expect.to_equal.cursor.SupportsSQLandPLSQLdatatypes.sql @@ -90,7 +90,7 @@ declare l_result_reporter ut_reporter_base := ut_documentation_reporter(); l_status_reporter ut_reporter_base := utplsql_test_reporter(); begin - ut_runner.run(':org.utplsql.test', ut_reporters(l_result_reporter, l_status_reporter)); + ut_runner.run(ut_varchar2_list(':org.utplsql.test'), ut_reporters(l_result_reporter, l_status_reporter)); select * into :test_result from table(ut_output_buffer.get_lines(l_status_reporter.reporter_id)); if :test_result != ut_utils.tr_success then ut_output_buffer.lines_to_dbms_output(l_result_reporter.reporter_id); diff --git a/source/api/ut.pkb b/source/api/ut.pkb index d439e0759..7d195fcc7 100644 --- a/source/api/ut.pkb +++ b/source/api/ut.pkb @@ -102,7 +102,8 @@ create or replace package body ut is pragma autonomous_transaction; begin ut_runner.run( - a_paths, a_reporter, ut_utils.int_to_boolean(a_color_console), a_coverage_schemes, + a_paths, ut_reporters(coalesce(a_reporter,ut_documentation_reporter())), + ut_utils.int_to_boolean(a_color_console), a_coverage_schemes, a_source_file_mappings, a_test_file_mappings, a_include_objects, a_exclude_objects ); rollback; @@ -116,7 +117,8 @@ create or replace package body ut is pragma autonomous_transaction; begin ut_runner.run( - a_paths, a_reporter, ut_utils.int_to_boolean(a_color_console), a_coverage_schemes, + a_paths, ut_reporters(coalesce(a_reporter,ut_documentation_reporter())), + ut_utils.int_to_boolean(a_color_console), a_coverage_schemes, a_source_files, a_test_files, a_include_objects, a_exclude_objects ); rollback; diff --git a/source/api/ut_runner.pkb b/source/api/ut_runner.pkb index 6f0a22e41..e5574c62f 100644 --- a/source/api/ut_runner.pkb +++ b/source/api/ut_runner.pkb @@ -119,84 +119,5 @@ create or replace package body ut_runner is ); end; - procedure run( - a_paths ut_varchar2_list, a_reporter ut_reporter_base := null, a_color_console boolean := false, - a_coverage_schemes ut_varchar2_list := null, a_source_file_mappings ut_file_mappings := null, a_test_file_mappings ut_file_mappings := null, - a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null, a_fail_on_errors boolean default false - ) is - begin - run( - a_paths, ut_reporters(coalesce(a_reporter,ut_documentation_reporter())), - a_color_console, a_coverage_schemes, a_source_file_mappings, a_test_file_mappings, - a_include_objects, a_exclude_objects, a_fail_on_errors - ); - end; - - procedure run( - a_paths ut_varchar2_list, a_reporter ut_reporter_base := null, a_color_console boolean := false, - a_coverage_schemes ut_varchar2_list := null, a_source_files ut_varchar2_list, a_test_files ut_varchar2_list, - a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null, a_fail_on_errors boolean default false - ) is - begin - run( - a_paths, ut_reporters(coalesce(a_reporter,ut_documentation_reporter())), - a_color_console, a_coverage_schemes, a_source_files, a_test_files, - a_include_objects, a_exclude_objects, a_fail_on_errors - ); - end; - - - procedure run( - a_path in varchar2, a_reporter ut_reporter_base := null, a_color_console boolean := false, - a_coverage_schemes ut_varchar2_list := null, a_source_file_mappings ut_file_mappings := null, a_test_file_mappings ut_file_mappings := null, - a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null, a_fail_on_errors boolean default false - ) is - begin - run( - ut_varchar2_list(coalesce(a_path, sys_context('userenv', 'current_schema'))), - a_reporter, a_color_console, a_coverage_schemes, a_source_file_mappings, a_test_file_mappings, - a_include_objects, a_exclude_objects, a_fail_on_errors - ); - end run; - - procedure run( - a_path in varchar2, a_reporter ut_reporter_base := null, a_color_console boolean := false, - a_coverage_schemes ut_varchar2_list := null, a_source_files ut_varchar2_list, a_test_files ut_varchar2_list, - a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null, a_fail_on_errors boolean default false - ) is - begin - run( - ut_varchar2_list(coalesce(a_path, sys_context('userenv', 'current_schema'))), - a_reporter, a_color_console, a_coverage_schemes, a_source_files, a_test_files, - a_include_objects, a_exclude_objects, a_fail_on_errors - ); - end run; - - procedure run( - a_path in varchar2, a_reporters in ut_reporters, a_color_console boolean := false, - a_coverage_schemes ut_varchar2_list := null, a_source_file_mappings ut_file_mappings := null, a_test_file_mappings ut_file_mappings := null, - a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null, a_fail_on_errors boolean default false - ) is - begin - run( - ut_varchar2_list(coalesce(a_path, sys_context('userenv', 'current_schema'))), - a_reporters, a_color_console, a_coverage_schemes, a_source_file_mappings, a_test_file_mappings, - a_include_objects, a_exclude_objects, a_fail_on_errors - ); - end run; - - procedure run( - a_path in varchar2, a_reporters in ut_reporters, a_color_console boolean := false, - a_coverage_schemes ut_varchar2_list := null, a_source_files ut_varchar2_list, a_test_files ut_varchar2_list, - a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null, a_fail_on_errors boolean default false - ) is - begin - run( - ut_varchar2_list(coalesce(a_path, sys_context('userenv', 'current_schema'))), - a_reporters, a_color_console, a_coverage_schemes, a_source_files, a_test_files, - a_include_objects, a_exclude_objects, a_fail_on_errors - ); - end run; - end ut_runner; / diff --git a/source/api/ut_runner.pks b/source/api/ut_runner.pks index f794588e7..ceead4ea6 100644 --- a/source/api/ut_runner.pks +++ b/source/api/ut_runner.pks @@ -46,44 +46,6 @@ create or replace package ut_runner authid current_user is * parent setup/teardown procedures */ - procedure run( - a_path varchar2 := null, a_reporter ut_reporter_base := null, a_color_console boolean := false, - a_coverage_schemes ut_varchar2_list := null, a_source_file_mappings ut_file_mappings := null, a_test_file_mappings ut_file_mappings := null, - a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null, a_fail_on_errors boolean default false - ); - - procedure run( - a_path varchar2 := null, a_reporter ut_reporter_base := null, a_color_console boolean := false, - a_coverage_schemes ut_varchar2_list := null, a_source_files ut_varchar2_list, a_test_files ut_varchar2_list, - a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null, a_fail_on_errors boolean default false - ); - - procedure run( - a_path varchar2, a_reporters ut_reporters, a_color_console boolean := false, - a_coverage_schemes ut_varchar2_list := null, a_source_file_mappings ut_file_mappings := null, a_test_file_mappings ut_file_mappings := null, - a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null, a_fail_on_errors boolean default false - ); - - procedure run( - a_path varchar2, a_reporters ut_reporters, a_color_console boolean := false, - a_coverage_schemes ut_varchar2_list := null, a_source_files ut_varchar2_list, a_test_files ut_varchar2_list, - a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null, a_fail_on_errors boolean default false - ); - - -- TODO - implementation to be changed - procedure run( - a_paths ut_varchar2_list, a_reporter ut_reporter_base := null, a_color_console boolean := false, - a_coverage_schemes ut_varchar2_list := null, a_source_file_mappings ut_file_mappings := null, a_test_file_mappings ut_file_mappings := null, - a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null, a_fail_on_errors boolean default false - ); - - procedure run( - a_paths ut_varchar2_list, a_reporter ut_reporter_base := null, a_color_console boolean := false, - a_coverage_schemes ut_varchar2_list := null, a_source_files ut_varchar2_list, a_test_files ut_varchar2_list, - a_include_objects ut_varchar2_list := null, a_exclude_objects ut_varchar2_list := null, a_fail_on_errors boolean default false - ); - - -- TODO - implementation to be changed procedure run( a_paths ut_varchar2_list, a_reporters ut_reporters, a_color_console boolean := false, a_coverage_schemes ut_varchar2_list := null, a_source_file_mappings ut_file_mappings := null, a_test_file_mappings ut_file_mappings := null,