Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Removed ut_expectation sub-types. #494

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jgebal merged 2 commits into from
Oct 17, 2017
Merged

Removed ut_expectation sub-types. #494

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7288b0a
Removed `ut_expectation` sub-types.
jgebal Oct 16, 2017
1c7a1e8
Merge branch 'develop' into feature/expectation_cleanup
jgebal Oct 17, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Removed ut_expectation sub-types. 
Moved all shortcuts directly to `ut_expectation`.
The original design was over-complicated and made it hard to write new code and understand existing code.
With that change, one behavior related to the shortcuts (`to_equal` etc.) will change.
Currently:
- line `ut.expect(1).to_be_empty();` will give compilation error: `PLS-00302: component 'TO_BE_EMPTY' must be declared`
- line `ut.expect(1).to_(be_empty());` will compile successfully and on execution expectation fails with message: `The matcher 'to_be_empty' cannot be used with data type (number).`
After simplification, both will compile and both will make expectation fail.

This change brings simplification to the code-base and improves consistency of the framework.
As a side note,
The failure message from the framework is much more readable and easy to understand than the compilation error from Oracle.
  • Loading branch information
@jgebal
jgebal committed Oct 16, 2017
commit 7288b0a47b2a5ecc80498762122d96e1e5dd0379
52 changes: 26 additions & 26 deletions source/api/ut.pkb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,69 +24,69 @@ create or replace package body ut is
return ut_runner.version();
end;

function expect(a_actual in anydata, a_message varchar2 := null) return ut_expectation_anydata is
function expect(a_actual in anydata, a_message varchar2 := null) return ut_expectation is
begin
return ut_expectation_anydata(ut_data_value_anydata.get_instance(a_actual), a_message);
return ut_expectation(ut_data_value_anydata.get_instance(a_actual), a_message);
end;

function expect(a_actual in blob, a_message varchar2 := null) return ut_expectation_blob is
function expect(a_actual in blob, a_message varchar2 := null) return ut_expectation is
begin
return ut_expectation_blob(ut_data_value_blob(a_actual), a_message);
return ut_expectation(ut_data_value_blob(a_actual), a_message);
end;

function expect(a_actual in boolean, a_message varchar2 := null) return ut_expectation_boolean is
function expect(a_actual in boolean, a_message varchar2 := null) return ut_expectation is
begin
return ut_expectation_boolean(ut_data_value_boolean(a_actual), a_message);
return ut_expectation(ut_data_value_boolean(a_actual), a_message);
end;

function expect(a_actual in clob, a_message varchar2 := null) return ut_expectation_clob is
function expect(a_actual in clob, a_message varchar2 := null) return ut_expectation is
begin
return ut_expectation_clob(ut_data_value_clob(a_actual), a_message);
return ut_expectation(ut_data_value_clob(a_actual), a_message);
end;

function expect(a_actual in date, a_message varchar2 := null) return ut_expectation_date is
function expect(a_actual in date, a_message varchar2 := null) return ut_expectation is
begin
return ut_expectation_date(ut_data_value_date(a_actual), a_message);
return ut_expectation(ut_data_value_date(a_actual), a_message);
end;

function expect(a_actual in number, a_message varchar2 := null) return ut_expectation_number is
function expect(a_actual in number, a_message varchar2 := null) return ut_expectation is
begin
return ut_expectation_number(ut_data_value_number(a_actual), a_message);
return ut_expectation(ut_data_value_number(a_actual), a_message);
end;

function expect(a_actual in timestamp_unconstrained, a_message varchar2 := null) return ut_expectation_timestamp is
function expect(a_actual in timestamp_unconstrained, a_message varchar2 := null) return ut_expectation is
begin
return ut_expectation_timestamp(ut_data_value_timestamp(a_actual), a_message);
return ut_expectation(ut_data_value_timestamp(a_actual), a_message);
end;

function expect(a_actual in timestamp_ltz_unconstrained, a_message varchar2 := null) return ut_expectation_timestamp_ltz is
function expect(a_actual in timestamp_ltz_unconstrained, a_message varchar2 := null) return ut_expectation is
begin
return ut_expectation_timestamp_ltz(ut_data_value_timestamp_ltz(a_actual), a_message);
return ut_expectation(ut_data_value_timestamp_ltz(a_actual), a_message);
end;

function expect(a_actual in timestamp_tz_unconstrained, a_message varchar2 := null) return ut_expectation_timestamp_tz is
function expect(a_actual in timestamp_tz_unconstrained, a_message varchar2 := null) return ut_expectation is
begin
return ut_expectation_timestamp_tz(ut_data_value_timestamp_tz(a_actual), a_message);
return ut_expectation(ut_data_value_timestamp_tz(a_actual), a_message);
end;

function expect(a_actual in varchar2, a_message varchar2 := null) return ut_expectation_varchar2 is
function expect(a_actual in varchar2, a_message varchar2 := null) return ut_expectation is
begin
return ut_expectation_varchar2(ut_data_value_varchar2(a_actual), a_message);
return ut_expectation(ut_data_value_varchar2(a_actual), a_message);
end;

function expect(a_actual in sys_refcursor, a_message varchar2 := null) return ut_expectation_refcursor is
function expect(a_actual in sys_refcursor, a_message varchar2 := null) return ut_expectation is
begin
return ut_expectation_refcursor(ut_data_value_refcursor(a_actual), a_message);
return ut_expectation(ut_data_value_refcursor(a_actual), a_message);
end;

function expect(a_actual in yminterval_unconstrained, a_message varchar2 := null) return ut_expectation_yminterval is
function expect(a_actual in yminterval_unconstrained, a_message varchar2 := null) return ut_expectation is
begin
return ut_expectation_yminterval(ut_data_value_yminterval(a_actual), a_message);
return ut_expectation(ut_data_value_yminterval(a_actual), a_message);
end;

function expect(a_actual in dsinterval_unconstrained, a_message varchar2 := null) return ut_expectation_dsinterval is
function expect(a_actual in dsinterval_unconstrained, a_message varchar2 := null) return ut_expectation is
begin
return ut_expectation_dsinterval(ut_data_value_dsinterval(a_actual), a_message);
return ut_expectation(ut_data_value_dsinterval(a_actual), a_message);
end;

procedure fail(a_message in varchar2) is
Expand Down
26 changes: 13 additions & 13 deletions source/api/ut.pks
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,31 +19,31 @@ create or replace package ut authid current_user as

function version return varchar2;

function expect(a_actual in anydata, a_message varchar2 := null) return ut_expectation_anydata;
function expect(a_actual in anydata, a_message varchar2 := null) return ut_expectation;

function expect(a_actual in blob, a_message varchar2 := null) return ut_expectation_blob;
function expect(a_actual in blob, a_message varchar2 := null) return ut_expectation;

function expect(a_actual in boolean, a_message varchar2 := null) return ut_expectation_boolean;
function expect(a_actual in boolean, a_message varchar2 := null) return ut_expectation;

function expect(a_actual in clob, a_message varchar2 := null) return ut_expectation_clob;
function expect(a_actual in clob, a_message varchar2 := null) return ut_expectation;

function expect(a_actual in date, a_message varchar2 := null) return ut_expectation_date;
function expect(a_actual in date, a_message varchar2 := null) return ut_expectation;

function expect(a_actual in number, a_message varchar2 := null) return ut_expectation_number;
function expect(a_actual in number, a_message varchar2 := null) return ut_expectation;

function expect(a_actual in sys_refcursor, a_message varchar2 := null) return ut_expectation_refcursor;
function expect(a_actual in sys_refcursor, a_message varchar2 := null) return ut_expectation;

function expect(a_actual in timestamp_unconstrained, a_message varchar2 := null) return ut_expectation_timestamp;
function expect(a_actual in timestamp_unconstrained, a_message varchar2 := null) return ut_expectation;

function expect(a_actual in timestamp_ltz_unconstrained, a_message varchar2 := null) return ut_expectation_timestamp_ltz;
function expect(a_actual in timestamp_ltz_unconstrained, a_message varchar2 := null) return ut_expectation;

function expect(a_actual in timestamp_tz_unconstrained, a_message varchar2 := null) return ut_expectation_timestamp_tz;
function expect(a_actual in timestamp_tz_unconstrained, a_message varchar2 := null) return ut_expectation;

function expect(a_actual in varchar2, a_message varchar2 := null) return ut_expectation_varchar2;
function expect(a_actual in varchar2, a_message varchar2 := null) return ut_expectation;

function expect(a_actual in yminterval_unconstrained, a_message varchar2 := null) return ut_expectation_yminterval;
function expect(a_actual in yminterval_unconstrained, a_message varchar2 := null) return ut_expectation;

function expect(a_actual in dsinterval_unconstrained, a_message varchar2 := null) return ut_expectation_dsinterval;
function expect(a_actual in dsinterval_unconstrained, a_message varchar2 := null) return ut_expectation;

procedure fail(a_message in varchar2);

Expand Down
Loading