Skip to content

Feature/rework matcher #1076

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 37 commits into from
Feb 4, 2022
Merged

Feature/rework matcher #1076

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
48abf1a
Initial checkin
lwasylow Jun 1, 2020
7041912
added expectation
lwasylow Jun 2, 2020
13d86b6
Adding more methods
lwasylow Jun 2, 2020
caeeb30
Adding contain and not contain
lwasylow Jun 2, 2020
8ff4f6b
Adding code and tests,.
lwasylow Jun 6, 2020
89cb0bc
Fixingtoo long names
lwasylow Jun 6, 2020
a5481ac
fixing issue
lwasylow Jun 6, 2020
9ee0e75
Update documentation and tests
lwasylow Jun 7, 2020
a660208
First code corrections
lwasylow Jun 14, 2020
ada1ea4
Resolving another comment
lwasylow Jun 14, 2020
fe1b0cb
Updating issues
lwasylow Jun 14, 2020
013db74
Update tble
lwasylow Jun 14, 2020
b5c73b4
Separated into two different matchers
jgebal Jun 19, 2020
2e721da
CHECKPOINT
lwasylow Jun 19, 2020
fbc0f26
Merge branch 'feature/rework_matcher' of https://github.com/utPLSQL/u…
lwasylow Jun 19, 2020
f182430
Update uninstall
lwasylow Jun 19, 2020
e3fb2d7
Update progress
lwasylow Jun 19, 2020
322e0a1
Making code a bit more readable
lwasylow Jun 19, 2020
ff15596
Added tests for `be_within_pct`
jgebal Jun 20, 2020
3cae9a2
Fixed test issue
jgebal Jun 20, 2020
22549db
Fixed stacktrace for failed expectations on chained matchers.
jgebal Jun 21, 2020
1d771a5
Update timestamps
lwasylow Jun 25, 2020
363c333
Fixed and simplified matcher
jgebal Jun 27, 2020
0ea8925
Fixed native dynamic SQL types compatibility for 11g
jgebal Jun 28, 2020
7c01afb
Fixed native dynamic SQL types compatibility for 11g
jgebal Jun 28, 2020
66d92fc
Merge branch 'develop' into feature/rework_matcher
jgebal Jan 28, 2022
590fb38
Improving test stability (flaky tests)
jgebal Jan 28, 2022
5e2642a
Removing reference to ut3_develop schema.
jgebal Jan 28, 2022
ed06e33
Relaxed sql-injection check to work with 11g2
jgebal Jan 28, 2022
38f3cbc
Fixed issues with comparison of dates&timestamps using interval year-…
jgebal Jan 30, 2022
86e84c8
Improving code coverage.
jgebal Jan 31, 2022
718ac0d
Improved test stability.
jgebal Jan 31, 2022
6dbef20
Fixing build process to build using develop branch as testing framewo…
jgebal Jan 31, 2022
25b55b4
Improving test coverage.
jgebal Jan 31, 2022
5b5a5c0
Improving matcher documentation
jgebal Jan 31, 2022
7fec0f9
Added tests for 0 value of actual and expected and actual greater tha…
jgebal Feb 2, 2022
fd7ef9c
Fixed issues with precission of distance. `NATURAL` is a subtype of i…
jgebal Feb 2, 2022
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
Prev Previous commit
Next Next commit
added expectation
  • Loading branch information
@lwasylow
lwasylow committed Jun 2, 2020
commit 70419127716a0a5e8ad4bad7847f0d16a79af4d7
5 changes: 2 additions & 3 deletions source/expectations/matchers/ut_equal.tpb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,10 +173,9 @@ create or replace type body ut_equal as
end;

member procedure include(self in ut_equal, a_items varchar2) is
--l_result ut_equal := self;
l_result ut_equal := self;
begin
null;
--l_result.expectation.to_(l_result );
l_result.expectation.to_(l_result );
Comment thread
jgebal marked this conversation as resolved.
end;

member function exclude(a_items varchar2) return ut_equal is
Expand Down
4 changes: 2 additions & 2 deletions source/expectations/matchers/ut_equal.tps
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
create or replace type ut_equal force under ut_comparison_matcher(
create or replace type ut_equal under ut_comparison_matcher(
/*
utPLSQL - Version 3
Copyright 2016 - 2019 utPLSQL Project
Expand Down Expand Up @@ -57,4 +57,4 @@ create or replace type ut_equal force under ut_comparison_matcher(
member function uc return ut_equal
)
not final

/
4 changes: 2 additions & 2 deletions source/expectations/matchers/ut_matcher.tps
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
create or replace type ut_matcher force under ut_matcher_base(
create or replace type ut_matcher under ut_matcher_base(
/*
utPLSQL - Version 3
Copyright 2016 - 2019 utPLSQL Project
Expand Down Expand Up @@ -40,4 +40,4 @@ create or replace type ut_matcher force under ut_matcher_base(
member function negated return ut_matcher,
member function is_negated return boolean
) not final not instantiable

/
20 changes: 0 additions & 20 deletions source/expectations/matchers/ut_matcher_base.tpb
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion source/expectations/matchers/ut_matcher_base.tps
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
create or replace type ut_matcher_base force authid current_user as object(
self_type varchar2(250)
)
not final not instantiable
not final not instantiable
/
4 changes: 2 additions & 2 deletions source/expectations/ut_expectation.tps
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
create or replace type ut_expectation force authid current_user as object(
create or replace type ut_expectation authid current_user as object(
/*
utPLSQL - Version 3
Copyright 2016 - 2019 utPLSQL Project
Expand Down Expand Up @@ -172,4 +172,4 @@ create or replace type ut_expectation force authid current_user as object(

)
not final

/
10 changes: 5 additions & 5 deletions source/expectations/ut_expectation_compound.tpb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,12 @@ create or replace type body ut_expectation_compound as
return l_result;
end;

member function to_equal(a_expected sys_refcursor, a_nulls_are_equal boolean := null) return ut_equal is
l_result ut_expectation_compound := self;
member function to_equal(a_expected sys_refcursor, a_nulls_are_equal boolean := null) return ut_equal is
l_result ut_matcher;
begin
l_result.matcher := ut_equal(a_expected, a_nulls_are_equal);
l_result.matcher.expectation := l_result;
return treat(l_result.matcher as ut_equal);
l_result := ut_equal(a_expected, a_nulls_are_equal);
l_result.expectation := self;
return treat(l_result as ut_equal);
end;

member function not_to_equal(a_expected sys_refcursor, a_nulls_are_equal boolean := null) return ut_expectation_compound is
Expand Down
4 changes: 2 additions & 2 deletions source/expectations/ut_expectation_compound.tps
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
create or replace type ut_expectation_compound force under ut_expectation(
create or replace type ut_expectation_compound under ut_expectation(
/*
utPLSQL - Version 3
Copyright 2016 - 2019 utPLSQL Project
Expand Down Expand Up @@ -51,4 +51,4 @@ create or replace type ut_expectation_compound force under ut_expectation(
member function uc return ut_expectation_compound,
member procedure uc(self in ut_expectation_compound)
)

/
3 changes: 2 additions & 1 deletion source/install.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,8 @@ prompt Installing DBMSPLSQL Tables objects into &&ut3_owner schema
@@install_component.sql 'expectations/data_values/ut_data_value_xmltype.tps'
@@install_component.sql 'expectations/data_values/ut_compound_data_helper.pks'
@@install_component.sql 'expectations/data_values/ut_data_value_json.tps'
@@install_component.sql 'expectations/ut_expectation.tps'
@@install_component.sql 'expectations/matchers/ut_matcher_base.tps'
@@install_component.sql 'expectations/matchers/ut_matcher.tps'
@@install_component.sql 'expectations/matchers/ut_comparison_matcher.tps'
@@install_component.sql 'expectations/matchers/ut_be_false.tps'
Expand All @@ -253,7 +255,6 @@ prompt Installing DBMSPLSQL Tables objects into &&ut3_owner schema
@@install_component.sql 'expectations/matchers/ut_be_between.tps'
@@install_component.sql 'expectations/matchers/ut_be_empty.tps'
@@install_component.sql 'expectations/matchers/ut_match.tps'
@@install_component.sql 'expectations/ut_expectation.tps'
@@install_component.sql 'expectations/data_values/ut_json_leaf.tpb'
@@install_component.sql 'expectations/data_values/ut_json_tree_details.tpb'
@@install_component.sql 'expectations/data_values/ut_cursor_column.tpb'
Expand Down