From cca5b123ae93a811b335815b0f754c4e4f44c8d4 Mon Sep 17 00:00:00 2001
From: Max Kanat-Alexander <mkanat@bugzilla.org>
Date: Mon, 16 May 2011 20:12:51 -0700
Subject: Bug 657542: Make the AND/OR tests for xt/search.t function properly
 and catch known-broken tests as it's supposed to. r=mkanat, a=mkanat (module
 owner)

---
 xt/lib/Bugzilla/Test/Search/AndTest.pm | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'xt/lib/Bugzilla/Test/Search/AndTest.pm')

diff --git a/xt/lib/Bugzilla/Test/Search/AndTest.pm b/xt/lib/Bugzilla/Test/Search/AndTest.pm
index b4554584b..b7f8b3cab 100644
--- a/xt/lib/Bugzilla/Test/Search/AndTest.pm
+++ b/xt/lib/Bugzilla/Test/Search/AndTest.pm
@@ -40,12 +40,10 @@ sub bug_is_contained {
     return all { $_->bug_is_contained($number) } $self->field_tests;
 }
 
-########################
-# SKIP & TODO Messages #
-########################
-
-sub _join_skip { () }
-sub _join_broken_constant { {} }
+sub _bug_will_actually_be_contained {
+    my ($self, $number) = @_;
+    return all { $_->will_actually_contain_bug($number) } $self->field_tests;
+}
 
 ##############################
 # Bugzilla::Search arguments #
@@ -65,4 +63,4 @@ sub search_params {
     return \%params;
 }
 
-1;
\ No newline at end of file
+1;
-- 
cgit v1.2.3-24-g4f1b