Return-Path: X-Original-To: apmail-lucene-commits-archive@www.apache.org Delivered-To: apmail-lucene-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id BA926C785 for ; Tue, 18 Nov 2014 15:34:24 +0000 (UTC) Received: (qmail 73274 invoked by uid 500); 18 Nov 2014 15:34:24 -0000 Mailing-List: contact commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@lucene.apache.org Delivered-To: mailing list commits@lucene.apache.org Received: (qmail 73265 invoked by uid 99); 18 Nov 2014 15:34:24 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Nov 2014 15:34:24 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Nov 2014 15:34:23 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 72A962388A91; Tue, 18 Nov 2014 15:34:02 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1640369 - in /lucene/dev/branches/branch_5x: ./ lucene/ lucene/core/ lucene/core/src/test/org/apache/lucene/search/TestBooleanQuery.java Date: Tue, 18 Nov 2014 15:34:02 -0000 To: commits@lucene.apache.org From: mikemccand@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20141118153402.72A962388A91@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mikemccand Date: Tue Nov 18 15:34:01 2014 New Revision: 1640369 URL: http://svn.apache.org/r1640369 Log: add test Modified: lucene/dev/branches/branch_5x/ (props changed) lucene/dev/branches/branch_5x/lucene/ (props changed) lucene/dev/branches/branch_5x/lucene/core/ (props changed) lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestBooleanQuery.java Modified: lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestBooleanQuery.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestBooleanQuery.java?rev=1640369&r1=1640368&r2=1640369&view=diff ============================================================================== --- lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestBooleanQuery.java (original) +++ lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestBooleanQuery.java Tue Nov 18 15:34:01 2014 @@ -30,11 +30,11 @@ import org.apache.lucene.analysis.MockAn import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.TextField; -import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; +import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.MultiReader; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; @@ -390,4 +390,23 @@ public class TestBooleanQuery extends Lu dir.close(); } + public void testMinShouldMatchLeniency() throws Exception { + Directory dir = newDirectory(); + IndexWriter w = new IndexWriter(dir, newIndexWriterConfig(new MockAnalyzer(random()))); + Document doc = new Document(); + doc.add(newTextField("field", "a b c d", Field.Store.NO)); + w.addDocument(doc); + IndexReader r = DirectoryReader.open(w, true); + IndexSearcher s = newSearcher(r); + BooleanQuery bq = new BooleanQuery(); + bq.add(new TermQuery(new Term("field", "a")), BooleanClause.Occur.SHOULD); + bq.add(new TermQuery(new Term("field", "b")), BooleanClause.Occur.SHOULD); + + // No doc can match: BQ has only 2 clauses and we are asking for minShouldMatch=4 + bq.setMinimumNumberShouldMatch(4); + assertEquals(0, s.search(bq, 1).totalHits); + r.close(); + w.close(); + dir.close(); + } }