Skip to content

Refining some pgtap tests #2930

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
cvvergara merged 8 commits into from
Jun 27, 2025
Merged

Refining some pgtap tests #2930

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
197202e
(tools) refining single_path_types_check
cvvergara Jun 25, 2025
7933b8a
(tools) creating cost_types_check for cost and costMatrix functions
cvvergara Jun 25, 2025
6877bf9
(tools) Removing obsolete tests for astar and bdastar
cvvergara Jun 26, 2025
197c450
Removing obsolete pseudo test
cvvergara Jun 26, 2025
6774f74
Using refined code single_path_types_check
cvvergara Jun 25, 2025
95c1c37
Using refined code cost_types_check
cvvergara Jun 26, 2025
dc84308
(tools) creating traversal_types_check for mst and dd functions
cvvergara Jun 26, 2025
198e814
Using traversal_types_check
cvvergara Jun 26, 2025
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
58 changes: 0 additions & 58 deletions docqueries/trsp/trsp_vias-any-04.result
View file
Open in desktop

This file was deleted.

5 changes: 4 additions & 1 deletion pgtap/astar/aStarCostMatrix/types_check.pg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,10 @@ BEGIN;

SELECT plan(5);

SELECT astarcostmatrix_types_check('pgr_astarcostmatrix');
SELECT cost_types_check(
'pgr_astarcostmatrix',
'{directed,heuristic,factor,epsilon}'::TEXT[], '{bool,int4,float8,float8}'::TEXT[],
standard_v => '3.0.0');

SELECT finish();
ROLLBACK;
8 changes: 6 additions & 2 deletions pgtap/astar/astar/types_check.pg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

BEGIN;

SELECT plan(13);

SELECT astar_types_check('pgr_astar');
SELECT CASE WHEN min_version('3.6.0') THEN plan(13) WHEN min_version('3.2.0') THEN plan(12) ELSE PLAN(10) END;

SELECT single_path_types_check(
'pgr_astar',
'{directed,heuristic,factor,epsilon}'::TEXT[], '{bool,int4,float8,float8}'::TEXT[],
standard_v => '3.6.0');

SELECT finish();
ROLLBACK;
9 changes: 5 additions & 4 deletions pgtap/astar/astarCost/types_check.pg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

BEGIN;

SET client_min_messages TO WARNING;
SELECT CASE WHEN min_version('3.2.0') THEN plan(13) ELSE PLAN(11) END;

SELECT plan(13);

SELECT astarcost_types_check('pgr_astarcost');
SELECT cost_types_check(
'pgr_astarcost',
'{directed,heuristic,factor,epsilon}'::TEXT[], '{bool,int4,float8,float8}'::TEXT[],
standard_v => '3.0.0');

SELECT finish();
ROLLBACK;
9 changes: 5 additions & 4 deletions pgtap/bdAstar/bdAstar/types_check.pg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

BEGIN;

SET client_min_messages TO WARNING;
SELECT CASE WHEN min_version('3.6.0') THEN plan(13) WHEN min_version('3.2.0') THEN plan(12) ELSE PLAN(10) END;

SELECT plan(13);

SELECT astar_types_check('pgr_bdastar');
SELECT single_path_types_check(
'pgr_bdastar',
'{directed,heuristic,factor,epsilon}'::TEXT[], '{bool,int4,numeric,numeric}'::TEXT[],
standard_v => '3.6.0');

SELECT finish();
ROLLBACK;
9 changes: 5 additions & 4 deletions pgtap/bdAstar/bdAstarCost/types_check.pg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

BEGIN;

SET client_min_messages TO WARNING;
SELECT CASE WHEN min_version('3.2.0') THEN plan(13) ELSE PLAN(11) END;

SELECT plan(13);

SELECT astarcost_types_check('pgr_bdastarcost');
SELECT cost_types_check(
'pgr_bdastarcost',
'{directed,heuristic,factor,epsilon}'::TEXT[], '{bool,int4,numeric,numeric}'::TEXT[],
standard_v => '3.0.0');

SELECT finish();
ROLLBACK;
7 changes: 4 additions & 3 deletions pgtap/bdAstar/bdAstarCostMatrix/types_check.pg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

BEGIN;

SET client_min_messages TO WARNING;

SELECT plan(5);

SELECT astarcostmatrix_types_check('pgr_bdastarcostmatrix');
SELECT cost_types_check(
'pgr_bdastarcostmatrix',
'{directed,heuristic,factor,epsilon}'::TEXT[], '{bool,int4,numeric,numeric}'::TEXT[],
standard_v => '3.0.0');

SELECT finish();
ROLLBACK;
4 changes: 2 additions & 2 deletions pgtap/bdDijkstra/bdDijkstra/types_check.pg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

BEGIN;

SELECT CASE WHEN min_version('3.2.0') THEN plan(13) ELSE PLAN(11) END;
SELECT CASE WHEN min_version('4.0.0') THEN plan(13) WHEN min_version('3.2.0') THEN plan(12) ELSE PLAN(10) END;

SELECT dijkstra_types_check('pgr_bddijkstra');
SELECT single_path_types_check('pgr_bddijkstra', standard_v => '4.0.0');

SELECT finish();
ROLLBACK;
71 changes: 2 additions & 69 deletions pgtap/bdDijkstra/bdDijkstraCost/types_check.pg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,76 +20,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

BEGIN;

SET client_min_messages TO WARNING;
SELECT CASE WHEN min_version('3.2.0') THEN plan(13) ELSE PLAN(11) END;

SELECT plan(13);

SELECT has_function('pgr_bddijkstracost');


SELECT has_function('pgr_bddijkstracost', ARRAY['text','bigint','bigint','boolean']);
SELECT has_function('pgr_bddijkstracost', ARRAY['text','bigint','anyarray','boolean']);
SELECT has_function('pgr_bddijkstracost', ARRAY['text','anyarray','bigint','boolean']);
SELECT has_function('pgr_bddijkstracost', ARRAY['text','anyarray','anyarray','boolean']);

SELECT function_returns('pgr_bddijkstracost', ARRAY['text','bigint','bigint','boolean'],'setof record');
SELECT function_returns('pgr_bddijkstracost', ARRAY['text','bigint','anyarray','boolean'],'setof record');
SELECT function_returns('pgr_bddijkstracost', ARRAY['text','anyarray','bigint','boolean'],'setof record');
SELECT function_returns('pgr_bddijkstracost', ARRAY['text','anyarray','anyarray','boolean'],'setof record');

SELECT CASE
WHEN min_version('3.2.0') THEN
collect_tap(
has_function('pgr_bddijkstracost', ARRAY['text','text','boolean']),
function_returns('pgr_bddijkstracost', ARRAY['text','text','boolean'],'setof record')
)
ELSE
skip(2, 'Combinations signature added on 3.1.0')
END;


SELECT CASE
WHEN min_version('3.2.0') THEN
collect_tap(

function_args_eq('pgr_bddijkstracost',
$$VALUES
('{"","","","directed","start_vid","end_vid","agg_cost"}'::TEXT[]),
('{"","","","directed","start_vid","end_vid","agg_cost"}'::TEXT[]),
('{"","","","directed","start_vid","end_vid","agg_cost"}'::TEXT[]),
('{"","","","directed","start_vid","end_vid","agg_cost"}'::TEXT[]),
('{"","","directed","start_vid","end_vid","agg_cost"}'::TEXT[])
$$),

function_types_eq('pgr_bddijkstracost',
$$VALUES
('{text,text,bool,int8,int8,float8}'::TEXT[]),
('{text,int8,int8,bool,int8,int8,float8}'::TEXT[]),
('{text,int8,anyarray,bool,int8,int8,float8}'::TEXT[]),
('{text,anyarray,int8,bool,int8,int8,float8}'::TEXT[]),
('{text,anyarray,anyarray,bool,int8,int8,float8}'::TEXT[])
$$)
)
ELSE
collect_tap(

function_args_eq('pgr_bddijkstracost',
$$VALUES
('{"","","","directed","start_vid","end_vid","agg_cost"}'::TEXT[]),
('{"","","","directed","start_vid","end_vid","agg_cost"}'::TEXT[]),
('{"","","","directed","start_vid","end_vid","agg_cost"}'::TEXT[]),
('{"","","","directed","start_vid","end_vid","agg_cost"}'::TEXT[])
$$),

function_types_eq('pgr_bddijkstracost',
$$VALUES
('{text,int8,int8,bool,int8,int8,float8}'::TEXT[]),
('{text,int8,anyarray,bool,int8,int8,float8}'::TEXT[]),
('{text,anyarray,int8,bool,int8,int8,float8}'::TEXT[]),
('{text,anyarray,anyarray,bool,int8,int8,float8}'::TEXT[])
$$)
)
END;
SELECT cost_types_check('pgr_bddijkstracost');

SELECT finish();
ROLLBACK;
14 changes: 1 addition & 13 deletions pgtap/bdDijkstra/bdDijkstraCostMatrix/types_check.pg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,7 @@ BEGIN;

SELECT plan(5);

SELECT has_function('pgr_bddijkstracostmatrix');
SELECT has_function('pgr_bddijkstracostmatrix', ARRAY['text','anyarray','boolean']);
SELECT function_returns('pgr_bddijkstracostmatrix', ARRAY['text','anyarray','boolean'],'setof record');

SELECT function_args_eq('pgr_bddijkstracostmatrix',
$$VALUES
('{"","","directed","start_vid","end_vid","agg_cost"}'::TEXT[])
$$);

SELECT function_types_eq('pgr_bddijkstracostmatrix',
$$VALUES
('{text,anyarray,bool,int8,int8,float8}'::TEXT[])
$$);
SELECT cost_types_check('pgr_bddijkstracostmatrix');

SELECT finish();
ROLLBACK;
2 changes: 1 addition & 1 deletion pgtap/bellman_ford/bellman_ford/types_check.pg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
********************************************************************PGR-GNU*/
BEGIN;

SELECT CASE WHEN min_version('4.0.0') THEN plan(13) ELSE PLAN(2) END;
SELECT CASE WHEN min_version('4.0.0') THEN plan(13) WHEN min_version('3.2.0') THEN plan(12) ELSE PLAN(10) END;

SELECT single_path_types_check('pgr_bellmanford', standard_v => '4.0.0');

Expand Down
2 changes: 1 addition & 1 deletion pgtap/bellman_ford/edwardMoore/types_check.pg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
********************************************************************PGR-GNU*/
BEGIN;

SELECT CASE WHEN min_version('4.0.0') THEN plan(13) ELSE PLAN(2) END;
SELECT CASE WHEN min_version('4.0.0') THEN plan(13) WHEN min_version('3.2.0') THEN plan(12) ELSE PLAN(10) END;

SELECT single_path_types_check('pgr_edwardmoore', standard_v => '4.0.0');

Expand Down
4 changes: 2 additions & 2 deletions pgtap/dijkstra/dijkstra/types_check.pg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

BEGIN;

SELECT CASE WHEN min_version('3.1.0') THEN plan(13) ELSE PLAN(11) END;
SELECT CASE WHEN min_version('3.5.0') THEN plan(13) WHEN min_version('3.2.0') THEN plan(12) ELSE PLAN(10) END;

SELECT dijkstra_types_check('pgr_dijkstra');
SELECT single_path_types_check('pgr_dijkstra', standard_v => '3.5.0');

SELECT finish();
ROLLBACK;
69 changes: 2 additions & 67 deletions pgtap/dijkstra/dijkstraCost/types_check.pg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,74 +20,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

BEGIN;

SET client_min_messages TO WARNING;
SELECT CASE WHEN min_version('3.2.0') THEN plan(13) ELSE PLAN(11) END;

SELECT plan(13);

SELECT has_function('pgr_dijkstracost');


SELECT has_function('pgr_dijkstracost', ARRAY['text','bigint','bigint','boolean']);
SELECT has_function('pgr_dijkstracost', ARRAY['text','bigint','anyarray','boolean']);
SELECT has_function('pgr_dijkstracost', ARRAY['text','anyarray','bigint','boolean']);
SELECT has_function('pgr_dijkstracost', ARRAY['text','anyarray','anyarray','boolean']);

SELECT function_returns('pgr_dijkstracost', ARRAY['text','bigint','bigint','boolean'],'setof record');
SELECT function_returns('pgr_dijkstracost', ARRAY['text','bigint','anyarray','boolean'],'setof record');
SELECT function_returns('pgr_dijkstracost', ARRAY['text','anyarray','bigint','boolean'],'setof record');
SELECT function_returns('pgr_dijkstracost', ARRAY['text','anyarray','anyarray','boolean'],'setof record');

SELECT CASE
WHEN min_version('3.1.0') THEN
collect_tap(
has_function('pgr_dijkstracost', ARRAY['text','text','boolean']),
function_returns('pgr_dijkstracost', ARRAY['text','text','boolean'],'setof record')
)
ELSE
skip(2, 'Combinations signature added on 3.1.0')
END;


SELECT CASE
WHEN min_version('3.1.0') THEN
collect_tap(

function_args_eq('pgr_dijkstracost',
$$VALUES
('{"","","","directed","start_vid","end_vid","agg_cost"}'::TEXT[]),
('{"","","","directed","start_vid","end_vid","agg_cost"}'::TEXT[]),
('{"","","","directed","start_vid","end_vid","agg_cost"}'::TEXT[]),
('{"","","","directed","start_vid","end_vid","agg_cost"}'::TEXT[]),
('{"","","directed","start_vid","end_vid","agg_cost"}'::TEXT[])
$$),
function_types_eq('pgr_dijkstracost',
$$VALUES
('{text,text,bool,int8,int8,float8}'::TEXT[]),
('{text,int8,int8,bool,int8,int8,float8}'::TEXT[]),
('{text,int8,anyarray,bool,int8,int8,float8}'::TEXT[]),
('{text,anyarray,int8,bool,int8,int8,float8}'::TEXT[]),
('{text,anyarray,anyarray,bool,int8,int8,float8}'::TEXT[])
$$)
)
ELSE
collect_tap(

function_args_eq('pgr_dijkstracost',
$$VALUES
('{"","","","directed","start_vid","end_vid","agg_cost"}'::TEXT[]),
('{"","","","directed","start_vid","end_vid","agg_cost"}'::TEXT[]),
('{"","","","directed","start_vid","end_vid","agg_cost"}'::TEXT[]),
('{"","","","directed","start_vid","end_vid","agg_cost"}'::TEXT[])
$$),
function_types_eq('pgr_dijkstracost',
$$VALUES
('{text,int8,int8,bool,int8,int8,float8}'::TEXT[]),
('{text,int8,anyarray,bool,int8,int8,float8}'::TEXT[]),
('{text,anyarray,int8,bool,int8,int8,float8}'::TEXT[]),
('{text,anyarray,anyarray,bool,int8,int8,float8}'::TEXT[])
$$)
)
END;
SELECT cost_types_check('pgr_dijkstracost');

SELECT finish();
ROLLBACK;
17 changes: 3 additions & 14 deletions pgtap/dijkstra/dijkstraCostMatrix/types_check.pg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,23 +17,12 @@ You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
********************************************************************PGR-GNU*/
BEGIN;

SELECT plan(5);

SELECT has_function('pgr_dijkstracostmatrix');
SELECT has_function('pgr_dijkstracostmatrix', ARRAY['text','anyarray','boolean']);
SELECT function_returns('pgr_dijkstracostmatrix', ARRAY['text','anyarray','boolean'],'setof record');
BEGIN;

SELECT function_args_eq('pgr_dijkstracostmatrix',
$$VALUES
('{"","","directed","start_vid","end_vid","agg_cost"}'::TEXT[])
$$);
SELECT PLAN(5) END;

SELECT function_types_eq('pgr_dijkstracostmatrix',
$$VALUES
('{text,anyarray,bool,int8,int8,float8}'::TEXT[])
$$);
SELECT cost_types_check('pgr_dijkstracostmatrix');

SELECT finish();
ROLLBACK;
Loading