Skip to content

Commit 7288b0a

Browse files
jgebaljgebal
committed
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.
1 parent e448d70 commit 7288b0a

32 files changed

Lines changed: 707 additions & 1442 deletions

‎source/api/ut.pkb‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -24,69 +24,69 @@ create or replace package body ut is
2424
return ut_runner.version();
2525
end;
2626

27-
function expect(a_actual in anydata, a_message varchar2 := null) return ut_expectation_anydata is
27+
function expect(a_actual in anydata, a_message varchar2 := null) return ut_expectation is
2828
begin
29-
return ut_expectation_anydata(ut_data_value_anydata.get_instance(a_actual), a_message);
29+
return ut_expectation(ut_data_value_anydata.get_instance(a_actual), a_message);
3030
end;
3131

32-
function expect(a_actual in blob, a_message varchar2 := null) return ut_expectation_blob is
32+
function expect(a_actual in blob, a_message varchar2 := null) return ut_expectation is
3333
begin
34-
return ut_expectation_blob(ut_data_value_blob(a_actual), a_message);
34+
return ut_expectation(ut_data_value_blob(a_actual), a_message);
3535
end;
3636

37-
function expect(a_actual in boolean, a_message varchar2 := null) return ut_expectation_boolean is
37+
function expect(a_actual in boolean, a_message varchar2 := null) return ut_expectation is
3838
begin
39-
return ut_expectation_boolean(ut_data_value_boolean(a_actual), a_message);
39+
return ut_expectation(ut_data_value_boolean(a_actual), a_message);
4040
end;
4141

42-
function expect(a_actual in clob, a_message varchar2 := null) return ut_expectation_clob is
42+
function expect(a_actual in clob, a_message varchar2 := null) return ut_expectation is
4343
begin
44-
return ut_expectation_clob(ut_data_value_clob(a_actual), a_message);
44+
return ut_expectation(ut_data_value_clob(a_actual), a_message);
4545
end;
4646

47-
function expect(a_actual in date, a_message varchar2 := null) return ut_expectation_date is
47+
function expect(a_actual in date, a_message varchar2 := null) return ut_expectation is
4848
begin
49-
return ut_expectation_date(ut_data_value_date(a_actual), a_message);
49+
return ut_expectation(ut_data_value_date(a_actual), a_message);
5050
end;
5151

52-
function expect(a_actual in number, a_message varchar2 := null) return ut_expectation_number is
52+
function expect(a_actual in number, a_message varchar2 := null) return ut_expectation is
5353
begin
54-
return ut_expectation_number(ut_data_value_number(a_actual), a_message);
54+
return ut_expectation(ut_data_value_number(a_actual), a_message);
5555
end;
5656

57-
function expect(a_actual in timestamp_unconstrained, a_message varchar2 := null) return ut_expectation_timestamp is
57+
function expect(a_actual in timestamp_unconstrained, a_message varchar2 := null) return ut_expectation is
5858
begin
59-
return ut_expectation_timestamp(ut_data_value_timestamp(a_actual), a_message);
59+
return ut_expectation(ut_data_value_timestamp(a_actual), a_message);
6060
end;
6161

62-
function expect(a_actual in timestamp_ltz_unconstrained, a_message varchar2 := null) return ut_expectation_timestamp_ltz is
62+
function expect(a_actual in timestamp_ltz_unconstrained, a_message varchar2 := null) return ut_expectation is
6363
begin
64-
return ut_expectation_timestamp_ltz(ut_data_value_timestamp_ltz(a_actual), a_message);
64+
return ut_expectation(ut_data_value_timestamp_ltz(a_actual), a_message);
6565
end;
6666

67-
function expect(a_actual in timestamp_tz_unconstrained, a_message varchar2 := null) return ut_expectation_timestamp_tz is
67+
function expect(a_actual in timestamp_tz_unconstrained, a_message varchar2 := null) return ut_expectation is
6868
begin
69-
return ut_expectation_timestamp_tz(ut_data_value_timestamp_tz(a_actual), a_message);
69+
return ut_expectation(ut_data_value_timestamp_tz(a_actual), a_message);
7070
end;
7171

72-
function expect(a_actual in varchar2, a_message varchar2 := null) return ut_expectation_varchar2 is
72+
function expect(a_actual in varchar2, a_message varchar2 := null) return ut_expectation is
7373
begin
74-
return ut_expectation_varchar2(ut_data_value_varchar2(a_actual), a_message);
74+
return ut_expectation(ut_data_value_varchar2(a_actual), a_message);
7575
end;
7676

77-
function expect(a_actual in sys_refcursor, a_message varchar2 := null) return ut_expectation_refcursor is
77+
function expect(a_actual in sys_refcursor, a_message varchar2 := null) return ut_expectation is
7878
begin
79-
return ut_expectation_refcursor(ut_data_value_refcursor(a_actual), a_message);
79+
return ut_expectation(ut_data_value_refcursor(a_actual), a_message);
8080
end;
8181

82-
function expect(a_actual in yminterval_unconstrained, a_message varchar2 := null) return ut_expectation_yminterval is
82+
function expect(a_actual in yminterval_unconstrained, a_message varchar2 := null) return ut_expectation is
8383
begin
84-
return ut_expectation_yminterval(ut_data_value_yminterval(a_actual), a_message);
84+
return ut_expectation(ut_data_value_yminterval(a_actual), a_message);
8585
end;
8686

87-
function expect(a_actual in dsinterval_unconstrained, a_message varchar2 := null) return ut_expectation_dsinterval is
87+
function expect(a_actual in dsinterval_unconstrained, a_message varchar2 := null) return ut_expectation is
8888
begin
89-
return ut_expectation_dsinterval(ut_data_value_dsinterval(a_actual), a_message);
89+
return ut_expectation(ut_data_value_dsinterval(a_actual), a_message);
9090
end;
9191

9292
procedure fail(a_message in varchar2) is

‎source/api/ut.pks‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,31 +19,31 @@ create or replace package ut authid current_user as
1919

2020
function version return varchar2;
2121

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

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

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

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

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

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

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

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

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

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

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

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

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

4848
procedure fail(a_message in varchar2);
4949

0 commit comments

Comments
 (0)