Skip to content

Commit e70aead

Browse files
cvvergaracvvergara
committed
(pgtap) adjusting trsp equivalence tests
1 parent 9404143 commit e70aead

File tree

3 files changed

+56
-35
lines changed

3 files changed

+56
-35
lines changed

‎pgtap/trsp/trsp_withpoints/compare/withpoints/many_to_many.pg‎

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,11 @@ points_sql TEXT;
3535
trsp_sql TEXT;
3636
result_columns TEXT;
3737
result_columns_vid TEXT;
38-
arr TEXT;
38+
drv_right TEXT := $$, 'r'$$;
39+
drv_both TEXT := $$, 'b'$$;
40+
tdrv_right TEXT := $$, driving_side => 'r'$$;
41+
tdrv_both TEXT := $$, driving_side => 'b'$$;
42+
arr TEXT := 'ARRAY[1,2,3,4,5,6,7,8,9,10,11,12,13,14,16,16,17,18]';
3943
BEGIN
4044
IF NOT min_version('3.4.0') THEN
4145
RETURN QUERY SELECT skip(1, 'Signature added on 3.4.0');
@@ -47,40 +51,41 @@ BEGIN
4751

4852
IF min_version('4.0.0') THEN
4953
result_columns_vid = replace(result_columns_vid, 'pid', 'vid');
54+
ELSE
55+
drv_right := $$, driving_side => 'r'$$;
56+
drv_both := $$, driving_side => 'b'$$;
5057
END IF;
51-
52-
points := 'SELECT * FROM pointsofinterest';
58+
points := 'SELECT * FROM pointsofinterest WHERE pid IN (-1)';
5359
empty_restrictions := 'SELECT * FROM restrictions WHERE id > 10';
5460
with_reverse := 'SELECT * FROM edges';
5561
no_reverse := 'SELECT id, source, target, cost FROM edges';
56-
arr := 'ARRAY[1,2,3,4,5,6,7,8,9,10,11,12,13,14,16,16,17,18]';
5762

5863
points_sql := 'SELECT ' || result_columns_vid || ' FROM pgr_withpoints($$' || with_reverse || '$$, $$' || points || '$$, '
59-
|| arr || ', ' || arr || ', directed => true)';
64+
|| arr || ', ' || arr || drv_right || ', directed => true)';
6065
trsp_sql := 'SELECT ' || result_columns || ' FROM pgr_trsp_withPoints($$' || with_reverse || '$$, $$'
6166
|| empty_restrictions || '$$, $$' || points || '$$, '
62-
|| arr || ', ' || arr || ', directed => true)';
67+
|| arr || ', ' || arr || tdrv_right || ', directed => true)';
6368
RETURN query SELECT set_eq(trsp_sql, points_sql, trsp_sql);
6469

6570
points_sql := 'SELECT ' || result_columns_vid || ' FROM pgr_withpoints($$' || with_reverse || '$$, $$' || points || '$$, '
66-
|| arr || ', ' || arr || ', directed => false)';
71+
|| arr || ', ' || arr || drv_both || ', directed => false)';
6772
trsp_sql := 'SELECT ' || result_columns || ' FROM pgr_trsp_withPoints($$' || with_reverse || '$$, $$'
6873
|| empty_restrictions || '$$, $$' || points || '$$, '
69-
|| arr || ', ' || arr || ', directed => false)';
74+
|| arr || ', ' || arr || tdrv_both || ', directed => false)';
7075
RETURN query SELECT set_eq(trsp_sql, points_sql, trsp_sql);
7176

7277
points_sql := 'SELECT ' || result_columns_vid || ' FROM pgr_withpoints($$' || no_reverse || '$$, $$' || points || '$$, '
73-
|| arr || ', ' || arr || ', directed => true)';
78+
|| arr || ', ' || arr || drv_right || ', directed => true)';
7479
trsp_sql := 'SELECT ' || result_columns || ' FROM pgr_trsp_withPoints($$' || no_reverse || '$$, $$'
7580
|| empty_restrictions || '$$, $$' || points || '$$, '
76-
|| arr || ', ' || arr || ', directed => true)';
81+
|| arr || ', ' || arr || tdrv_right || ', directed => true)';
7782
RETURN query SELECT set_eq(trsp_sql, points_sql, trsp_sql);
7883

7984
points_sql := 'SELECT ' || result_columns_vid || ' FROM pgr_withpoints($$' || no_reverse || '$$, $$' || points || '$$, '
80-
|| arr || ', ' || arr || ', directed => false)';
85+
|| arr || ', ' || arr || drv_both || ', directed => false)';
8186
trsp_sql := 'SELECT ' || result_columns || ' FROM pgr_trsp_withPoints($$' || no_reverse || '$$, $$'
8287
|| empty_restrictions || '$$, $$' || points || '$$, '
83-
|| arr || ', ' || arr || ', directed => false)';
88+
|| arr || ', ' || arr || tdrv_both || ', directed => false)';
8489
RETURN query SELECT set_eq(trsp_sql, points_sql, trsp_sql);
8590

8691
RETURN;

‎pgtap/trsp/trsp_withpoints/compare/withpoints/many_to_one.pg‎

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,11 @@ points_sql TEXT;
3535
trsp_sql TEXT;
3636
result_columns TEXT;
3737
result_columns_vid TEXT;
38-
arr TEXT;
38+
drv_right TEXT := $$, 'r'$$;
39+
drv_both TEXT := $$, 'b'$$;
40+
tdrv_right TEXT := $$, driving_side => 'r'$$;
41+
tdrv_both TEXT := $$, driving_side => 'b'$$;
42+
arr TEXT := 'ARRAY[1,2,3,4,5,6,7,8]';
3943
BEGIN
4044
IF NOT min_version('3.4.0') THEN
4145
RETURN QUERY SELECT skip(1, 'Signature added on 3.4.0');
@@ -44,46 +48,50 @@ BEGIN
4448

4549
result_columns := 'seq, start_vid, node, edge, cost, agg_cost';
4650
result_columns_vid := 'seq, start_pid AS start_vid, node, edge, cost, agg_cost';
51+
4752
IF min_version('4.0.0') THEN
4853
result_columns_vid = replace(result_columns_vid, 'pid', 'vid');
54+
ELSE
55+
drv_right := $$, driving_side => 'r'$$;
56+
drv_both := $$, driving_side => 'b'$$;
4957
END IF;
58+
5059
points := 'SELECT * FROM pointsofinterest WHERE pid IN (-1)';
5160
empty_restrictions := 'SELECT * FROM restrictions WHERE id > 10';
5261
with_reverse := 'SELECT * FROM edges';
5362
no_reverse := 'SELECT id, source, target, cost FROM edges';
54-
arr := 'ARRAY[1,2,3,4,5,6,7,8]';
5563

5664
FOR j IN 1.. $1 LOOP
5765

5866
points_sql := 'SELECT ' || result_columns_vid || ' FROM pgr_withpoints($$' || with_reverse || '$$, $$' || points || '$$, '
59-
|| arr || ', ' || j || ', directed => true)';
67+
|| arr || ', ' || j || drv_right || ', directed => true)';
6068
trsp_sql := 'SELECT ' || result_columns || ' FROM pgr_trsp_withPoints($$' || with_reverse || '$$, $$'
6169
|| empty_restrictions || '$$, $$' || points || '$$, '
62-
|| arr || ', ' || j || ', directed => true)';
70+
|| arr || ', ' || j || tdrv_right || ', directed => true)';
6371
RETURN query SELECT set_eq(trsp_sql, points_sql, trsp_sql);
6472

6573
points_sql := 'SELECT ' || result_columns_vid || ' FROM pgr_withpoints($$' || with_reverse || '$$, $$' || points || '$$, '
66-
|| arr || ', ' || j || ', directed => false)';
74+
|| arr || ', ' || j || drv_both || ', directed => false)';
6775
trsp_sql := 'SELECT ' || result_columns || ' FROM pgr_trsp_withPoints($$' || with_reverse || '$$, $$'
6876
|| empty_restrictions || '$$, $$' || points || '$$, '
69-
|| arr || ', ' || j || ', directed => false)';
77+
|| arr || ', ' || j || tdrv_both || ', directed => false)';
7078
RETURN query SELECT set_eq(trsp_sql, points_sql, trsp_sql);
7179

7280
points_sql := 'SELECT ' || result_columns_vid || ' FROM pgr_withpoints($$' || no_reverse || '$$, $$' || points || '$$, '
73-
|| arr || ', ' || j || ', directed => true)';
81+
|| arr || ', ' || j || drv_right || ', directed => true)';
7482
trsp_sql := 'SELECT ' || result_columns || ' FROM pgr_trsp_withPoints($$' || no_reverse || '$$, $$'
7583
|| empty_restrictions || '$$, $$' || points || '$$, '
76-
|| arr || ', ' || j || ', directed => true)';
84+
|| arr || ', ' || j || tdrv_right || ', directed => true)';
7785
RETURN query SELECT set_eq(trsp_sql, points_sql, trsp_sql);
7886

7987
points_sql := 'SELECT ' || result_columns_vid || ' FROM pgr_withpoints($$' || no_reverse || '$$, $$' || points || '$$, '
80-
|| arr || ', ' || j || ', directed => false)';
88+
|| arr || ', ' || j || drv_both || ', directed => false)';
8189
trsp_sql := 'SELECT ' || result_columns || ' FROM pgr_trsp_withPoints($$' || no_reverse || '$$, $$'
8290
|| empty_restrictions || '$$, $$' || points || '$$, '
83-
|| arr || ', ' || j || ', directed => false)';
91+
|| arr || ', ' || j || tdrv_both || ', directed => false)';
8492
RETURN query SELECT set_eq(trsp_sql, points_sql, trsp_sql);
8593

86-
END LOOP;
94+
END LOOP;
8795

8896
RETURN;
8997
END

‎pgtap/trsp/trsp_withpoints/compare/withpoints/one_to_many.pg‎

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,11 @@ points_sql TEXT;
3535
trsp_sql TEXT;
3636
result_columns TEXT;
3737
result_columns_vid TEXT;
38-
arr TEXT;
38+
drv_right TEXT := $$, 'r'$$;
39+
drv_both TEXT := $$, 'b'$$;
40+
tdrv_right TEXT := $$, driving_side => 'r'$$;
41+
tdrv_both TEXT := $$, driving_side => 'b'$$;
42+
arr TEXT := 'ARRAY[1,2,3,4,5,6,7,8]';
3943
BEGIN
4044
IF NOT min_version('3.4.0') THEN
4145
RETURN QUERY SELECT skip(1, 'Signature added on 3.4.0');
@@ -44,45 +48,49 @@ BEGIN
4448

4549
result_columns := 'seq, end_vid, node, edge, cost, agg_cost';
4650
result_columns_vid := 'seq, end_pid AS end_vid, node, edge, cost, agg_cost';
51+
4752
IF min_version('4.0.0') THEN
4853
result_columns_vid = replace(result_columns_vid, 'pid', 'vid');
54+
ELSE
55+
drv_right := $$, driving_side => 'r'$$;
56+
drv_both := $$, driving_side => 'b'$$;
4957
END IF;
50-
points := 'SELECT * FROM pointsofinterest';
58+
59+
points := 'SELECT * FROM pointsofinterest WHERE pid IN (-1)';
5160
empty_restrictions := 'SELECT * FROM restrictions WHERE id > 10';
5261
with_reverse := 'SELECT * FROM edges';
5362
no_reverse := 'SELECT id, source, target, cost FROM edges';
54-
arr := 'ARRAY[1,2,3,4,5,6,7,8]';
5563

5664
FOR i IN 1.. $1 LOOP
5765
points_sql := 'SELECT ' || result_columns_vid || ' FROM pgr_withpoints($$' || with_reverse || '$$, $$' || points || '$$, '
58-
|| i || ', ' || arr || ', directed => true)';
66+
|| i || ', ' || arr || drv_right || ', directed => true)';
5967
trsp_sql := 'SELECT ' || result_columns || ' FROM pgr_trsp_withPoints($$' || with_reverse || '$$, $$'
6068
|| empty_restrictions || '$$, $$' || points || '$$, '
61-
|| i || ', ' || arr || ', directed => true)';
69+
|| i || ', ' || arr || tdrv_right || ', directed => true)';
6270
RETURN query SELECT set_eq(trsp_sql, points_sql, trsp_sql);
6371

6472
points_sql := 'SELECT ' || result_columns_vid || ' FROM pgr_withpoints($$' || with_reverse || '$$, $$' || points || '$$, '
65-
|| i || ', ' || arr || ', directed => false)';
73+
|| i || ', ' || arr || drv_both || ', directed => false)';
6674
trsp_sql := 'SELECT ' || result_columns || ' FROM pgr_trsp_withPoints($$' || with_reverse || '$$, $$'
6775
|| empty_restrictions || '$$, $$' || points || '$$, '
68-
|| i || ', ' || arr || ', directed => false)';
76+
|| i || ', ' || arr || tdrv_both || ', directed => false)';
6977
RETURN query SELECT set_eq(trsp_sql, points_sql, trsp_sql);
7078

7179
points_sql := 'SELECT ' || result_columns_vid || ' FROM pgr_withpoints($$' || no_reverse || '$$, $$' || points || '$$, '
72-
|| i || ', ' || arr || ', directed => true)';
80+
|| i || ', ' || arr || drv_right || ', directed => true)';
7381
trsp_sql := 'SELECT ' || result_columns || ' FROM pgr_trsp_withPoints($$' || no_reverse || '$$, $$'
7482
|| empty_restrictions || '$$, $$' || points || '$$, '
75-
|| i || ', ' || arr || ', directed => true)';
83+
|| i || ', ' || arr || tdrv_right || ', directed => true)';
7684
RETURN query SELECT set_eq(trsp_sql, points_sql, trsp_sql);
7785

7886
points_sql := 'SELECT ' || result_columns_vid || ' FROM pgr_withpoints($$' || no_reverse || '$$, $$' || points || '$$, '
79-
|| i || ', ' || arr || ', directed => false)';
87+
|| i || ', ' || arr || drv_both || ', directed => false)';
8088
trsp_sql := 'SELECT ' || result_columns || ' FROM pgr_trsp_withPoints($$' || no_reverse || '$$, $$'
8189
|| empty_restrictions || '$$, $$' || points || '$$, '
82-
|| i || ', ' || arr || ', directed => false)';
90+
|| i || ', ' || arr || tdrv_both || ', directed => false)';
8391
RETURN query SELECT set_eq(trsp_sql, points_sql, trsp_sql);
8492

85-
END LOOP;
93+
END LOOP;
8694

8795
RETURN;
8896
END

0 commit comments

Comments
 (0)