Merge branch 'master' into cvs

[ikiwiki.git] / t / pagespec_match_result.t

diff --git a/t/pagespec_match_result.t b/t/pagespec_match_result.t
index 2319d8733b333a2c4c46229af232b090a3c18395..13fcdcad01facfa842931a49ca3fcc1dd377585c 100755 (executable)
--- a/t/pagespec_match_result.t
+++ b/t/pagespec_match_result.t
@@ -1,15 +1,15 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
-use Test::More tests => 67;
+use Test::More tests => 138;
 
 BEGIN { use_ok("IkiWiki"); }
 
 # Note that new objects have to be constructed freshly for each test, since
 # object states are mutated as they are combined.
-sub S { IkiWiki::SuccessReason->new("match") }
-sub F { IkiWiki::FailReason->new("no match") }
-sub E { IkiWiki::ErrorReason->new("error in matching") }
+sub S { IkiWiki::SuccessReason->new("match", @_) }
+sub F { IkiWiki::FailReason->new("no match", @_) }
+sub E { IkiWiki::ErrorReason->new("error in matching", @_) }
 
 ok(S() eq "match");
 ok(F() eq "no match");
@@ -34,21 +34,51 @@ ok(!(S() & F()));
 ok(!(S() & F() & E()));
 ok(S() & (F() | F() | S()));
 
-# influences are always merged, no matter the operation performed,
-# as long as the two items are always both present
-foreach my $op ('$s | $f', '$s & $f', '$s & $f & E()', '$s | E() | $f',
-                '! $s | ! $f', '!(!(!$s)) | $f') {
-       my $s=S();
-       $s->influences(foo => 1, bar => 1);
+# influence merging tests
+foreach my $test (
+               ['$s | $f' => 1],       # OR merges
+                ['! $s | ! $f' => 1],  # OR merges with negated terms too
+               ['!(!(!$s)) | $f' => 1],# OR merges with multiple negation too
+               ['$s | $f | E()' => 1], # OR merges, even though E() has no influences
+               ['$s | E() | $f' => 1], # ditto
+               ['E() | $s | $f' => 1], # ditto
+               ['!$s | !$f | E()' => 1],# negated terms also do not block merges
+               ['!$s | E() | $f' => 1],# ditto
+               ['E() | $s | !$f' => 1],# ditto
+               ['$s & $f' => 1],       # AND merges if both items have influences
+               ['!$s & $f' => 1],      # AND merges negated terms too
+               ['$s & !$f' => 1],      # AND merges negated terms too
+               ['$s & $f & E()' => 0], # AND fails to merge since E() has no influences
+               ['$s & E() & $f' => 0], # ditto
+               ['E() & $s & $f' => 0], # ditto
+               ) {
+       my $op=$test->[0];
+       my $influence=$test->[1];
+
+       my $s=S(foo => 1, bar => 1);
        is($s->influences->{foo}, 1);
        is($s->influences->{bar}, 1);
-       my $f=F();
-       $f->influences(bar => 2, baz => 1);
+       my $f=F(bar => 2, baz => 1);
        is($f->influences->{bar}, 2);
        is($f->influences->{baz}, 1);
        my $c = eval $op;
        ok(ref $c);
-       is($c->influences->{foo}, 1, "foo ($op)");
-       is($c->influences->{bar}, (1 | 2), "bar ($op)");
-       is($c->influences->{baz}, 1, "baz ($op)");
+       if ($influence) {
+               is($c->influences->{foo}, 1, "foo ($op)");
+               is($c->influences->{bar}, (1 | 2), "bar ($op)");
+               is($c->influences->{baz}, 1, "baz ($op)");
+       }
+       else {
+               ok(! %{$c->influences}, "no influence for ($op)");
+       }
 }
+
+my $s=S(foo => 0, bar => 1);
+$s->influences(baz => 1);
+ok(! $s->influences->{foo}, "removed 0 influence");
+ok(! $s->influences->{bar}, "removed 1 influence");
+ok($s->influences->{baz}, "set influence");
+ok($s->influences_static);
+$s=S(foo => 0, bar => 1);
+$s->influences(baz => 1, "" => 1);
+ok(! $s->influences_static);