Skip to content

Commit facfa73

Browse files
cvvergaracvvergara
committed
(widhtPoints/pgtap) Adjusting pgtap tests to changes
1 parent 81204c8 commit facfa73

File tree

11 files changed

+156
-114
lines changed

11 files changed

+156
-114
lines changed

‎pgtap/ksp/withPointsKSP/no_crash_test.pg‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ BEGIN
6868
'(SELECT id FROM vertices WHERE id IN (-1))',
6969
'(SELECT id FROM vertices WHERE id IN (-1))',
7070
'NULL',
71-
'NULL'
71+
'NULL::CHAR'
7272
]::TEXT[];
7373

7474
RETURN query SELECT * FROM no_crash_test('pgr_withPointsKSP', params, subs);
@@ -79,7 +79,7 @@ BEGIN
7979
'NULL::BIGINT',
8080
'NULL::BIGINT',
8181
'NULL',
82-
'NULL'
82+
'NULL::CHAR'
8383
]::TEXT[];
8484
RETURN query SELECT * FROM no_crash_test('pgr_withPointsKSP', params, subs);
8585

@@ -97,7 +97,7 @@ BEGIN
9797
'(SELECT id FROM vertices WHERE id IN (-1))',
9898
'(SELECT array_agg(id) FROM vertices WHERE id IN (-1))',
9999
'NULL',
100-
'NULL'
100+
'NULL::CHAR'
101101
]::TEXT[];
102102

103103
RETURN query SELECT * FROM no_crash_test('pgr_withPointsKSP', params, subs);
@@ -108,7 +108,7 @@ BEGIN
108108
'NULL::BIGINT',
109109
'NULL::BIGINT[]',
110110
'NULL',
111-
'NULL'
111+
'NULL::CHAR'
112112
]::TEXT[];
113113
RETURN query SELECT * FROM no_crash_test('pgr_withPointsKSP', params, subs);
114114

@@ -126,7 +126,7 @@ BEGIN
126126
'(SELECT array_agg(id) FROM vertices WHERE id IN (-1))',
127127
'(SELECT id FROM vertices WHERE id IN (-1))',
128128
'NULL',
129-
'NULL'
129+
'NULL::CHAR'
130130
]::TEXT[];
131131

132132
RETURN query SELECT * FROM no_crash_test('pgr_withPointsKSP', params, subs);
@@ -137,7 +137,7 @@ BEGIN
137137
'NULL::BIGINT[]',
138138
'NULL::BIGINT',
139139
'NULL',
140-
'NULL'
140+
'NULL::CHAR'
141141
]::TEXT[];
142142
RETURN query SELECT * FROM no_crash_test('pgr_withPointsKSP', params, subs);
143143

@@ -154,7 +154,7 @@ BEGIN
154154
'(SELECT array_agg(id) FROM vertices WHERE id IN (-1))',
155155
'(SELECT array_agg(id) FROM vertices WHERE id IN (-1))',
156156
'NULL',
157-
'NULL'
157+
'NULL::CHAR'
158158
]::TEXT[];
159159

160160
RETURN query SELECT * FROM no_crash_test('pgr_withPointsKSP', params, subs);
@@ -165,7 +165,7 @@ BEGIN
165165
'NULL::BIGINT[]',
166166
'NULL::BIGINT[]',
167167
'NULL',
168-
'NULL'
168+
'NULL::CHAR'
169169
]::TEXT[];
170170
RETURN query SELECT * FROM no_crash_test('pgr_withPointsKSP', params, subs);
171171

@@ -181,8 +181,8 @@ BEGIN
181181
'NULL',
182182
'NULL',
183183
'$$(SELECT source, target FROM combinations WHERE source IN (-1))$$',
184-
'NULL',
185-
'NULL'
184+
'NULL::INTEGER',
185+
'NULL::CHAR'
186186
]::TEXT[];
187187

188188
RETURN query SELECT * FROM no_crash_test('pgr_withPointsKSP', params, subs);
@@ -191,8 +191,8 @@ BEGIN
191191
'NULL',
192192
'NULL',
193193
'NULL::TEXT',
194-
'NULL',
195-
'NULL'
194+
'NULL::INTEGER',
195+
'NULL::CHAR'
196196
]::TEXT[];
197197
RETURN query SELECT * FROM no_crash_test('pgr_withPointsKSP', params, subs);
198198

‎pgtap/ksp/withPointsKSP/types_check.pg‎

Lines changed: 33 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software
1717
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
1818
********************************************************************PGR-GNU*/
1919
BEGIN;
20-
SELECT CASE WHEN min_version('3.6.0') THEN plan(13) ELSE plan(2) END;
20+
SELECT CASE WHEN min_version('4.0.0') THEN plan(23) WHEN min_version('3.6.0') THEN plan(11) ELSE plan(2) END;
2121

2222
SELECT has_function('pgr_withpointsksp');
2323

@@ -45,38 +45,47 @@ BEGIN
4545

4646
IF min_version('4.0.0') THEN
4747

48+
RETURN QUERY SELECT has_function('pgr_withpointsksp',ARRAY['text','text','bigint','bigint','integer','boolean','boolean','boolean']);
49+
RETURN QUERY SELECT has_function('pgr_withpointsksp',ARRAY['text','text','bigint','anyarray','integer','boolean','boolean','boolean']);
50+
RETURN QUERY SELECT has_function('pgr_withpointsksp',ARRAY['text','text','anyarray','bigint','integer','boolean','boolean','boolean']);
51+
RETURN QUERY SELECT has_function('pgr_withpointsksp',ARRAY['text','text','anyarray','anyarray','integer','boolean','boolean','boolean']);
52+
RETURN QUERY SELECT has_function('pgr_withpointsksp',ARRAY['text','text','text','integer','boolean','boolean','boolean']);
53+
54+
RETURN QUERY SELECT function_returns('pgr_withpointsksp',ARRAY['text','text','bigint','bigint','integer','boolean','boolean','boolean'],'setof record');
55+
RETURN QUERY SELECT function_returns('pgr_withpointsksp',ARRAY['text','text','bigint','anyarray','integer','boolean','boolean','boolean'],'setof record');
56+
RETURN QUERY SELECT function_returns('pgr_withpointsksp',ARRAY['text','text','anyarray','bigint','integer','boolean','boolean','boolean'],'setof record');
57+
RETURN QUERY SELECT function_returns('pgr_withpointsksp',ARRAY['text','text','anyarray','anyarray','integer','boolean','boolean','boolean'],'setof record');
58+
RETURN QUERY SELECT function_returns('pgr_withpointsksp',ARRAY['text','text','text','integer','boolean','boolean','boolean'],'setof record');
59+
4860
RETURN QUERY SELECT function_args_eq('pgr_withpointsksp',
4961
$$VALUES
5062
('{"","","","","","",directed,heap_paths,details,seq,path_id,path_seq,start_vid,end_vid,node,edge,cost,agg_cost}'::TEXT[]),
51-
('{"","","","","",directed,heap_paths,details,seq,path_id,path_seq,start_vid,end_vid,node,edge,cost,agg_cost}'::TEXT[])
52-
$$);
63+
('{"","","","","","",directed,heap_paths,details,seq,path_id,path_seq,start_vid,end_vid,node,edge,cost,agg_cost}'),
64+
('{"","","","","","",directed,heap_paths,details,seq,path_id,path_seq,start_vid,end_vid,node,edge,cost,agg_cost}'),
65+
('{"","","","","","",directed,heap_paths,details,seq,path_id,path_seq,start_vid,end_vid,node,edge,cost,agg_cost}'),
66+
('{"","","","","", directed,heap_paths,details,seq,path_id,path_seq,start_vid,end_vid,node,edge,cost,agg_cost}'),
5367

54-
RETURN QUERY SELECT function_types_eq('pgr_withpointsksp',
55-
$$VALUES
56-
('{text,text,int8,int8,int4,bpchar,bool,bool,bool,int4,int4,int4,int8,int8,int8,int8,float8,float8}'::TEXT[]),
57-
('{text,text,int8,anyarray,int4,bpchar,bool,bool,bool,int4,int4,int4,int8,int8,int8,int8,float8,float8}'::TEXT[]),
58-
('{text,text,anyarray,int8,int4,bpchar,bool,bool,bool,int4,int4,int4,int8,int8,int8,int8,float8,float8}'::TEXT[]),
59-
('{text,text,anyarray,anyarray,int4,bpchar,bool,bool,bool,int4,int4,int4,int8,int8,int8,int8,float8,float8}'::TEXT[]),
60-
('{text,text,text,int4,bpchar,bool,bool,bool,int4,int4,int4,int8,int8,int8,int8,float8,float8}'::TEXT[])
68+
('{"","","","","", directed,heap_paths,details,seq,path_id,path_seq,start_vid,end_vid,node,edge,cost,agg_cost}'),
69+
('{"","","","","", directed,heap_paths,details,seq,path_id,path_seq,start_vid,end_vid,node,edge,cost,agg_cost}'),
70+
('{"","","","","", directed,heap_paths,details,seq,path_id,path_seq,start_vid,end_vid,node,edge,cost,agg_cost}'),
71+
('{"","","","","", directed,heap_paths,details,seq,path_id,path_seq,start_vid,end_vid,node,edge,cost,agg_cost}'),
72+
('{"","","","", directed,heap_paths,details,seq,path_id,path_seq,start_vid,end_vid,node,edge,cost,agg_cost}')
6173
$$);
6274

63-
ELSE
64-
65-
RETURN QUERY SELECT function_args_has('pgr_withpointsksp',
75+
RETURN QUERY SELECT function_types_eq('pgr_withpointsksp',
6676
$$VALUES
67-
('{"","","","","","",directed,heap_paths,details,seq,path_id,path_seq,start_vid,end_vid,node,edge,cost,agg_cost}'::TEXT[]),
68-
('{"","","","","",directed,heap_paths,details,seq,path_id,path_seq,start_vid,end_vid,node,edge,cost,agg_cost}'::TEXT[])
69-
$$);
77+
('{text,text,int8,int8, int4,bpchar,bool,bool,bool,int4,int4,int4,int8,int8,int8,int8,float8,float8}'::TEXT[]),
78+
('{text,text,int8,anyarray, int4,bpchar,bool,bool,bool,int4,int4,int4,int8,int8,int8,int8,float8,float8}'),
79+
('{text,text,anyarray,int8, int4,bpchar,bool,bool,bool,int4,int4,int4,int8,int8,int8,int8,float8,float8}'),
80+
('{text,text,anyarray,anyarray,int4,bpchar,bool,bool,bool,int4,int4,int4,int8,int8,int8,int8,float8,float8}'),
81+
('{text,text,text,int4, bpchar,bool,bool,bool,int4,int4,int4,int8,int8,int8,int8,float8,float8}'),
7082

71-
RETURN QUERY SELECT function_types_has('pgr_withpointsksp',
72-
$$VALUES
73-
('{text,text,int8,int8,int4,bpchar,bool,bool,bool,int4,int4,int4,int8,int8,int8,int8,float8,float8}'::TEXT[]),
74-
('{text,text,int8,anyarray,int4,bpchar,bool,bool,bool,int4,int4,int4,int8,int8,int8,int8,float8,float8}'::TEXT[]),
75-
('{text,text,anyarray,int8,int4,bpchar,bool,bool,bool,int4,int4,int4,int8,int8,int8,int8,float8,float8}'::TEXT[]),
76-
('{text,text,anyarray,anyarray,int4,bpchar,bool,bool,bool,int4,int4,int4,int8,int8,int8,int8,float8,float8}'::TEXT[]),
77-
('{text,text,text,int4,bpchar,bool,bool,bool,int4,int4,int4,int8,int8,int8,int8,float8,float8}'::TEXT[])
83+
('{text,text,int8,int8, int4, bool,bool,bool,int4,int4,int4,int8,int8,int8,int8,float8,float8}'),
84+
('{text,text,int8,anyarray, int4, bool,bool,bool,int4,int4,int4,int8,int8,int8,int8,float8,float8}'),
85+
('{text,text,anyarray,int8, int4, bool,bool,bool,int4,int4,int4,int8,int8,int8,int8,float8,float8}'),
86+
('{text,text,anyarray,anyarray,int4, bool,bool,bool,int4,int4,int4,int8,int8,int8,int8,float8,float8}'),
87+
('{text,text,text, int4, bool,bool,bool,int4,int4,int4,int8,int8,int8,int8,float8,float8}')
7888
$$);
79-
8089
END IF;
8190
END
8291
$BODY$

‎pgtap/trsp/trspVia_withPoints/types_check.pg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
1919
********************************************************************PGR-GNU*/
2020
BEGIN;
2121

22-
SELECT CASE WHEN min_version('4.0.0') THEN plan(5) ELSE plan(1) END;
22+
SELECT CASE WHEN min_version('4.0.0') THEN plan(7) ELSE plan(1) END;
2323

2424
SELECT types_check_via('pgr_trspvia_withpoints');
2525

‎pgtap/trsp/trsp_withpoints/types_check.pg‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
2020
BEGIN;
2121

2222

23-
SELECT CASE WHEN min_version('4.0.0') THEN plan(13) WHEN min_version('3.4.0') THEN plan(12) ELSE plan(1) END;
23+
SELECT CASE WHEN min_version('4.0.0') THEN plan(26) ELSE plan(2) END;
2424

2525
SELECT single_path_types_check(
2626
'pgr_trsp_withpoints', '{"",directed,details}'::TEXT[], '{bpchar,bool,bool}'::TEXT[],
2727
created_v => '3.4.0', standard_v => '4.0.0');
2828

29+
SELECT single_path_types_check(
30+
'pgr_trsp_withpoints', '{directed,details}'::TEXT[], '{bool,bool}'::TEXT[],
31+
created_v => '3.4.0', standard_v => '4.0.0');
32+
2933
SELECT finish();
3034
ROLLBACK;

‎pgtap/withPoints/withPoints/edge_cases/undirected.pg‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ BEGIN
136136
-1, 1, 'r', details := false, directed:=false)
137137
ORDER BY seq;
138138

139-
RETURN QUERY SELECT throws_ok('q2');
139+
RETURN QUERY SELECT lives_ok('q2');
140140

141141
-------- left driving side
142142

@@ -147,7 +147,7 @@ BEGIN
147147
-1, 1, 'l', details := false, directed:=false)
148148
ORDER BY seq;
149149

150-
RETURN QUERY SELECT throws_ok('q3');
150+
RETURN QUERY SELECT lives_ok('q3');
151151

152152
------------------
153153
---- FROM 12 to -1
@@ -176,7 +176,7 @@ BEGIN
176176
ORDER BY seq;
177177

178178

179-
RETURN QUERY SELECT throws_ok('q5');
179+
RETURN QUERY SELECT lives_ok('q5');
180180

181181
-------- left driving side
182182

@@ -187,7 +187,7 @@ BEGIN
187187
17, -1, 'l', details := false, directed:=false)
188188
ORDER BY seq;
189189

190-
RETURN QUERY SELECT throws_ok('q6');
190+
RETURN QUERY SELECT lives_ok('q6');
191191

192192

193193
------------------
@@ -216,7 +216,7 @@ BEGIN
216216
5, 1, 'r', details := true, directed:=false)
217217
ORDER BY seq;
218218

219-
RETURN QUERY SELECT throws_ok('q8');
219+
RETURN QUERY SELECT lives_ok('q8');
220220

221221
-------- left driving side
222222

@@ -227,7 +227,7 @@ BEGIN
227227
5, 1, 'l', details := true, directed:=false)
228228
ORDER BY seq;
229229

230-
RETURN QUERY SELECT throws_ok('q9');
230+
RETURN QUERY SELECT lives_ok('q9');
231231

232232
------------------
233233
-- with details
@@ -253,7 +253,7 @@ BEGIN
253253
'SELECT id, source, target, cost, reverse_cost FROM edges ORDER BY id',
254254
'SELECT pid, edge_id, fraction, side from pointsOfInterest',
255255
17, -1, 'r', details := true, directed:=false);
256-
RETURN QUERY SELECT throws_ok('q9');
256+
RETURN QUERY SELECT lives_ok('q9');
257257

258258
-------- left driving side
259259

@@ -263,7 +263,7 @@ BEGIN
263263
'SELECT pid, edge_id, fraction, side from pointsOfInterest',
264264
17, -1, 'l', details := true, directed:=false);
265265

266-
RETURN QUERY SELECT throws_ok('q9');
266+
RETURN QUERY SELECT lives_ok('q9');
267267

268268
END;
269269
$BODY$

‎pgtap/withPoints/withPointsCost/types_check.pg‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,17 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
1919

2020
BEGIN;
2121

22-
SELECT CASE WHEN min_version('4.0.0') THEN plan(13) WHEN min_version('3.2.0') THEN plan(12) ELSE PLAN(10) END;
22+
SELECT CASE WHEN min_version('4.0.0') THEN plan(26) ELSE PLAN(4) END;
2323

2424
SELECT cost_types_check(
2525
'pgr_withpointscost',
2626
'{"",directed}'::TEXT[], '{bpchar,bool}'::TEXT[],
2727
standard_v => '4.0.0');
2828

29+
SELECT cost_types_check(
30+
'pgr_withpointscost',
31+
'{directed}'::TEXT[], '{bool}'::TEXT[],
32+
standard_v => '4.0.0');
33+
2934
SELECT finish();
3035
ROLLBACK;

‎pgtap/withPoints/withPointsCostMatrix/types_check.pg‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,17 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
1919
********************************************************************PGR-GNU*/
2020
BEGIN;
2121

22-
SELECT CASE WHEN min_version('4.0.0') THEN plan(5) ELSE plan(4) END;
22+
SELECT CASE WHEN min_version('4.0.0') THEN plan(10) ELSE plan(4) END;
2323

2424
SELECT cost_types_check(
2525
'pgr_withpointscostmatrix',
2626
'{"",directed}'::TEXT[], '{bpchar,bool}'::TEXT[],
2727
standard_v => '4.0.0');
2828

29+
SELECT cost_types_check(
30+
'pgr_withpointscostmatrix',
31+
'{directed}'::TEXT[], '{bool}'::TEXT[],
32+
standard_v => '4.0.0');
33+
2934
SELECT finish();
3035
ROLLBACK;

0 commit comments

Comments
 (0)