X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/2794d7ef5abc4fa8fc2eb42d5c85ada197df0767..a69e3f26dde1ebdc84d5e69c2194a12cc11e953a:/t/pagespec_merge.t?ds=sidebyside

diff --git a/t/pagespec_merge.t b/t/pagespec_merge.t
index c2860709b..cbb06219c 100755
--- a/t/pagespec_merge.t
+++ b/t/pagespec_merge.t
@@ -3,20 +3,20 @@ use warnings;
 use strict;
 use Test::More tests => 25;
 
+BEGIN { use_ok("IkiWiki"); }
+
 sub same {
 	my $a=shift;
 	my $b=shift;
 	my $match=shift;
 	
-	my $imatch=(IkiWiki::pagespec_match($match, $a) ||
-		    IkiWiki::pagespec_match($match, $b));
-	my $cmatch=IkiWiki::pagespec_match($match, IkiWiki::pagespec_merge($a, $b));
+	my $imatch=(pagespec_match($match, $a) ||
+		    pagespec_match($match, $b));
+	my $cmatch=pagespec_match($match, IkiWiki::pagespec_merge($a, $b));
 	
 	return $imatch == $cmatch;
 }
 
-BEGIN { use_ok("IkiWiki"); }
-
 ok(same("foo", "bar", "foo"), "basic match 1");
 ok(same("foo", "bar", "bar"), "basic match 2");
 ok(same("foo", "bar", "foobar"), "basic failed match");
@@ -36,7 +36,7 @@ ok(same("f?? !f??", "!bar", "bar"), "matching glob and matching inverted glob");
 ok(same("b??", "!b?z", "bar"), "matching glob and non-matching inverted glob");
 ok(same("f?? !f?z", "!bar", "bar"), "matching glob and non-matching inverted glob");
 ok(same("!foo bar baz", "!bar", "bar"), "matching list and matching inversion");
-ok(IkiWiki::pagespec_match("foo/Discussion",
+ok(pagespec_match("foo/Discussion",
 	IkiWiki::pagespec_merge("* !*/Discussion", "*/Discussion")), "should match");
 ok(same("* !*/Discussion", "*/Discussion", "foo/Discussion"), "Discussion merge 1");
 ok(same("*/Discussion", "* !*/Discussion", "foo/Discussion"), "Discussion merge 2");