move influence tests to pagespec_match_list.t

2 files changed, 56 insertions, 38 deletions

diff --git a/t/add_depends.t b/t/add_depends.t
index fce7a76c6..e3f0b6603 100755
--- a/t/add_depends.t
+++ b/t/add_depends.t
@@ -56,42 +56,6 @@ 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));
 
-# Adding a pagespec that requires page metadata should add the influence
-# 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, 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, 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);
-}
-
-# 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, 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, 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, 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));
-	ok($IkiWiki::depends_simple{foo7}{foo0} == $IkiWiki::DEPEND_LINKS);
-	ok(add_depends("foo8", $spec));
-	ok($IkiWiki::depends{foo8}{$spec} & $IkiWiki::DEPEND_CONTENT);
-	ok(! ($IkiWiki::depends{foo8}{$spec} & ($IkiWiki::DEPEND_PRESENCE | $IkiWiki::DEPEND_LINKS)));
-	ok($IkiWiki::depends_simple{foo8}{foo0} == $IkiWiki::DEPEND_LINKS);
-}
-
 # content is the default if unknown types are entered
 ok(add_depends("foo9", "*", deptype("monkey")));
 ok($IkiWiki::depends{foo9}{"*"} & $IkiWiki::DEPEND_CONTENT);
diff --git a/t/pagespec_match_list.t b/t/pagespec_match_list.t
index 85a30b542..301197cc1 100755
--- a/t/pagespec_match_list.t
+++ b/t/pagespec_match_list.t
@@ -1,19 +1,29 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
-use Test::More tests => 10;
+use Test::More tests => 49;
 
 BEGIN { use_ok("IkiWiki"); }
 
+%config=IkiWiki::defaultconfig();
+$config{srcdir}=$config{destdir}="/dev/null";
+IkiWiki::checkconfig();
+
 %pagesources=(
 	foo => "foo.mdwn",
+	foo2 => "foo2.mdwn",
+	foo3 => "foo3.mdwn",
 	bar => "bar.mdwn",
 	"post/1" => "post/1.mdwn",
 	"post/2" => "post/2.mdwn",
 	"post/3" => "post/3.mdwn",
 );
+$links{foo}=[qw{post/1 post/2}];
+$links{foo2}=[qw{bar}];
+$links{foo3}=[qw{bar}];
 
 is_deeply([pagespec_match_list("foo", "bar")], ["bar"]);
+is_deeply([sort(pagespec_match_list("foo", "* and !post/*"))], ["bar", "foo", "foo2", "foo3"]);
 is_deeply([sort(pagespec_match_list("foo", "post/*"))], ["post/1", "post/2", "post/3"]);
 is_deeply([pagespec_match_list("foo", "post/*", sort => "title", reverse => 1)],
 	["post/3", "post/2", "post/1"]);
@@ -22,10 +32,54 @@ is_deeply([pagespec_match_list("foo", "post/*", sort => "title", num => 2)],
 is_deeply([pagespec_match_list("foo", "post/*", sort => "title", num => 50)],
 	["post/1", "post/2", "post/3"]);
 is_deeply([pagespec_match_list("foo", "post/*", sort => "title",
-                         limit => sub { $_[0] !~ /3/}) ],
+                         filter => sub { $_[0] =~ /3/}) ],
 	["post/1", "post/2"]);
 my $r=eval { pagespec_match_list("foo", "beep") };
 ok(eval { pagespec_match_list("foo", "beep") } == 0);
 ok(! $@, "does not fail with error when unable to match anything");
 eval { pagespec_match_list("foo", "this is not a legal pagespec!") };
 ok($@, "fails with error when pagespec bad");
+
+# A pagespec that requires page metadata should add influences
+# as an explicit dependency. In the case of a link, a links dependency.
+foreach my $spec ("* and link(bar)", "* or link(bar)") {
+	pagespec_match_list("foo2", $spec, deptype => deptype("presence"));
+	ok($IkiWiki::depends{foo2}{$spec} & $IkiWiki::DEPEND_PRESENCE);
+	ok(! ($IkiWiki::depends{foo2}{$spec} & ($IkiWiki::DEPEND_CONTENT | $IkiWiki::DEPEND_LINKS)));
+	ok($IkiWiki::depends_simple{foo2}{foo2} == $IkiWiki::DEPEND_LINKS);
+	%IkiWiki::depends_simple=();
+	%IkiWiki::depends=();
+	pagespec_match_list("foo3", $spec, deptype => deptype("links"));
+	ok($IkiWiki::depends{foo3}{$spec} & $IkiWiki::DEPEND_LINKS);
+	ok(! ($IkiWiki::depends{foo3}{$spec} & ($IkiWiki::DEPEND_CONTENT | $IkiWiki::DEPEND_PRESENCE)));
+	ok($IkiWiki::depends_simple{foo3}{foo3} == $IkiWiki::DEPEND_LINKS);
+	%IkiWiki::depends_simple=();
+	%IkiWiki::depends=();
+}
+
+# a pagespec with backlinks() will add as an influence the page with the links
+foreach my $spec ("bar or (backlink(foo) and !*.png)", "backlink(foo)") {
+	pagespec_match_list("foo2", $spec, deptype => deptype("presence"));
+	ok($IkiWiki::depends{foo2}{$spec} & $IkiWiki::DEPEND_PRESENCE);
+	ok(! ($IkiWiki::depends{foo2}{$spec} & ($IkiWiki::DEPEND_CONTENT | $IkiWiki::DEPEND_LINKS)));
+	ok($IkiWiki::depends_simple{foo2}{foo} == $IkiWiki::DEPEND_LINKS);
+	%IkiWiki::depends_simple=();
+	%IkiWiki::depends=();
+	pagespec_match_list("foo2", $spec, deptype => deptype("links"));
+	ok($IkiWiki::depends{foo2}{$spec} & $IkiWiki::DEPEND_LINKS);
+	ok(! ($IkiWiki::depends{foo2}{$spec} & ($IkiWiki::DEPEND_PRESENCE | $IkiWiki::DEPEND_CONTENT)));
+	ok($IkiWiki::depends_simple{foo2}{foo} == $IkiWiki::DEPEND_LINKS);
+	%IkiWiki::depends_simple=();
+	%IkiWiki::depends=();
+	pagespec_match_list("foo2", $spec, deptype => deptype("presence", "links"));
+	ok($IkiWiki::depends{foo2}{$spec} & $IkiWiki::DEPEND_PRESENCE);
+	ok($IkiWiki::depends{foo2}{$spec} & $IkiWiki::DEPEND_LINKS);
+	ok(! ($IkiWiki::depends{foo2}{$spec} & $IkiWiki::DEPEND_CONTENT));
+	ok($IkiWiki::depends_simple{foo2}{foo} == $IkiWiki::DEPEND_LINKS);
+	%IkiWiki::depends_simple=();
+	%IkiWiki::depends=();
+	pagespec_match_list("foo2", $spec);
+	ok($IkiWiki::depends{foo2}{$spec} & $IkiWiki::DEPEND_CONTENT);
+	ok(! ($IkiWiki::depends{foo2}{$spec} & ($IkiWiki::DEPEND_PRESENCE | $IkiWiki::DEPEND_LINKS)));
+	ok($IkiWiki::depends_simple{foo2}{foo} == $IkiWiki::DEPEND_LINKS);
+}