X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/d1061d0094febfc21957554655a8eff4663b00ca..9eb229bfc73066e5d12d5a199c77f63d5881dfb7:/t/add_depends.t?ds=sidebyside

diff --git a/t/add_depends.t b/t/add_depends.t
index 2d686a17d..e3f0b6603 100755
--- a/t/add_depends.t
+++ b/t/add_depends.t
@@ -8,36 +8,38 @@ BEGIN { use_ok("IkiWiki"); }
 $config{srcdir}=$config{destdir}="/dev/null";
 IkiWiki::checkconfig();
 
+$pagesources{"foo$_"}="foo$_.mdwn" for 0..9;
+
 # avoids adding an unparseable pagespec
-ok(! add_depends("foo", "foo and (bar"));
-ok(! add_depends("foo", "foo another"));
+ok(! add_depends("foo0", "foo and (bar"));
+ok(! add_depends("foo0", "foo another"));
 
 # simple and not-so-simple dependencies split
-ok(add_depends("foo", "*"));
-ok(add_depends("foo", "bar"));
-ok(add_depends("foo", "BAZ"));
-ok(exists $IkiWiki::depends_simple{foo}{"bar"});
-ok(exists $IkiWiki::depends_simple{foo}{"baz"}); # lowercase
-ok(! exists $IkiWiki::depends_simple{foo}{"*"});
-ok(! exists $IkiWiki::depends{foo}{"bar"});
-ok(! exists $IkiWiki::depends{foo}{"baz"});
+ok(add_depends("foo0", "*"));
+ok(add_depends("foo0", "bar"));
+ok(add_depends("foo0", "BAZ"));
+ok(exists $IkiWiki::depends_simple{foo0}{"bar"});
+ok(exists $IkiWiki::depends_simple{foo0}{"baz"}); # lowercase
+ok(! exists $IkiWiki::depends_simple{foo0}{"*"});
+ok(! exists $IkiWiki::depends{foo0}{"bar"});
+ok(! exists $IkiWiki::depends{foo0}{"baz"});
 
 # default dependencies are content dependencies
-ok($IkiWiki::depends{foo}{"*"} & $IkiWiki::DEPEND_CONTENT);
-ok(! ($IkiWiki::depends{foo}{"*"} & ($IkiWiki::DEPEND_PRESENCE | $IkiWiki::DEPEND_LINKS)));
-ok($IkiWiki::depends_simple{foo}{"bar"} & $IkiWiki::DEPEND_CONTENT);
-ok(! ($IkiWiki::depends_simple{foo}{"bar"} & ($IkiWiki::DEPEND_PRESENCE | $IkiWiki::DEPEND_LINKS)));
+ok($IkiWiki::depends{foo0}{"*"} & $IkiWiki::DEPEND_CONTENT);
+ok(! ($IkiWiki::depends{foo0}{"*"} & ($IkiWiki::DEPEND_PRESENCE | $IkiWiki::DEPEND_LINKS)));
+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));
@@ -47,46 +49,14 @@ 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("foo", "bar", links => 1)); # had only content before
-ok($IkiWiki::depends{foo}{"*"} & ($IkiWiki::DEPEND_CONTENT | $IkiWiki::DEPEND_LINKS));
-ok(! ($IkiWiki::depends{foo}{"*"} & $IkiWiki::DEPEND_PRESENCE));
-
-# adding a pagespec that requires page metadata should cause a fallback to
-# a content dependency
-foreach my $spec ("* and ! link(bar)", "* or link(bar)", "unknownspec()",
-	"title(hi)",
-	"* or unknown(yo)", # this one could actually be acceptably be
-	                    # detected to not need a content dep .. in
-			    # theory!
-	) {
-	ok(add_depends("foo3", $spec, presence => 1));
-	ok($IkiWiki::depends{foo3}{$spec} & $IkiWiki::DEPEND_CONTENT);
-	ok(! ($IkiWiki::depends{foo3}{$spec} & ($IkiWiki::DEPEND_PRESENCE | $IkiWiki::DEPEND_LINKS)));
-	ok(add_depends("foo4", $spec, links => 1));
-	ok($IkiWiki::depends{foo3}{$spec} & $IkiWiki::DEPEND_CONTENT);
-	ok(! ($IkiWiki::depends{foo3}{$spec} & ($IkiWiki::DEPEND_PRESENCE | $IkiWiki::DEPEND_LINKS)));
-}
-
-# a pagespec with backlinks() in it is acceptable for a links dependency,
-# but not a presence dependency
-foreach my $spec ("index or (backlink(index) and !*.png)", "backlink(foo)") {
-	ok(add_depends("foo5", $spec, presence => 1));
-	ok($IkiWiki::depends{foo5}{$spec} & $IkiWiki::DEPEND_CONTENT);
-	ok(! ($IkiWiki::depends{foo5}{$spec} & ($IkiWiki::DEPEND_PRESENCE | $IkiWiki::DEPEND_LINKS)));
-	ok(add_depends("foo6", $spec, links => 1));
-	ok($IkiWiki::depends{foo6}{$spec} & $IkiWiki::DEPEND_LINKS);
-	ok(! ($IkiWiki::depends{foo6}{$spec} & ($IkiWiki::DEPEND_PRESENCE | $IkiWiki::DEPEND_CONTENT)));
-	# combining both ends up with a content+links dependency
-	ok(add_depends("foo7", $spec, presence => 1, links => 1));
-	ok($IkiWiki::depends{foo7}{$spec} & $IkiWiki::DEPEND_CONTENT);
-	ok($IkiWiki::depends{foo7}{$spec} & $IkiWiki::DEPEND_LINKS);
-	ok(! ($IkiWiki::depends{foo7}{$spec} & $IkiWiki::DEPEND_PRESENCE));
-}
+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));
 
 # content is the default if unknown types are entered
-ok(add_depends("foo8", "*", presenCe => 1));
-ok($IkiWiki::depends{foo8}{"*"} & $IkiWiki::DEPEND_CONTENT);
-ok(! ($IkiWiki::depends{foo8}{"*"} & ($IkiWiki::DEPEND_PRESENCE | $IkiWiki::DEPEND_LINKS)));
+ok(add_depends("foo9", "*", deptype("monkey")));
+ok($IkiWiki::depends{foo9}{"*"} & $IkiWiki::DEPEND_CONTENT);
+ok(! ($IkiWiki::depends{foo9}{"*"} & ($IkiWiki::DEPEND_PRESENCE | $IkiWiki::DEPEND_LINKS)));