Add pgtap tests

src/dijkstraTRSP/test/custom.result

@@ -4,7 +4,7 @@ SET client_min_messages TO NOTICE;
 SET
 SELECT * FROM pgr_dijkstraTRSP(
     'SELECT id, source, target, cost, reverse_cost FROM edge_table WHERE id = 4 OR id = 7',
-    'SELECT * FROM restrict',
+    'SELECT * FROM restrict WHERE id IN (1)',
     2, 8
 );
  seq | path_seq | node | edge | cost | agg_cost
@@ -13,7 +13,7 @@ SELECT * FROM pgr_dijkstraTRSP(
 
 SELECT * FROM pgr_dijkstraTRSP(
     'SELECT id, source, target, cost, reverse_cost FROM edge_table WHERE id = 4 OR id = 7',
-    'SELECT * FROM restrict',
+    'SELECT * FROM restrict WHERE id IN (1)',
     2, 8,
     FALSE
 );

src/dijkstraTRSP/test/custom.test.sql

@@ -1,12 +1,12 @@
 SELECT * FROM pgr_dijkstraTRSP(
     'SELECT id, source, target, cost, reverse_cost FROM edge_table WHERE id = 4 OR id = 7',
-    'SELECT * FROM restrict',
+    'SELECT * FROM restrict WHERE id IN (1)',
     2, 8
 );
 
 SELECT * FROM pgr_dijkstraTRSP(
     'SELECT id, source, target, cost, reverse_cost FROM edge_table WHERE id = 4 OR id = 7',
-    'SELECT * FROM restrict',
+    'SELECT * FROM restrict WHERE id IN (1)',
     2, 8,
     FALSE
 );

src/dijkstraTRSP/test/pgtap/dijkstraTRSP-compare-dijkstra.sql → src/dijkstraTRSP/test/dijkstraTRSP-compare-dijkstra.sql

@@ -1,6 +1,6 @@
 \i setup.sql
 
-SELECT plan(579);
+SELECT plan(1158);
 
 SET client_min_messages TO ERROR;
 
@@ -26,7 +26,7 @@ BEGIN
             dijkstra_sql := 'SELECT * FROM pgr_dijkstra($$' || inner_sql || '$$, ' || i || ', ' || j
                 || ', true)';
 
-            restricted_sql := 'SELECT * FROM restrict';
+            restricted_sql := 'SELECT * FROM restrict WHERE id IN (1)';
             dijkstratrsp_sql := 'SELECT * FROM pgr_dijkstratrsp($$' || inner_sql || '$$, $$' || restricted_sql || '$$, '|| i || ', ' || j
                 || ', true)';
             RETURN query SELECT set_eq(dijkstratrsp_sql, dijkstra_sql, dijkstratrsp_sql);
@@ -36,10 +36,31 @@ BEGIN
             dijkstra_sql := 'SELECT * FROM pgr_dijkstra($$' || inner_sql || '$$, ' || i || ', ' || j
                 || ', false)';
 
+            restricted_sql := 'SELECT * FROM restrict WHERE id in (1)';
+            dijkstratrsp_sql := 'SELECT * FROM pgr_dijkstratrsp($$' || inner_sql || '$$, $$' || restricted_sql || '$$, '|| i || ', ' || j
+                || ', false)';
+            RETURN query SELECT set_eq(dijkstratrsp_sql, dijkstra_sql, dijkstratrsp_sql);
+
+	    -- ALL RESTRICTIONS DIRECTED
+            inner_sql := 'SELECT id, source, target, cost, reverse_cost FROM edge_table';
+            dijkstra_sql := 'SELECT * FROM pgr_dijkstra($$' || inner_sql || '$$, ' || i || ', ' || j
+                || ', true)';
+
+            restricted_sql := 'SELECT * FROM restrict';
+            dijkstratrsp_sql := 'SELECT * FROM pgr_dijkstratrsp($$' || inner_sql || '$$, $$' || restricted_sql || '$$, '|| i || ', ' || j
+                || ', true)';
+            RETURN query SELECT set_eq(dijkstratrsp_sql, dijkstra_sql, dijkstratrsp_sql);
+
+            -- ALL RESTRICTIONS UNDIRECTED
+            inner_sql := 'SELECT id, source, target, cost, reverse_cost FROM edge_table';
+            dijkstra_sql := 'SELECT * FROM pgr_dijkstra($$' || inner_sql || '$$, ' || i || ', ' || j
+                || ', false)';
+
             restricted_sql := 'SELECT * FROM restrict';
             dijkstratrsp_sql := 'SELECT * FROM pgr_dijkstratrsp($$' || inner_sql || '$$, $$' || restricted_sql || '$$, '|| i || ', ' || j
                 || ', false)';
             RETURN query SELECT set_eq(dijkstratrsp_sql, dijkstra_sql, dijkstratrsp_sql);
+
 
         END LOOP;
     END LOOP;

src/dijkstraTRSP/test/doc-dijkstraTRSP.result

@@ -5,7 +5,7 @@ SET
 -- q1
 SELECT * FROM pgr_dijkstraTRSP(
     'SELECT id, source, target, cost, reverse_cost FROM edge_table',
-    'SELECT * FROM restrict',
+    'SELECT * FROM restrict WHERE id IN (1)',
     2, 3
 );
  seq | path_seq | node | edge | cost | agg_cost
@@ -21,7 +21,7 @@ SELECT * FROM pgr_dijkstraTRSP(
 -- q2
 SELECT * FROM pgr_dijkstraTRSP(
     'SELECT id, source, target, cost, reverse_cost FROM edge_table',
-    'SELECT * FROM restrict',
+    'SELECT * FROM restrict WHERE id IN (1)',
     2, 3,
     FALSE
 );

src/dijkstraTRSP/test/doc-dijkstraTRSP.test.sql

@@ -2,14 +2,14 @@
 \echo -- q1
 SELECT * FROM pgr_dijkstraTRSP(
     'SELECT id, source, target, cost, reverse_cost FROM edge_table',
-    'SELECT * FROM restrict',
+    'SELECT * FROM restrict WHERE id IN (1)',
     2, 3
 );
 
 \echo -- q2
 SELECT * FROM pgr_dijkstraTRSP(
     'SELECT id, source, target, cost, reverse_cost FROM edge_table',
-    'SELECT * FROM restrict',
+    'SELECT * FROM restrict WHERE id IN (1)',
     2, 3,
     FALSE
 );

src/dijkstraTRSP/test/pgtap/custom.sql

@@ -0,0 +1,163 @@
+\i setup.sql
+
+SELECT plan(7);
+
+SET client_min_messages TO WARNING;
+
+UPDATE edge_table SET cost = cost + 0.001 * id * id, reverse_cost = reverse_cost + 0.001 * id * id;
+
+SELECT todo_start();
+
+
+PREPARE q1 AS
+SELECT seq,
+       edge
+FROM pgr_dijkstraTRSP('SELECT id, source, target, cost, reverse_cost
+FROM edge_table', 'SELECT * FROM restrict WHERE id in (1)', 2, 8);
+
+PREPARE q2 AS
+SELECT seq, edge FROM ( VALUES
+	(1, 4),
+	(2, 8),
+	(3, 11),
+	(4, 12),
+	(5, 10),
+	(6, 7),
+	(7, -1) )
+AS t(seq, edge);
+
+SELECT set_eq('q1', 'q2', 'Testing from source 2 to target 8 with restriction on edges as follows 4 -> 7');
+
+
+
+PREPARE q3 AS
+SELECT seq,
+       edge
+FROM pgr_dijkstraTRSP('SELECT id, source, target, cost, reverse_cost
+FROM edge_table', 'SELECT * FROM restrict WHERE id in (2)', 8, 11);
+
+PREPARE q4 AS
+SELECT seq, edge FROM ( VALUES
+	(1, 7),
+	(2, 10),
+	(3, 12),
+	(4, -1) )
+AS t(seq, edge);
+
+SELECT set_eq('q3', 'q4', 'Testing from source 8 to target 11 with restriction on edges as follows 7 -> 8 -> 11');
+
+
+
+PREPARE q5 AS
+SELECT seq,
+       edge
+FROM pgr_dijkstraTRSP('SELECT id, source, target, cost, reverse_cost
+FROM edge_table', 'SELECT * FROM restrict WHERE id in (2, 3)', 7, 3);
+
+PREPARE q6 AS
+SELECT seq, edge FROM ( VALUES
+	(1, 6),
+	(2, 7),
+	(3, 8),
+	(4, 9),
+	(5, 16),
+	(6, 3),
+	(7, -1) )
+AS t(seq, edge);
+
+SELECT set_eq('q5', 'q6', 'Testing from source 7 to target 3 with restriction on edges as follows 7 -> 8 -> 11 and 7 -> 8 -> 5');
+
+
+
+PREPARE q7 AS
+SELECT seq,
+       edge
+FROM pgr_dijkstraTRSP('SELECT id, source, target, cost, reverse_cost
+FROM edge_table', 'SELECT * FROM restrict WHERE id in (4)', 7, 1);
+
+PREPARE q8 AS
+SELECT seq, edge FROM ( VALUES
+	(1, 6),
+	(2, 7),
+	(3, 8),
+	(4, 5),
+	(5, 2),
+	(6, 1),
+	(7, -1) )
+AS t(seq, edge);
+
+SELECT set_eq('q7', 'q8', 'Testing from source 7 to target 1 with restriction on edges as follows 7 -> 4');
+
+
+
+PREPARE q9 AS
+SELECT seq,
+       edge
+FROM pgr_dijkstraTRSP('SELECT id, source, target, cost, reverse_cost
+FROM edge_table', 'SELECT * FROM restrict WHERE id in (4, 5)', 8, 4);
+
+PREPARE q10 AS
+SELECT seq, edge FROM ( VALUES
+	(1, 7),
+	(2, 10),
+	(3, 12),
+	(4, 13),
+	(5, 15),
+	(6, 16),
+	(7, -1) )
+AS t(seq, edge);
+
+SELECT set_eq('q9', 'q10', 'Testing from source 8 to target 4 with restriction on edges as follows 7 -> 8 and 7 -> 4');
+
+
+
+PREPARE q11 AS
+SELECT seq,
+       edge
+FROM pgr_dijkstraTRSP('SELECT id, source, target, cost, reverse_cost
+FROM edge_table', 'SELECT * FROM restrict WHERE id in (4, 5)', 7, 1);
+
+PREPARE q12 AS
+SELECT seq, edge FROM ( VALUES
+	(1, 6),
+	(2, 7),
+	(3, 10),
+	(4, 12),
+	(5, 13),
+	(6, 15),
+	(7, 9),
+	(8, 5),
+	(9, 2),
+	(10, 1),
+	(11, -1) )
+AS t(seq, edge);
+
+SELECT set_eq('q11', 'q12', 'Testing from source 7 to target 1 with restriction on edges as follows 7 -> 8 and 7 -> 4'); 
+
+
+
+PREPARE q13 AS
+SELECT seq,
+       edge
+FROM pgr_dijkstraTRSP('SELECT id, source, target, cost, reverse_cost
+FROM edge_table', 'SELECT * FROM restrict WHERE id in (6, 7)', 12, 7);
+
+PREPARE q14 AS
+SELECT seq, edge FROM ( VALUES
+	(1, 15),
+	(2, 9),
+	(3, 5),
+	(4, 2),
+	(5, 4),
+	(6, 7),
+	(7, 6),
+	(8, -1) )
+AS t(seq, edge);
+
+SELECT set_eq('q13', 'q14', 'Testing from source 12 to target 7 with restriction on edges as follows 9 -> 11 and 9 -> 8'); 
+
+
+SELECT todo_end();
+
+SELECT finish();
+ROLLBACK;

src/dijkstraTRSP/test/pgtap/empty_set_NO_default_strict.sql

@@ -11,7 +11,7 @@ SELECT plan(20);
 PREPARE q1 AS
 SELECT * FROM pgr_dijkstraTRSP(
     'SELECT id, source, target, cost, reverse_cost FROM edge_table WHERE id = 4 OR id = 7',
-    'SELECT * FROM restrict',
+    'SELECT * FROM restrict WHERE id IN (1)',
     2, 3,
     strict := false
 );
@@ -21,7 +21,7 @@ SELECT * FROM pgr_dijkstraTRSP(
 PREPARE q2 AS
 SELECT * FROM pgr_dijkstraTRSP(
     'SELECT id, source, target, cost, reverse_cost FROM edge_table WHERE id = 4 OR id = 7',
-    'SELECT * FROM restrict',
+    'SELECT * FROM restrict WHERE id IN (1)',
     2, 3,
     FALSE,
     strict := false
@@ -57,7 +57,7 @@ SELECT * FROM pgr_dijkstraTRSP(
 PREPARE q5 AS
 SELECT * FROM pgr_dijkstraTRSP(
     'SELECT id, source, target, cost, reverse_cost FROM edge_table WHERE id = 4 OR id = 7',
-    'SELECT * FROM restrict',
+    'SELECT * FROM restrict WHERE id IN (1)',
     6, 8,
     strict := false
 );
@@ -67,7 +67,7 @@ SELECT * FROM pgr_dijkstraTRSP(
 PREPARE q6 AS
 SELECT * FROM pgr_dijkstraTRSP(
     'SELECT id, source, target, cost, reverse_cost FROM edge_table WHERE id = 4 OR id = 7',
-    'SELECT * FROM restrict',
+    'SELECT * FROM restrict WHERE id IN (1)',
     6, 8,
     FALSE,
     strict := false
@@ -103,7 +103,7 @@ SELECT * FROM pgr_dijkstraTRSP(
 PREPARE q9 AS
 SELECT * FROM pgr_dijkstraTRSP(
     'SELECT id, source, target, cost, reverse_cost FROM edge_table WHERE id = 4 OR id = 7',
-    'SELECT * FROM restrict',
+    'SELECT * FROM restrict WHERE id IN (1)',
     1, 17,
     strict := false
 );
@@ -113,7 +113,7 @@ SELECT * FROM pgr_dijkstraTRSP(
 PREPARE q10 AS
 SELECT * FROM pgr_dijkstraTRSP(
     'SELECT id, source, target, cost, reverse_cost FROM edge_table WHERE id = 4 OR id = 7',
-    'SELECT * FROM restrict',
+    'SELECT * FROM restrict WHERE id IN (1)',
     1, 17,
     FALSE,
     strict := false
@@ -149,7 +149,7 @@ SELECT * FROM pgr_dijkstraTRSP(
 PREPARE q13 AS
 SELECT * FROM pgr_dijkstraTRSP(
     'SELECT id, source, target, cost, reverse_cost FROM edge_table WHERE id = 4 OR id = 7',
-    'SELECT * FROM restrict',
+    'SELECT * FROM restrict WHERE id IN (1)',
     2, 2,
     strict := false
 );
@@ -159,7 +159,7 @@ SELECT * FROM pgr_dijkstraTRSP(
 PREPARE q14 AS
 SELECT * FROM pgr_dijkstraTRSP(
     'SELECT id, source, target, cost, reverse_cost FROM edge_table WHERE id = 4 OR id = 7',
-    'SELECT * FROM restrict',
+    'SELECT * FROM restrict WHERE id IN (1)',
     2, 2,
     FALSE,
     strict := false
@@ -194,7 +194,7 @@ SELECT * FROM pgr_dijkstraTRSP(
 PREPARE q17 AS
 SELECT * FROM pgr_dijkstraTRSP(
     'SELECT id, source, target, cost, reverse_cost FROM edge_table WHERE id IN (4, 7, 17)',
-    'SELECT * FROM restrict',
+    'SELECT * FROM restrict WHERE id IN (1)',
     2, 14,
     strict := false
 );
@@ -204,7 +204,7 @@ SELECT * FROM pgr_dijkstraTRSP(
 PREPARE q18 AS
 SELECT * FROM pgr_dijkstraTRSP(
     'SELECT id, source, target, cost, reverse_cost FROM edge_table WHERE id IN (4, 7, 17)',
-    'SELECT * FROM restrict',
+    'SELECT * FROM restrict WHERE id IN (1)',
     2, 14,
     FALSE,
     strict := false