Merge commit 'origin/master' into prv/po

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

diff --git a/t/pagespec_match.t b/t/pagespec_match.t
index 038472967be3670188515982fa31f9b5419eee0c..c61d1612285944c96f05c99ef02dded5ac1edb0a 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 => 52;
+use Test::More tests => 56;
 
 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", "*.*"));
@@ -51,6 +53,8 @@ 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");
 
 $IkiWiki::pagectime{foo}=1154532692; # Wed Aug  2 11:26 EDT 2006
 $IkiWiki::pagectime{bar}=1154532695; # after
@@ -69,7 +73,7 @@ ok(! pagespec_match("foo", "no_such_function(foo)"), "foo");
 
 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");