(pgtap) Using function_returns_geom & cleanup

Author: cvvergara

pgtap/chinese/chinesePostmanCost/types_check.pg

@@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 BEGIN;
 
 UPDATE edges SET cost = sign(cost), reverse_cost = sign(reverse_cost);
-SELECT plan(6);
+SELECT plan(5);
 
 SELECT has_function('pgr_chinesepostmancost');
 SELECT has_function('pgr_chinesepostmancost',    ARRAY['text']);
@@ -30,11 +30,6 @@ SELECT function_args_eq('pgr_chinesepostmancost',
   $$SELECT  NULL::TEXT[] $$
 );
 
-SELECT set_eq(
-  $$SELECT  prorettype from pg_proc where proname = 'pgr_chinesepostmancost'$$,
-  $$SELECT  701 $$
-);
-
 SELECT function_types_eq('pgr_chinesepostmancost',
   $$SELECT  '{text}'::TEXT[] $$
 );

pgtap/max_flow/maxFlow/types_check.pg

@@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 BEGIN;
 
 UPDATE edges SET cost = sign(cost), reverse_cost = sign(reverse_cost);
-SELECT plan(14);
+SELECT plan(13);
 
 SELECT has_function('pgr_maxflow');
 
@@ -47,10 +47,6 @@ END;
 SELECT function_args_eq('pgr_maxflow',
   $$SELECT  NULL::TEXT[] $$);
 
-SELECT set_eq(
-  $$SELECT  prorettype FROM pg_proc WHERE proname = 'pgr_maxflow'$$,
-  $$SELECT  20::OID $$);
-
 SELECT CASE
   WHEN min_version('3.2.0') THEN
 

pgtap/max_flow/maxFlowMinCost_Cost/types_check.pg

@@ -19,7 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  ********************************************************************PGR-GNU*/
 BEGIN;
 
-SELECT plan(14);
+SELECT plan(13);
 
 SELECT has_function('pgr_maxflowmincost_cost');
 
@@ -46,10 +46,6 @@ END;
 SELECT function_args_eq('pgr_maxflowmincost_cost',
   $$SELECT  NULL::TEXT[] $$);
 
-SELECT set_eq(
-  $$SELECT  prorettype FROM pg_proc WHERE proname = 'pgr_maxflowmincost_cost'$$,
-  $$SELECT  701::OID $$);
-
 SELECT CASE
 WHEN min_version('3.2.0') THEN
   function_types_eq('pgr_maxflowmincost_cost',

pgtap/others/alpha_shape/types_check.pg

@@ -26,12 +26,7 @@ SELECT has_function('pgr_alphashape');
 SELECT function_types_eq('pgr_alphashape',
   $$VALUES ('{geometry,float8}'::TEXT[]) $$);
 
-SELECT set_eq(
-  $$WITH a AS (SELECT  prorettype from pg_proc where proname = 'pgr_alphashape')
-  SELECT typname from a JOIN pg_type ON(oid = prorettype)$$,
-  $$VALUES
-    ('geometry')
-  $$);
+SELECT function_returns_geom('pgr_alphashape');
 
 SELECT function_args_eq('pgr_alphashape',
   $$VALUES

pgtap/planar/isPlanar/types_check.pg

@@ -19,7 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  ********************************************************************PGR-GNU*/
 BEGIN;
 
-SELECT CASE WHEN min_version('3.2.0') THEN plan (5) ELSE plan(1) END;
+SELECT CASE WHEN min_version('3.2.0') THEN plan (4) ELSE plan(1) END;
 
 CREATE OR REPLACE FUNCTION types_check()
 RETURNS SETOF TEXT AS
@@ -41,12 +41,6 @@ SELECT function_args_eq('pgr_isplanar',
     $$SELECT  NULL::TEXT[] $$
 );
 
-RETURN QUERY
-SELECT bag_has(
-    $$SELECT  prorettype from pg_proc where proname = 'pgr_isplanar'$$,
-    $$VALUES ( '16'::oid )$$
-);
-
 END;
 $BODY$
 LANGUAGE plpgsql;

pgtap/topology/analyzeGraph/types_check.pg

@@ -19,7 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  ********************************************************************PGR-GNU*/
 BEGIN;
 
-SELECT plan(6);
+SELECT plan(5);
 
 SELECT has_function('pgr_analyzegraph');
 SELECT has_function('pgr_analyzegraph',ARRAY['text','double precision','text','text','text','text','text']);
@@ -34,11 +34,5 @@ SELECT function_types_eq('pgr_analyzegraph',
   $$VALUES ('{text,float8,text,text,text,text,text}'::TEXT[])$$
 );
 
-SELECT set_eq(
-  $$SELECT prorettype FROM pg_proc WHERE proname = 'pgr_analyzegraph'$$,
-  $$VALUES ('1043'::oid )$$
-);
-
-
 SELECT  finish();
 ROLLBACK;

pgtap/topology/analyzeOneWay/types_check.pg

@@ -19,7 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  ********************************************************************PGR-GNU*/
 BEGIN;
 
-SELECT plan(6);
+SELECT plan(5);
 
 SELECT has_function('pgr_analyzeoneway');
 SELECT has_function('pgr_analyzeoneway',ARRAY['text','text[]','text[]','text[]','text[]','boolean','text','text','text']);
@@ -33,11 +33,5 @@ SELECT function_types_eq('pgr_analyzeoneway',
   $$VALUES ('{text,_text,_text,_text,_text,bool,text,text,text}'::TEXT[])$$
 );
 
-SELECT set_eq(
-  $$SELECT prorettype FROM pg_proc WHERE proname = 'pgr_analyzeoneway'$$,
-  $$VALUES ('25'::oid )$$
-);
-
-
 SELECT  finish();
 ROLLBACK;

pgtap/topology/createTopology/types_check.pg

@@ -19,7 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  ********************************************************************PGR-GNU*/
 BEGIN;
 
-SELECT plan(6);
+SELECT plan(5);
 
 SELECT has_function('pgr_createtopology');
 SELECT has_function('pgr_createtopology',ARRAY['text','double precision','text','text','text','text','text','boolean']);
@@ -33,11 +33,5 @@ SELECT function_types_eq('pgr_createtopology',
   $$VALUES ('{text,float8,text,text,text,text,text,bool}'::TEXT[])$$
 );
 
-SELECT set_eq(
-  $$SELECT prorettype FROM pg_proc WHERE proname = 'pgr_createtopology'$$,
-  $$VALUES ('1043'::oid )$$
-);
-
-
 SELECT  finish();
 ROLLBACK;

pgtap/topology/createVerticesTable/types_check.pg

@@ -19,7 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  ********************************************************************PGR-GNU*/
 BEGIN;
 
-SELECT plan(6);
+SELECT plan(5);
 
 SELECT has_function('pgr_createverticestable');
 SELECT has_function('pgr_createverticestable',ARRAY['text','text','text','text','text']);
@@ -33,11 +33,5 @@ SELECT function_types_eq('pgr_createverticestable',
   $$VALUES ('{text,text,text,text,text}'::TEXT[])$$
 );
 
-SELECT set_eq(
-  $$SELECT prorettype FROM pg_proc WHERE proname = 'pgr_createverticestable'$$,
-  $$VALUES ('25'::oid )$$
-);
-
-
 SELECT  finish();
 ROLLBACK;

pgtap/topology/nodeNetwork/types_check.pg

@@ -19,7 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  ********************************************************************PGR-GNU*/
 BEGIN;
 
-SELECT plan(6);
+SELECT plan(5);
 
 SELECT has_function('pgr_nodenetwork');
 SELECT has_function('pgr_nodenetwork',ARRAY['text','double precision','text','text','text','text','boolean']);
@@ -33,10 +33,5 @@ SELECT function_types_eq('pgr_nodenetwork',
   $$VALUES ('{text,float8,text,text,text,text,bool}'::TEXT[])$$
 );
 
-SELECT set_eq(
-  $$SELECT prorettype FROM pg_proc WHERE proname = 'pgr_nodenetwork'$$,
-  $$VALUES ('25'::oid )$$
-);
-
 SELECT  finish();
 ROLLBACK;