Updating pgtap functions based on executions

Author: cvvergara

pgtap/dijkstra/dijkstraVia/edge_cases/issue-3110.pg

@@ -12,9 +12,9 @@ CREATE OR REPLACE FUNCTION test_function()
 RETURNS SETOF TEXT AS
 $BODY$
 BEGIN
-  IF NOT min_version('4.0.1') THEN
+  IF NOT min_lib_version('4.0.2') THEN
     RETURN query
-    SELECT skip(1, 'bad alloc error Fixed on 4.0.1');
+    SELECT skip(1, 'bad alloc error Fixed on 4.0.2');
     RETURN;
   END IF;
 

pgtap/standards/negative_distance_throws.pg

@@ -44,24 +44,52 @@ DECLARE
   stmt TEXT = 'SELECT * FROM pgr_drivingDistance';
 BEGIN
 
-  RAISE NOTICE '%', stmt;
   IF min_lib_version('4.0.2') THEN
     RETURN QUERY
     SELECT throws_ok(stmt || $$('edges', 1, -3.5)$$);
 
     RETURN QUERY
     SELECT throws_ok(stmt || $$('edges', 1, -3.5)$$,
     'XX000', $$Negative value found on 'distance'$$, fn || ': Negative distance throws');
-  ELSE
+
+    RETURN QUERY
+    SELECT lives_ok(stmt || $$('edges', 1, 0)$$, fn || ': 0 is ok');
+
+  ELSEIF min_version('4.0.0') THEN
+
     RETURN QUERY
     SELECT lives_ok(stmt || $$('edges', 1, -3.5)$$, 'Silently ignores negative values');
 
     RETURN QUERY
     SELECT lives_ok(stmt || $$('edges', 1, -3.5)$$, 'Silently ignores negative values');
+
+    RETURN QUERY
+    SELECT lives_ok(stmt || $$('edges', 1, 0)$$, fn || ': 0 is ok');
+
+  ELSEIF min_version('3.7.0') THEN
+
+    RETURN QUERY
+    SELECT lives_ok(stmt || $$('edges', 1, -3.5)$$, 'Silently ignores negative values');
+
+    RETURN QUERY
+    SELECT lives_ok(stmt || $$('edges', 1, -3.5)$$, 'Silently ignores negative values');
+
+    RETURN QUERY
+    SELECT lives_ok(stmt || $$('edges', 1, 0)$$, fn || ': 0 is ok');
+
+  ELSE
+
+    RETURN QUERY
+    SELECT lives_ok(stmt || $$('edges', 1, -3.5)$$);
+
+    RETURN QUERY
+    SELECT lives_ok(stmt || $$('edges', 1, -3.5)$$);
+
+    RETURN QUERY
+    SELECT lives_ok(stmt || $$('edges', 1, 0)$$);
+
   END IF;
 
-  RETURN QUERY
-  SELECT lives_ok(stmt || $$('edges', 1, 0)$$, fn || ': 0 is ok');
 END;
 $BODY$
 LANGUAGE plpgsql;
@@ -74,8 +102,8 @@ DECLARE
 BEGIN
 
   IF min_lib_version('4.0.2') THEN
-
     -- v4.0.2+: distance < 0, standardized message
+
     RETURN QUERY
     SELECT throws_ok(stmt || $$('edges', 'points', 1, -3.5)$$);
 
@@ -88,6 +116,7 @@ BEGIN
 
   ELSIF min_lib_version('4.0.0') THEN
     -- v4.0.0-v4.0.1: distance <= 0, different message, distance=0 also throws
+
     RETURN QUERY
     SELECT throws_ok(stmt || $$('edges', 'points', 1, -3.5)$$);
 
@@ -96,7 +125,7 @@ BEGIN
     'XX000', $$Invalid value of 'distance'$$, fn || ': Negative distance throws');
 
     RETURN QUERY
-    SELECT throws_ok(stmt || $$('edges', 'points', 1, 0)$$, fn || ': 0 throws too');
+    SELECT throws_ok(stmt || $$('edges', 'points', 1, 0)$$);
 
   ELSE
     -- v3.0.0-v3.8.0: no check
@@ -120,7 +149,6 @@ DECLARE
   stmt TEXT = 'SELECT * FROM ' || fn;
 BEGIN
 
-  RAISE NOTICE '%', stmt;
   RETURN QUERY
   SELECT throws_ok(stmt || $$('edges', 1, -3.5)$$);
 
@@ -156,10 +184,11 @@ BEGIN
   PREPARE points AS
   SELECT pid, edge_id, fraction, side from pointsOfInterest;
 
-  RETURN QUERY SELECT test_DD();
   RETURN QUERY SELECT test_mst('pgr_primDD');
   RETURN QUERY SELECT test_mst('pgr_kruskalDD');
+  RETURN QUERY SELECT test_DD();
   RETURN QUERY SELECT test_withPDD();
+
 END;
 $BODY$
 LANGUAGE plpgsql;

pgtap/withPoints/withPointsVia/edge_cases/issue-3110.pg

@@ -5,18 +5,20 @@
 BEGIN;
 SET client_min_messages TO WARNING;
 
-SELECT CASE WHEN min_version('4.0.1') THEN plan(8) ELSE plan(1) END;
+SELECT CASE WHEN min_version('4.0.1') THEN plan(8) ELSE plan(8) END;
 
 
 CREATE OR REPLACE FUNCTION test_function()
 RETURNS SETOF TEXT AS
 $BODY$
 BEGIN
+  /*
   IF NOT min_version('4.0.1') THEN
     RETURN query
     SELECT skip(1, 'bad alloc error Fixed on 4.0.1');
     RETURN;
   END IF;
+ */
 
   PREPARE edges AS
   SELECT *
@@ -34,31 +36,31 @@ BEGIN
   ) AS t(pid, edge_id, fraction);
 
   RETURN QUERY
-  SELECT lives_ok($$SELECT * FROM pgr_withPointsVia('edges', 'points', ARRAY[1, 3, 4], 'r')$$,
+  SELECT lives_ok($$SELECT * FROM pgr_withPointsVia('edges', 'points', ARRAY[1, 3, 4])$$,
     'withPointsVia lives when all via vertices exist in the graph');
   RETURN QUERY
-  SELECT isnt_empty($$SELECT * FROM pgr_withPointsVia('edges', 'points', ARRAY[1, 3, 4], 'r')$$,
+  SELECT isnt_empty($$SELECT * FROM pgr_withPointsVia('edges', 'points', ARRAY[1, 3, 4])$$,
     'withPointsVia returns results when all via vertices exist in the graph');
 
   RETURN QUERY
-  SELECT lives_ok($$SELECT * FROM pgr_withPointsVia('edges', 'points', ARRAY[1, 3, 5], 'r')$$,
+  SELECT lives_ok($$SELECT * FROM pgr_withPointsVia('edges', 'points', ARRAY[1, 3, 5])$$,
     'withPointsVia lives when a via vertex does not exist in the graph');
   RETURN QUERY
-  SELECT isnt_empty($$SELECT * FROM pgr_withPointsVia('edges', 'points', ARRAY[1, 3, 5], 'r')$$,
+  SELECT isnt_empty($$SELECT * FROM pgr_withPointsVia('edges', 'points', ARRAY[1, 3, 5])$$,
     'withPointsVia returns results when a via vertex does not exist in the graph');
 
   RETURN QUERY
-  SELECT lives_ok($$SELECT * FROM pgr_withPointsVia('edges', 'points', ARRAY[1, 5, 4], 'r')$$,
+  SELECT lives_ok($$SELECT * FROM pgr_withPointsVia('edges', 'points', ARRAY[1, 5, 4])$$,
     'withPointsVia handles via vertex missing between two valid vertices');
   RETURN QUERY
-  SELECT is_empty($$SELECT * FROM pgr_withPointsVia('edges', 'points', ARRAY[1, 5, 4], 'r');$$,
+  SELECT is_empty($$SELECT * FROM pgr_withPointsVia('edges', 'points', ARRAY[1, 5, 4]);$$,
     'withPointsVia returns empty when via vertex missing between two valid vertices');
 
   RETURN QUERY
-  SELECT lives_ok($$SELECT * FROM pgr_withPointsVia('edges', 'points', ARRAY[1, -1, 4], 'r')$$,
+  SELECT lives_ok($$SELECT * FROM pgr_withPointsVia('edges', 'points', ARRAY[1, -1, 4])$$,
     'withPointsVia lives when via includes a point pid that exists');
   RETURN QUERY
-  SELECT isnt_empty($$SELECT * FROM pgr_withPointsVia('edges', 'points', ARRAY[1, -1, 4], 'r')$$,
+  SELECT isnt_empty($$SELECT * FROM pgr_withPointsVia('edges', 'points', ARRAY[1, -1, 4])$$,
     'withPointsVia returns results when via includes a point pid that exists');
 END
 $BODY$