You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2015/04/09 16:58:40 UTC

svn commit: r1672381 - in /lucene/dev/branches/branch_5x: ./ lucene/ lucene/core/ lucene/core/src/test/org/apache/lucene/search/TestTermRangeQuery.java

Author: mikemccand
Date: Thu Apr  9 14:58:38 2015
New Revision: 1672381

URL: http://svn.apache.org/r1672381
Log:
fix test bug: temporarily allow massive boolean queries

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/TestTermRangeQuery.java

Modified: lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestTermRangeQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestTermRangeQuery.java?rev=1672381&r1=1672380&r2=1672381&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestTermRangeQuery.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestTermRangeQuery.java Thu Apr  9 14:58:38 2015
@@ -467,16 +467,25 @@ public class TestTermRangeQuery extends
       }
     }.checkTerms();
 
-    if (random().nextBoolean()) {
-      q.setRewriteMethod(MultiTermQuery.SCORING_BOOLEAN_REWRITE);
-    } else if (random().nextBoolean()) {
-      q.setRewriteMethod(MultiTermQuery.CONSTANT_SCORE_BOOLEAN_REWRITE);
-    }
+    int maxClauseCount = BooleanQuery.getMaxClauseCount();
+
+    try {
 
-    if (VERBOSE) {
-      System.out.println("TEST: use rewrite method " + q.getRewriteMethod());
+      if (random().nextBoolean()) {
+        q.setRewriteMethod(MultiTermQuery.SCORING_BOOLEAN_REWRITE);
+        BooleanQuery.setMaxClauseCount(actualCount);
+      } else if (random().nextBoolean()) {
+        q.setRewriteMethod(MultiTermQuery.CONSTANT_SCORE_BOOLEAN_REWRITE);
+        BooleanQuery.setMaxClauseCount(actualCount);
+      }
+
+      if (VERBOSE) {
+        System.out.println("TEST: use rewrite method " + q.getRewriteMethod());
+      }
+      assertEquals(actualCount, s.search(q, 1).totalHits);
+    } finally {
+      BooleanQuery.setMaxClauseCount(maxClauseCount);
     }
-    assertEquals(actualCount, s.search(q, 1).totalHits);
 
     // Test when min == max:
     List<String> randomTermsList = new ArrayList<>(randomTerms);