fix test to use new calling convention

This test still fails several cases, since add_depends influence testing is
currently commented out.

1 files changed, 11 insertions, 11 deletions

diff --git a/t/add_depends.t b/t/add_depends.t
index 9f426187b..fce7a76c6 100755
--- a/t/add_depends.t
+++ b/t/add_depends.t
@@ -31,15 +31,15 @@ ok($IkiWiki::depends_simple{foo0}{"bar"} & $IkiWiki::DEPEND_CONTENT);
 ok(! ($IkiWiki::depends_simple{foo0}{"bar"} & ($IkiWiki::DEPEND_PRESENCE | $IkiWiki::DEPEND_LINKS)));
 
 # adding other dep types standalone
-ok(add_depends("foo2", "*", presence => 1));
-ok(add_depends("foo2", "bar", links => 1));
+ok(add_depends("foo2", "*", deptype("presence")));
+ok(add_depends("foo2", "bar", deptype("links")));
 ok($IkiWiki::depends{foo2}{"*"} & $IkiWiki::DEPEND_PRESENCE);
 ok(! ($IkiWiki::depends{foo2}{"*"} & ($IkiWiki::DEPEND_CONTENT | $IkiWiki::DEPEND_LINKS)));
 ok($IkiWiki::depends_simple{foo2}{"bar"} & $IkiWiki::DEPEND_LINKS);
 ok(! ($IkiWiki::depends_simple{foo2}{"bar"} & ($IkiWiki::DEPEND_PRESENCE | $IkiWiki::DEPEND_CONTENT)));
 
 # adding combined dep types
-ok(add_depends("foo2", "baz", links => 1, presence => 1));
+ok(add_depends("foo2", "baz", deptype("links". "presence")));
 ok($IkiWiki::depends_simple{foo2}{"baz"} & $IkiWiki::DEPEND_LINKS);
 ok($IkiWiki::depends_simple{foo2}{"baz"} & $IkiWiki::DEPEND_PRESENCE);
 ok(! ($IkiWiki::depends_simple{foo2}{"baz"} & $IkiWiki::DEPEND_CONTENT));
@@ -49,10 +49,10 @@ ok(add_depends("foo2", "baz"));
 ok($IkiWiki::depends_simple{foo2}{"baz"} & $IkiWiki::DEPEND_LINKS);
 ok($IkiWiki::depends_simple{foo2}{"baz"} & $IkiWiki::DEPEND_PRESENCE);
 ok(($IkiWiki::depends_simple{foo2}{"baz"} & $IkiWiki::DEPEND_CONTENT));
-ok(add_depends("foo2", "bar", presence => 1)); # had only links before
+ok(add_depends("foo2", "bar", deptype("presence"))); # had only links before
 ok($IkiWiki::depends_simple{foo2}{"bar"} & ($IkiWiki::DEPEND_LINKS | $IkiWiki::DEPEND_PRESENCE));
 ok(! ($IkiWiki::depends_simple{foo2}{"bar"} & $IkiWiki::DEPEND_CONTENT));
-ok(add_depends("foo0", "bar", links => 1)); # had only content before
+ok(add_depends("foo0", "bar", deptype("links"))); # had only content before
 ok($IkiWiki::depends{foo0}{"*"} & ($IkiWiki::DEPEND_CONTENT | $IkiWiki::DEPEND_LINKS));
 ok(! ($IkiWiki::depends{foo0}{"*"} & $IkiWiki::DEPEND_PRESENCE));
 
@@ -60,11 +60,11 @@ ok(! ($IkiWiki::depends{foo0}{"*"} & $IkiWiki::DEPEND_PRESENCE));
 # as an explicit dependency. In the case of a link, a links dependency.
 $links{foo0}=$links{foo9}=[qw{bar baz}];
 foreach my $spec ("* and ! link(bar)", "* or link(bar)") {
-	ok(add_depends("foo3", $spec, presence => 1));
+	ok(add_depends("foo3", $spec, deptype("presence")));
 	ok($IkiWiki::depends{foo3}{$spec} & $IkiWiki::DEPEND_PRESENCE);
 	ok(! ($IkiWiki::depends{foo3}{$spec} & ($IkiWiki::DEPEND_CONTENT | $IkiWiki::DEPEND_LINKS)));
 	ok($IkiWiki::depends_simple{foo3}{foo3} == $IkiWiki::DEPEND_LINKS);
-	ok(add_depends("foo4", $spec, links => 1));
+	ok(add_depends("foo4", $spec, deptype("links")));
 	ok($IkiWiki::depends{foo4}{$spec} & $IkiWiki::DEPEND_LINKS);
 	ok(! ($IkiWiki::depends{foo4}{$spec} & ($IkiWiki::DEPEND_CONTENT | $IkiWiki::DEPEND_PRESENCE)));
 	ok($IkiWiki::depends_simple{foo4}{foo4} == $IkiWiki::DEPEND_LINKS);
@@ -73,15 +73,15 @@ foreach my $spec ("* and ! link(bar)", "* or link(bar)") {
 # a pagespec with backlinks() will add as an influence the page with the links
 $links{foo0}=[qw{foo5 foo7}];
 foreach my $spec ("bugs or (backlink(foo0) and !*.png)", "backlink(foo)") {
-	ok(add_depends("foo5", $spec, presence => 1));
+	ok(add_depends("foo5", $spec, deptype("presence")));
 	ok($IkiWiki::depends{foo5}{$spec} & $IkiWiki::DEPEND_PRESENCE);
 	ok(! ($IkiWiki::depends{foo5}{$spec} & ($IkiWiki::DEPEND_CONTENT | $IkiWiki::DEPEND_LINKS)));
 	ok($IkiWiki::depends_simple{foo5}{foo0} == $IkiWiki::DEPEND_LINKS);
-	ok(add_depends("foo6", $spec, links => 1));
+	ok(add_depends("foo6", $spec, deptype("links")));
 	ok($IkiWiki::depends{foo6}{$spec} & $IkiWiki::DEPEND_LINKS);
 	ok(! ($IkiWiki::depends{foo6}{$spec} & ($IkiWiki::DEPEND_PRESENCE | $IkiWiki::DEPEND_CONTENT)));
 	ok($IkiWiki::depends_simple{foo5}{foo0} == $IkiWiki::DEPEND_LINKS);
-	ok(add_depends("foo7", $spec, presence => 1, links => 1));
+	ok(add_depends("foo7", $spec, deptype("presence", "links")));
 	ok($IkiWiki::depends{foo7}{$spec} & $IkiWiki::DEPEND_PRESENCE);
 	ok($IkiWiki::depends{foo7}{$spec} & $IkiWiki::DEPEND_LINKS);
 	ok(! ($IkiWiki::depends{foo7}{$spec} & $IkiWiki::DEPEND_CONTENT));
@@ -93,6 +93,6 @@ foreach my $spec ("bugs or (backlink(foo0) and !*.png)", "backlink(foo)") {
 }
 
 # content is the default if unknown types are entered
-ok(add_depends("foo9", "*", presenCe => 1));
+ok(add_depends("foo9", "*", deptype("monkey")));
 ok($IkiWiki::depends{foo9}{"*"} & $IkiWiki::DEPEND_CONTENT);
 ok(! ($IkiWiki::depends{foo9}{"*"} & ($IkiWiki::DEPEND_PRESENCE | $IkiWiki::DEPEND_LINKS)));