Merge commit 'origin/master' into pub/master

[git.ikiwiki.info.git] / t / pagespec_match.t

diff --git a/t/pagespec_match.t b/t/pagespec_match.t
index f0cadcdc76843a63e3de5f615c70e3521b086978..7c0ac235b8b522391885816d76040f88a79a6406 100755 (executable)
--- a/t/pagespec_match.t
+++ b/t/pagespec_match.t
@@ -1,11 +1,13 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
-use Test::More tests => 51;
+use Test::More tests => 58;
 
 BEGIN { use_ok("IkiWiki"); }
 
 ok(pagespec_match("foo", "*"));
+ok(!pagespec_match("foo", ""));
+ok(pagespec_match("foo", "!bar"));
 ok(pagespec_match("page", "?ag?"));
 ok(! pagespec_match("page", "?a?g?"));
 ok(pagespec_match("foo.png", "*.*"));
@@ -25,6 +27,7 @@ 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}="";
@@ -37,9 +40,12 @@ $links{"bugs/bar"}=[qw{done}];
 $links{"done"}=[];
 $links{"examples/softwaresite/bugs/fails_to_frobnicate"}=[qw{done}];
 $links{"examples/softwaresite/bugs/done"}=[];
+$links{"ook"}=[qw{/blog/tags/foo}];
 
 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");
@@ -48,6 +54,10 @@ ok(pagespec_match("examples/softwaresite/bugs/fails_to_frobnicate",
 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");
+ok(! pagespec_match("bar", ""), "empty pagespec should match nothing");
+ok(! pagespec_match("bar", "           "), "blank pagespec should match nothing");
+ok(pagespec_match("ook", "link(blog/tags/foo)"), "link internal absolute success");
+ok(pagespec_match("ook", "link(/blog/tags/foo)"), "link explicit absolute success");
 
 $IkiWiki::pagectime{foo}=1154532692; # Wed Aug  2 11:26 EDT 2006
 $IkiWiki::pagectime{bar}=1154532695; # after
@@ -64,12 +74,9 @@ 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");
+ok($ret =~ /syntax error/, "error message");
 
 # old style globlists
 ok(pagespec_match("foo", "foo bar"), "simple list");