Removing duplicated test and using unnest

Author: cvvergara

pgtap/contraction/deadend/directed/big_ids.pg

@@ -24,6 +24,7 @@ vids BIGINT[] = ARRAY[1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18];
 x BIGINT;
 q TEXT;
 mainq TEXT;
+otherq TEXT;
 expected TEXT;
 BEGIN
   UPDATE edges
@@ -66,26 +67,32 @@ BEGIN
     -1::BIGINT AS target,
     -1::FLOAT AS cost$$);
 
-  q = format(mainq, ARRAY[vids[1], vids[2]], directed);
+  otherq = $d$ SELECT type, id, unnest(contracted_vertices) FROM pgr_contraction(
+      $$SELECT id, source, target, cost, reverse_cost FROM edges WHERE id  = ANY('%1$s'::BIGINT[]) $$,
+      ARRAY[1]::integer[], 1, ARRAY[]::BIGINT[], '%2$s'::BOOLEAN)$d$;
 
-  RETURN QUERY
-  SELECT set_eq(q,
-    $$SELECT
-    'v'::CHAR AS type,
-     $$ || vids[10] || $$::BIGINT AS id,
-    ARRAY[ $$ || vids[5] || $$,$$ ||  vids[6] || $$]::BIGINT[] AS contracted_vertices,
-    -1::BIGINT AS source,
-    -1::BIGINT AS target,
-    -1::FLOAT AS cost$$);
+  q = format(otherq, ARRAY[vids[1], vids[2]], directed);
+
+  expected = format($d$
+    SELECT type, id, unnest
+    FROM (VALUES
+      ('v'::TEXT, %1$s::BIGINT, %2$s::BIGINT),
+      ('v', %1$s, %3$s)
+    ) AS t(type, id, unnest)$d$,
+    vids[10], vids[5], vids[6]) ;
 
-  q = format(mainq, ARRAY[vids[1], vids[2], vids[3]], directed);
+  RETURN QUERY SELECT set_eq(q, expected);
+
+  q = format(otherq, ARRAY[vids[1], vids[2], vids[3]], directed);
 
   expected = format($d$
-    SELECT type, id, contracted_vertices, source, target, cost
+    SELECT type, id, unnest
     FROM (VALUES
-      ('v'::CHAR, %1$s::BIGINT, '%2$s'::BIGINT[], -1::BIGINT, -1::BIGINT, -1::FLOAT)
-    ) AS t(type, id, contracted_vertices, source, target, cost )$d$,
-    vids[6], ARRAY[vids[5], vids[10], vids[15]]) ;
+      ('v'::TEXT, %1$s::BIGINT, %2$s::BIGINT),
+      ('v', %1$s, %3$s),
+      ('v', %1$s, %4$s)
+    ) AS t(type, id, unnest)$d$,
+    vids[6], vids[5], vids[10], vids[15]) ;
 
   RETURN QUERY
   SELECT set_eq(q, expected);