X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Fagar%2Ftest%2Fapi-dijkstra.c;fp=ccan%2Fagar%2Ftest%2Fapi-dijkstra.c;h=5edccd7032bbcfd23ae3ca5da4d34c5f597b4356;hb=a2eaae42b58a44d6f88f5e20e4a7d7cdbde9edae;hp=4b03bc6b8fcd9c44b7508b98fcfacae1c3a63ba4;hpb=1e742b68d026a258ccf99338f05daf8b694978a3;p=ccan

diff --git a/ccan/agar/test/api-dijkstra.c b/ccan/agar/test/api-dijkstra.c
index 4b03bc6b..5edccd70 100644
--- a/ccan/agar/test/api-dijkstra.c
+++ b/ccan/agar/test/api-dijkstra.c
@@ -35,9 +35,9 @@ static void test_parallel(void)
 	struct parallel_graphr pgr;
 	struct agar_state *sr;
 	aga_icost_t cost;
-	const void *node;
+	const void *node, *edge;
 
-	parallel_graphr_init(&pgr, 3);
+	parallel_graphr_init(&pgr, 3, 0);
 
 	ok1(sr = agar_dijkstra_new(NULL, &pgr.gr, int2ptr(1)));
 	ok1(agar_dijkstra_step(sr, &node));
@@ -48,7 +48,7 @@ static void test_parallel(void)
 	ok1(agar_dijkstra_path(sr, int2ptr(1), &cost, NULL, NULL));
 	ok1(cost == 0);
 	ok1(agar_dijkstra_path(sr, int2ptr(2), &cost, &node, NULL));
-	ok1(cost == 1);
+	ok1(cost == 2);
 	ok1(node == int2ptr(1));
 	tal_free(sr);
 
@@ -60,6 +60,14 @@ static void test_parallel(void)
 	ok1(cost == 0);
 	ok1(!agar_dijkstra_path(sr, int2ptr(1), NULL, NULL, NULL));
 	tal_free(sr);
+
+	parallel_graphr_init(&pgr, 3, 2);
+	ok1(sr = agar_dijkstra_new(NULL, &pgr.gr, int2ptr(1)));
+	ok1(agar_dijkstra_path(sr, int2ptr(2), &cost, &node, &edge));
+	ok1(cost == 1);
+	ok1(ptr2int(node) == 1);
+	ok1(ptr2int(edge) == 2);
+	tal_free(sr);
 }
 
 #define FULL_LEN	4
@@ -213,7 +221,7 @@ static void test_traversal1(void)
 
 int main(void)
 {
-	plan_tests(6 + 18
+	plan_tests(6 + 23
 		   + FULL_LEN * (FULL_LEN*4 - 1)
 		   + CHAIN_LEN * (1 + CHAIN_LEN*2)
 		   + 12 + 32);