X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/ee84ed37709ab91e419cdfa748ab0d8e71bf99b6..7922a663c08bafffc010c7700c1a5759abc4d443:/t/pagespec_match.t

diff --git a/t/pagespec_match.t b/t/pagespec_match.t
index 1863b9cba..3a641c6a8 100755
--- a/t/pagespec_match.t
+++ b/t/pagespec_match.t
@@ -1,43 +1,84 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
-use Test::More tests => 31;
+use Test::More tests => 54;
 
 BEGIN { use_ok("IkiWiki"); }
 
-ok(IkiWiki::pagespec_match("foo", "*"));
-ok(IkiWiki::pagespec_match("page", "?ag?"));
-ok(! IkiWiki::pagespec_match("page", "?a?g?"));
-ok(IkiWiki::pagespec_match("foo.png", "*.*"));
-ok(! IkiWiki::pagespec_match("foo", "*.*"));
-ok(IkiWiki::pagespec_match("foo", "foo or bar"), "simple list");
-ok(IkiWiki::pagespec_match("bar", "foo or bar"), "simple list 2");
-ok(IkiWiki::pagespec_match("foo", "f?? and !foz"));
-ok(! IkiWiki::pagespec_match("foo", "f?? and !foo"));
-ok(! IkiWiki::pagespec_match("foo", "* and !foo"));
-ok(! IkiWiki::pagespec_match("foo", "foo and !foo"));
-ok(! IkiWiki::pagespec_match("foo.png", "* and !*.*"));
-ok(IkiWiki::pagespec_match("foo", "(bar or ((meep and foo) or (baz or foo) or beep))"));
-
-$IkiWiki::links{foo}=[qw{bar baz}];
-ok(IkiWiki::pagespec_match("foo", "link(bar)"));
-ok(! IkiWiki::pagespec_match("foo", "link(quux)"));
-ok(IkiWiki::pagespec_match("bar", "backlink(foo)"));
-ok(! IkiWiki::pagespec_match("quux", "backlink(foo)"));
+ok(pagespec_match("foo", "*"));
+ok(pagespec_match("page", "?ag?"));
+ok(! pagespec_match("page", "?a?g?"));
+ok(pagespec_match("foo.png", "*.*"));
+ok(! pagespec_match("foo", "*.*"));
+ok(pagespec_match("foo", "foo or bar"), "simple list");
+ok(pagespec_match("bar", "foo or bar"), "simple list 2");
+ok(pagespec_match("foo", "f?? and !foz"));
+ok(! pagespec_match("foo", "f?? and !foo"));
+ok(! pagespec_match("foo", "* and !foo"));
+ok(! pagespec_match("foo", "foo and !foo"));
+ok(! pagespec_match("foo.png", "* and !*.*"));
+ok(pagespec_match("foo", "(bar or ((meep and foo) or (baz or foo) or beep))"));
+ok(! pagespec_match("a/foo", "foo", location => "a/b"), "nonrelative fail");
+ok(! pagespec_match("foo", "./*", location => "a/b"), "relative fail");
+ok(pagespec_match("a/foo", "./*", location => "a/b"), "relative");
+ok(pagespec_match("a/b/foo", "./*", location => "a/b"), "relative 2");
+ok(pagespec_match("a/foo", "./*", "a/b"), "relative oldstyle call");
+ok(pagespec_match("foo", "./*", location => "a"), "relative toplevel");
+ok(pagespec_match("foo/bar", "*", location => "baz"), "absolute");
+ok(! pagespec_match("foo", "foo and bar"), "foo and bar");
+
+# The link and backlink stuff needs this.
+$config{userdir}="";
+$links{foo}=[qw{bar baz}];
+$links{bar}=[];
+$links{baz}=[];
+$links{"bugs/foo"}=[qw{bugs/done}];
+$links{"bugs/done"}=[];
+$links{"bugs/bar"}=[qw{done}];
+$links{"done"}=[];
+$links{"examples/softwaresite/bugs/fails_to_frobnicate"}=[qw{done}];
+$links{"examples/softwaresite/bugs/done"}=[];
+
+ok(pagespec_match("foo", "link(bar)"), "link");
+ok(pagespec_match("foo", "link(ba?)"), "glob link");
+ok(! pagespec_match("foo", "link(quux)"), "failed link");
+ok(! pagespec_match("foo", "link(qu*)"), "failed glob link");
+ok(pagespec_match("bugs/foo", "link(done)", location => "bugs/done"), "link match to bestlink");
+ok(! pagespec_match("examples/softwaresite/bugs/done", "link(done)", 
+		location => "bugs/done"), "link match to bestlink");
+ok(pagespec_match("examples/softwaresite/bugs/fails_to_frobnicate", 
+		"link(./done)", location => "examples/softwaresite/bugs/done"), "link relative");
+ok(! pagespec_match("foo", "link(./bar)", location => "foo/bar"), "link relative fail");
+ok(pagespec_match("bar", "backlink(foo)"), "backlink");
+ok(! pagespec_match("quux", "backlink(foo)"), "failed backlink");
 
 $IkiWiki::pagectime{foo}=1154532692; # Wed Aug  2 11:26 EDT 2006
-ok(IkiWiki::pagespec_match("foo", "creation_year(2006)"), "year");
-ok(! IkiWiki::pagespec_match("foo", "creation_year(2005)"), "other year");
-ok(IkiWiki::pagespec_match("foo", "creation_month(8)"), "month");
-ok(! IkiWiki::pagespec_match("foo", "creation_month(9)"), "other month");
-ok(IkiWiki::pagespec_match("foo", "creation_day(2)"), "day");
-ok(! IkiWiki::pagespec_match("foo", "creation_day(3)"), "other day");
+$IkiWiki::pagectime{bar}=1154532695; # after
+ok(pagespec_match("foo", "created_before(bar)"));
+ok(! pagespec_match("foo", "created_after(bar)"));
+ok(! pagespec_match("bar", "created_before(foo)"));
+ok(pagespec_match("bar", "created_after(foo)"));
+ok(pagespec_match("foo", "creation_year(2006)"), "year");
+ok(! pagespec_match("foo", "creation_year(2005)"), "other year");
+ok(pagespec_match("foo", "creation_month(8)"), "month");
+ok(! pagespec_match("foo", "creation_month(9)"), "other month");
+ok(pagespec_match("foo", "creation_day(2)"), "day");
+ok(! pagespec_match("foo", "creation_day(3)"), "other day");
+
+ok(! pagespec_match("foo", "no_such_function(foo)"), "foo");
+
+ok(pagespec_match("foo", "foo and user(bar)", user => "bar"), "user");
+ok(! pagespec_match("foo", "foo and user(bar)", user => "baz"), "user fail");
+
+my $ret=pagespec_match("foo", "(invalid");
+ok(! $ret, "syntax error");
+ok($ret eq "syntax error", "error message");
 
 # old style globlists
-ok(IkiWiki::pagespec_match("foo", "foo bar"), "simple list");
-ok(IkiWiki::pagespec_match("bar", "foo bar"), "simple list 2");
-ok(IkiWiki::pagespec_match("foo", "f?? !foz"));
-ok(! IkiWiki::pagespec_match("foo", "f?? !foo"));
-ok(! IkiWiki::pagespec_match("foo", "* !foo"));
-ok(! IkiWiki::pagespec_match("foo", "foo !foo"));
-ok(! IkiWiki::pagespec_match("foo.png", "* !*.*"));
+ok(pagespec_match("foo", "foo bar"), "simple list");
+ok(pagespec_match("bar", "foo bar"), "simple list 2");
+ok(pagespec_match("foo", "f?? !foz"));
+ok(! pagespec_match("foo", "f?? !foo"));
+ok(! pagespec_match("foo", "* !foo"));
+ok(! pagespec_match("foo", "foo !foo"));
+ok(! pagespec_match("foo.png", "* !*.*"));