aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorSimon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>2009-07-25 20:04:04 +0100
committerSimon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>2009-08-25 00:31:40 +0100
commit1ea8580a5f912c305f8ea89431b39033522c657e (patch)
tree4a16878cabe1033e7431cc5b93947bdd39333a8b /t
parentbc6e50a075b164100d3144a13633647613a3dc8e (diff)
downloadikiwiki-1ea8580a5f912c305f8ea89431b39033522c657e.tar
ikiwiki-1ea8580a5f912c305f8ea89431b39033522c657e.tar.gz
Remove now-unused function pagespec_merge
Now that dependencies are a list of pagespecs with an implicit "or" operation, there's no need to try to merge pagespecs under normal use. ikiwiki-transition contains the only use of the function, so move it there rather than deleting it entirely (it's used to concatenate all admins' lists of locked pages).
Diffstat (limited to 't')
-rwxr-xr-xt/pagespec_merge.t44
1 files changed, 0 insertions, 44 deletions
diff --git a/t/pagespec_merge.t b/t/pagespec_merge.t
deleted file mode 100755
index 9e38d5761..000000000
--- a/t/pagespec_merge.t
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/usr/bin/perl
-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=(pagespec_match($match, $a) ||
- pagespec_match($match, $b));
- my $cmatch=pagespec_match($match, IkiWiki::pagespec_merge($a, $b));
-
- return $imatch == $cmatch;
-}
-
-ok(same("foo", "bar", "foo"), "basic match 1");
-ok(same("foo", "bar", "bar"), "basic match 2");
-ok(same("foo", "bar", "foobar"), "basic failed match");
-ok(same("foo", "!bar", "foo"), "basic match with inversion");
-ok(same("foo", "!bar", "bar"), "basic failed match with inversion");
-ok(same("!foo", "bar", "foo"), "basic failed match with inversion 2");
-ok(same("!foo", "bar", "bar"), "basic match with inversion 2");
-ok(same("!foo", "!bar", "foo"), "double inversion failed match");
-ok(same("!foo", "!bar", "bar"), "double inversion failed match 2");
-ok(same("*", "!bar", "foo"), "glob+inversion match");
-ok(same("*", "!bar", "bar"), "matching glob and matching inversion");
-ok(same("* and !foo", "!bar", "bar"), "matching glob and matching inversion");
-ok(same("* and !foo", "!bar", "foo"), "matching glob with matching inversion and non-matching inversion");
-ok(same("* and !foo", "!foo", "foo"), "matching glob with matching inversion and matching inversion");
-ok(same("b??", "!b??", "bar"), "matching glob and matching inverted glob");
-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(pagespec_match("foo/Discussion",
- IkiWiki::pagespec_merge("* and !*/Discussion", "*/Discussion")), "should match");
-ok(same("* and !*/Discussion", "*/Discussion", "foo/Discussion"), "Discussion merge 1");
-ok(same("*/Discussion", "* and !*/Discussion", "foo/Discussion"), "Discussion merge 2");
-ok(same("*/Discussion !*/bar", "*/bar !*/Discussion", "foo/Discussion"), "bidirectional merge 1");
-ok(same("*/Discussion !*/bar", "*/bar !*/Discussion", "foo/bar"), "bidirectional merge 2");