X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/1253db7de2ea703e03866436bed9c50561971de9..760a45ec06ba34d3f250525fd6a9e1328c799ff6:/t/pagespec_match.t

diff --git a/t/pagespec_match.t b/t/pagespec_match.t
index 20243dfa6..63c2a5098 100755
--- a/t/pagespec_match.t
+++ b/t/pagespec_match.t
@@ -1,48 +1,56 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
-use Test::More tests => 35;
+use Test::More tests => 42;
 
 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))"));
+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", "a/b"), "nonrelative fail");
+ok(! pagespec_match("foo", "./*", "a/b"), "relative fail");
+ok(pagespec_match("a/foo", "./*", "a/b"), "relative");
+ok(pagespec_match("a/b/foo", "./*", "a/b"), "relative 2");
+ok(pagespec_match("foo", "./*", "a"), "relative toplevel");
+ok(pagespec_match("foo/bar", "*", "baz"), "absolute");
 
-$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)"));
+$links{foo}=[qw{bar baz}];
+ok(pagespec_match("foo", "link(bar)", ""));
+ok(! pagespec_match("foo", "link(quux)", ""));
+ok(pagespec_match("bar", "backlink(foo)", ""));
+ok(! pagespec_match("quux", "backlink(foo)", ""));
 
 $IkiWiki::pagectime{foo}=1154532692; # Wed Aug  2 11:26 EDT 2006
 $IkiWiki::pagectime{bar}=1154532695; # after
-ok(IkiWiki::pagespec_match("foo", "created_before(bar)"));
-ok(! IkiWiki::pagespec_match("foo", "created_after(bar)"));
-ok(! IkiWiki::pagespec_match("bar", "created_before(foo)"));
-ok(IkiWiki::pagespec_match("bar", "created_after(foo)"));
-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");
+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");
 
 # 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", "* !*.*"));