add some TODO tests for influence blocking

diff --git a/t/pagespec_match_list.t b/t/pagespec_match_list.t
index 301197cc167ac06a0f2819f1fdb4d991b33e340f..51145a9736946f64022901dbedd4ef73e980af2b 100755 (executable)
--- a/t/pagespec_match_list.t
+++ b/t/pagespec_match_list.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
-use Test::More tests => 49;
+use Test::More tests => 61;
 
 BEGIN { use_ok("IkiWiki"); }
 
@@ -82,4 +82,33 @@ foreach my $spec ("bar or (backlink(foo) and !*.png)", "backlink(foo)") {
        ok($IkiWiki::depends{foo2}{$spec} & $IkiWiki::DEPEND_CONTENT);
        ok(! ($IkiWiki::depends{foo2}{$spec} & ($IkiWiki::DEPEND_PRESENCE | $IkiWiki::DEPEND_LINKS)));
        ok($IkiWiki::depends_simple{foo2}{foo} == $IkiWiki::DEPEND_LINKS);
+       %IkiWiki::depends_simple=();
+       %IkiWiki::depends=();
+}
+
+TODO: {
+       local $TODO = "optimisation not yet written";
+
+# a pagespec that hard fails due to a glob, etc, will not set influences
+# for other terms that normally would.
+foreach my $spec ("nosuchpage and link(bar)", "link(bar) and */Discussion") {
+       pagespec_match_list("foo2", $spec, deptype => deptype("presence"));
+       ok($IkiWiki::depends{foo2}{$spec} & $IkiWiki::DEPEND_PRESENCE);
+       ok(! ($IkiWiki::depends{foo2}{$spec} & ($IkiWiki::DEPEND_CONTENT | $IkiWiki::DEPEND_LINKS)));
+       ok(! exists $IkiWiki::depends_simple{foo2}{foo2});
+       %IkiWiki::depends_simple=();
+       %IkiWiki::depends=();
+}
+
+# a pagespec containing a hard failure that is ored with another term will
+# get influences from the other term
+foreach my $spec ("nosuchpage or link(bar)", "link(bar) or */Discussion") {
+       pagespec_match_list("foo2", $spec, deptype => deptype("presence"));
+       ok($IkiWiki::depends{foo2}{$spec} & $IkiWiki::DEPEND_PRESENCE);
+       ok(! ($IkiWiki::depends{foo2}{$spec} & ($IkiWiki::DEPEND_CONTENT | $IkiWiki::DEPEND_LINKS)));
+       ok($IkiWiki::depends_simple{foo2}{foo2} == $IkiWiki::DEPEND_LINKS);
+       %IkiWiki::depends_simple=();
+       %IkiWiki::depends=();
+}
+
 }

diff --git a/t/pagespec_match_result.t b/t/pagespec_match_result.t
index c2112bf140a053a1bea125103caafea6622d4463..d9c31d6f062a47b8d976b1bf14d54b247d11957b 100755 (executable)
--- a/t/pagespec_match_result.t
+++ b/t/pagespec_match_result.t
@@ -57,21 +57,3 @@ ok(! $s->influences->{foo}, "removed 0 influence");
 ok(! $s->influences->{bar}, "removed 1 influence");
 ok($s->influences->{baz}, "set influence");
 ok($s->influences_static);
-
-# influence blocking
-my $r=F()->block & S(foo => 1);
-ok(! $r->influences->{foo}, "failed blocker & influence -> does not pass");
-$r=F()->block | S(foo => 1);
-ok($r->influences->{foo}, "failed blocker | influence -> does pass");
-$r=S(foo => 1) & F()->block;
-ok(! $r->influences->{foo}, "influence & failed blocker -> does not pass");
-$r=S(foo => 1) | F()->block;
-ok($r->influences->{foo}, "influence | failed blocker -> does pass");
-$r=S(foo => 1) & F()->block & S(foo => 2);
-ok(! $r->influences->{foo}, "influence & failed blocker & influence -> does not pass");
-$r=S(foo => 1) | F()->block | S(foo => 2);
-ok($r->influences->{foo}, "influence | failed blocker | influence -> does pass");
-$r=S()->block & S(foo => 1);
-ok($r->influences->{foo}, "successful blocker -> does pass");
-$r=(! S()->block) & S(foo => 1);
-ok(! $r->influences->{foo}, "! successful blocker -> failed blocker");