X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Fagar%2Ftest%2Fapi-dfs.c;h=65be2e18353f4ee39eb31442da9a1f202d2b0007;hb=318edb2466a24a2eadcfd05fa83ae29c0e8aae03;hp=ecc05bd744d495d8c9c82be7c13ef5d1cba88011;hpb=a2eaae42b58a44d6f88f5e20e4a7d7cdbde9edae;p=ccan

diff --git a/ccan/agar/test/api-dfs.c b/ccan/agar/test/api-dfs.c
index ecc05bd7..65be2e18 100644
--- a/ccan/agar/test/api-dfs.c
+++ b/ccan/agar/test/api-dfs.c
@@ -38,20 +38,16 @@
 
 int main(void)
 {
-	struct trivial_graphr tgr;
 	struct parallel_graphr pgr;
 	struct full_graphr fgr;
 	struct chain_graphr cgr;
 	struct grid_graphr ggr1, ggr2;
-	struct error_graphr egr;
-	struct traversal1_graphr t1gr;
 	struct agar_state *sr;
 	const void *nr;
 	
-	plan_tests(2 * 13 + 12 + 10);
+	plan_tests(2 * 13 + 12 + 10 + 6);
 
-	trivial_graphr_init(&tgr);
-	test_dfs(&tgr.gr, 1, 1);
+	test_dfs(&trivial_graphr.gr, 1, 1);
 
 	parallel_graphr_init(&pgr, 3, 0);
 	test_dfs(&pgr.gr, 1, 1, 2);
@@ -75,9 +71,9 @@ int main(void)
 	test_dfs(&ggr2.gr, 5, 5, 6, 9, 8, 7, 4, 1, 2, 3);
 	test_dfs(&ggr2.gr, 9, 9, 8, 7, 4, 5, 6, 3, 2, 1);
 
-	error_graphr_init(&egr);
-	test_dfs(&egr.gr, 1, 1, 2);
-	ok((sr = agar_dfs_new(NULL, &egr.gr)), "started error traversal");
+	test_dfs(&error_graphr.gr, 1, 1, 2);
+	ok((sr = agar_dfs_new(NULL, &error_graphr.gr)),
+	   "started error traversal");
 	ok1(agar_dfs_explore(sr, int2ptr(3), &nr));
 	ok(ptr2int(nr) == 3, "Expected node #3, actually #%ld", ptr2int(nr));
 	ok1(agar_dfs_explore(sr, nr, &nr));
@@ -86,21 +82,24 @@ int main(void)
 	ok(agar_error(sr) == -1, "Error is %d (expected -1)", agar_error(sr));
 	ok1(!agar_dfs_explore(sr, nr, &nr));
 	tal_free(sr);
-	test_dfs(&egr.gr, 1, 1, 2);
+	test_dfs(&error_graphr.gr, 1, 1, 2);
 
-	traversal1_graphr_init(&t1gr);
-	test_dfs(&t1gr.gr, 1, 1, 2, 4, 5, 3, 6);
-	test_dfs(&t1gr.gr, 9, 9, 8, 6, 5, 7, 4);
+	test_dfs(&traversal1_graphr.gr, 1, 1, 2, 4, 5, 3, 6);
+	test_dfs(&traversal1_graphr.gr, 9, 9, 8, 6, 5, 7, 4);
 
-	ok1((sr = agar_dfs_new(NULL, &t1gr.gr)));
+	ok1((sr = agar_dfs_new(NULL, &traversal1_graphr.gr)));
 	test_dfs_partial(sr, 1, 1, 2, 4, 5, 3, 6);
 	test_dfs_partial(sr, 9, 9, 8, 7);
 	tal_free(sr);
 
-	ok1((sr = agar_dfs_new(NULL, &t1gr.gr)));
+	ok1((sr = agar_dfs_new(NULL, &traversal1_graphr.gr)));
 	test_dfs_partial(sr, 9, 9, 8, 6, 5, 7, 4);
 	test_dfs_partial(sr, 1, 1, 2, 3);
 	tal_free(sr);
 
+	test_dfs(&negacycle_graphr.gr, 1, 1, 2, 3);
+	test_dfs(&negacycle_graphr.gr, 2, 2, 3, 1);
+	test_dfs(&negacycle_graphr.gr, 3, 3, 1, 2);
+
 	return exit_status();
 }