X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/60edd2dc3157f756f4f7a213ee15836fe7bbb769..e0d6ef53d81456eb9edb2899e1838654d2c95191:/t/pagespec_match_list.t

diff --git a/t/pagespec_match_list.t b/t/pagespec_match_list.t
index 309961f1c..7ff178aad 100755
--- a/t/pagespec_match_list.t
+++ b/t/pagespec_match_list.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
-use Test::More tests => 90;
+use Test::More tests => 126;
 
 BEGIN { use_ok("IkiWiki"); }
 
@@ -9,7 +9,11 @@ BEGIN { use_ok("IkiWiki"); }
 $config{srcdir}=$config{destdir}="/dev/null";
 IkiWiki::checkconfig();
 
-hook(type => "sort", id => "path", call => sub { $_[0] cmp $_[1] });
+{
+	package IkiWiki::SortSpec;
+
+	sub cmp_raw_path { $a cmp $b }
+}
 
 %pagesources=(
 	foo => "foo.mdwn",
@@ -23,6 +27,8 @@ hook(type => "sort", id => "path", call => sub { $_[0] cmp $_[1] });
 $IkiWiki::pagectime{foo} = 2;
 $IkiWiki::pagectime{foo2} = 2;
 $IkiWiki::pagectime{foo3} = 1;
+$IkiWiki::pagectime{foo4} = 1;
+$IkiWiki::pagectime{foo5} = 1;
 $IkiWiki::pagectime{bar} = 3;
 $IkiWiki::pagectime{"post/1"} = 6;
 $IkiWiki::pagectime{"post/2"} = 6;
@@ -34,16 +40,20 @@ $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")],
+	["post/1", "post/2", "post/3"]);
 is_deeply([pagespec_match_list("foo", "post/*", sort => "title", reverse => 1)],
 	["post/3", "post/2", "post/1"]);
 is_deeply([pagespec_match_list("foo", "post/*", sort => "title", num => 2)],
 	["post/1", "post/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", num => 50, reverse => 1)],
+	["post/3", "post/2", "post/1"]);
 is_deeply([pagespec_match_list("foo", "post/*", sort => "title",
                          filter => sub { $_[0] =~ /3/}) ],
 	["post/1", "post/2"]);
-is_deeply([pagespec_match_list("foo", "*", sort => "path", num => 2)],
+is_deeply([pagespec_match_list("foo", "*", sort => "raw_path", num => 2)],
 	["bar", "foo"]);
 is_deeply([pagespec_match_list("foo", "foo* or bar*",
 		sort => "-age title")], # oldest first, break ties by title
@@ -71,18 +81,44 @@ foreach my $spec ("* and link(bar)", "* or link(bar)") {
 	%IkiWiki::depends=();
 }
 
+# A link pagespec is influenced by the pages that currently contain the link.
+# It is not influced by pages that do not currently contain the link,
+# because if those pages were changed to contain it, regular dependency
+# handling would be triggered.
+foreach my $spec ("* and link(bar)", "link(bar)", "no_such_page or link(bar)") {
+	pagespec_match_list("foo2", $spec);
+	ok($IkiWiki::depends_simple{foo2}{foo2} == $IkiWiki::DEPEND_LINKS);
+	ok(! exists $IkiWiki::depends_simple{foo2}{foo}, $spec);
+	%IkiWiki::depends_simple=();
+	%IkiWiki::depends=();
+}
+
+# Oppositely, a pagespec that tests for pages that do not have a link
+# is not influenced by pages that currently contain the link, but
+# is instead influenced by pages that currently do not (but that
+# could be changed to have it).
+foreach my $spec ("* and !link(bar)", "* and !(!(!link(bar)))") {
+	pagespec_match_list("foo2", $spec);
+	ok(! exists $IkiWiki::depends_simple{foo2}{foo2});
+	ok($IkiWiki::depends_simple{foo2}{foo} == $IkiWiki::DEPEND_LINKS, $spec);
+	%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)") {
+foreach my $spec ("bar or (backlink(foo) and !*.png)", "backlink(foo)", "!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);
+	ok(! exists $IkiWiki::depends_simple{foo2}{foo2});
 	%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);
+	ok(! exists $IkiWiki::depends_simple{foo2}{foo2});
 	%IkiWiki::depends_simple=();
 	%IkiWiki::depends=();
 	pagespec_match_list("foo2", $spec, deptype => deptype("presence", "links"));
@@ -90,6 +126,7 @@ foreach my $spec ("bar or (backlink(foo) and !*.png)", "backlink(foo)") {
 	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);
+	ok(! exists $IkiWiki::depends_simple{foo2}{foo2});
 	%IkiWiki::depends_simple=();
 	%IkiWiki::depends=();
 	pagespec_match_list("foo2", $spec);
@@ -124,3 +161,14 @@ foreach my $spec ("nosuchpage or link(bar)", "link(bar) or nosuchpage",
 	%IkiWiki::depends_simple=();
 	%IkiWiki::depends=();
 }
+
+my @ps;
+foreach my $p (100..500) {
+	$IkiWiki::pagectime{"p/$p"} = $p;
+	$pagesources{"p/$p"} = "p/$p.mdwn";
+	unshift @ps, "p/$p";
+}
+is_deeply([pagespec_match_list("foo", "p/*", sort => "age")],
+	[@ps]);
+is_deeply([pagespec_match_list("foo", "p/*", sort => "age", num => 20)],
+	[@ps[0..19]]);