fix version, function names and delete return query

Author: bipashabg

pgtap/ordering/sloan/edge_cases.pg

@@ -20,17 +20,17 @@ 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 CASE WHEN NOT min_version('3.4.0') THEN plan(1) ELSE plan(11) END;
+SELECT CASE WHEN NOT min_version('4.0.0') THEN plan(1) ELSE plan(11) END;
 
 
 CREATE OR REPLACE FUNCTION edge_cases()
 RETURNS SETOF TEXT AS
 $BODY$
 BEGIN
 
-IF NOT min_version('3.4.0') THEN
+IF NOT min_version('4.0.0') THEN
   RETURN QUERY
-  SELECT skip(1, 'Function is new on 3.4.0');
+  SELECT skip(1, 'pgr_sloanOrdering is new on 4.0.0');
   RETURN;
 END IF;
 
@@ -41,11 +41,8 @@ SELECT id, source, target, cost, reverse_cost
 FROM edges
 WHERE id > 18;
 
-RETURN QUERY
-SELECT is_empty('q1', 'Graph with 0 edge and 0 vertex');
-
 PREPARE r2 AS
-SELECT * FROM pgr_cuthillMckeeOrdering('q1');
+SELECT * FROM pgr_sloanOrdering('q1');
 
 RETURN QUERY
 SELECT is_empty('r2', 'Graph with 0 edge and 0 vertex -> Empty row is returned');
@@ -62,7 +59,7 @@ SELECT set_eq('q3', $$VALUES (2, 6, 6, -1, 1)$$, 'q3: Graph with one vertex');
 
 PREPARE r4 AS
 SELECT *
-FROM pgr_cuthillMckeeOrdering('q3');
+FROM pgr_sloanOrdering('q3');
 
 RETURN QUERY
 SELECT set_eq('r4', $$VALUES (1, 6)$$, '4: Same node returned');
@@ -80,7 +77,7 @@ SELECT set_eq('q5', $$VALUES (7, 3, 7, 1, 1)$$, 'q5: 3->7');
 
 PREPARE r6 AS
 SELECT *
-FROM pgr_cuthillMckeeOrdering('q5');
+FROM pgr_sloanOrdering('q5');
 
 RETURN QUERY
 SELECT set_eq('r6', $$VALUES (1,3), (2,7)$$, 'Does not matter if 8 comes first or 5');
@@ -108,7 +105,7 @@ SELECT set_eq('q7', $$VALUES (1, 2, 2, -1, 1), (2, 1, 1, 1, -1)$$, 'q7: Graph wi
 
 PREPARE r8 AS
 SELECT *
-FROM pgr_cuthillMckeeOrdering('q7');
+FROM pgr_sloanOrdering('q7');
 
 RETURN QUERY
 SELECT set_eq('r8', $$VALUES (1, 1), (2, 2)$$, 'Showing both vertex of disconnected graph');
@@ -125,7 +122,7 @@ SELECT set_eq('q9', $$VALUES (2, 6, 10, -1, 1), (1, 5, 6, 1, 1)$$, 'q9: Graph wi
 
 PREPARE r10 AS
 SELECT *
-FROM pgr_cuthillMckeeOrdering('q9');
+FROM pgr_sloanOrdering('q9');
 
 RETURN QUERY
 SELECT set_eq('r10', $$VALUES (1, 5), (2, 6), (3, 10)$$, 'Basic test');
@@ -157,7 +154,7 @@ INSERT INTO expected_result (seq, node) VALUES
 (17, 15);
 
 PREPARE q11 AS
-SELECT * FROM pgr_cuthillMckeeOrdering(
+SELECT * FROM pgr_sloanOrdering(
   'SELECT id, source, target, cost, reverse_cost FROM edges');
 
 PREPARE r11 AS