svn commit: r912324 - in /lucene/java/trunk/src/test/org/apache/lucene/util: LuceneTestCase.java LuceneTestCaseJ4.java

[us...@apache.org]

Author: uschindler
Date: Sun Feb 21 09:47:29 2010
New Revision: 912324

URL: http://svn.apache.org/viewvc?rev=912324&view=rev
Log:
also change LuceneTestCaseJ4

Modified:
    lucene/java/trunk/src/test/org/apache/lucene/util/LuceneTestCase.java
    lucene/java/trunk/src/test/org/apache/lucene/util/LuceneTestCaseJ4.java

Modified: lucene/java/trunk/src/test/org/apache/lucene/util/LuceneTestCase.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/util/LuceneTestCase.java?rev=912324&r1=912323&r2=912324&view=diff
==============================================================================
--- lucene/java/trunk/src/test/org/apache/lucene/util/LuceneTestCase.java (original)
+++ lucene/java/trunk/src/test/org/apache/lucene/util/LuceneTestCase.java Sun Feb 21 09:47:29 2010
@@ -55,6 +55,7 @@
 public abstract class LuceneTestCase extends TestCase {
 
   public static final Version TEST_VERSION_CURRENT = LuceneTestCaseJ4.TEST_VERSION_CURRENT;
+
   private int savedBoolMaxClauseCount;
 
   public LuceneTestCase() {

Modified: lucene/java/trunk/src/test/org/apache/lucene/util/LuceneTestCaseJ4.java
URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/test/org/apache/lucene/util/LuceneTestCaseJ4.java?rev=912324&r1=912323&r2=912324&view=diff
==============================================================================
--- lucene/java/trunk/src/test/org/apache/lucene/util/LuceneTestCaseJ4.java (original)
+++ lucene/java/trunk/src/test/org/apache/lucene/util/LuceneTestCaseJ4.java Sun Feb 21 09:47:29 2010
@@ -18,6 +18,7 @@
  */
 
 import org.apache.lucene.index.ConcurrentMergeScheduler;
+import org.apache.lucene.search.BooleanQuery;
 import org.apache.lucene.search.FieldCache;
 import org.apache.lucene.search.FieldCache.CacheEntry;
 import org.apache.lucene.util.FieldCacheSanityChecker.Insanity;
@@ -76,6 +77,8 @@
   /** Change this when development starts for new Lucene version: */
   public static final Version TEST_VERSION_CURRENT = Version.LUCENE_31;
 
+  private int savedBoolMaxClauseCount;
+
   // This is how we get control when errors occur.
   // Think of this as start/end/success/failed
   // events.
@@ -92,6 +95,7 @@
   @Before
   public void setUp() throws Exception {
     ConcurrentMergeScheduler.setTestMode();
+    savedBoolMaxClauseCount = BooleanQuery.getMaxClauseCount();
     seed = null;
   }
 
@@ -117,6 +121,7 @@
 
   @After
   public void tearDown() throws Exception {
+    BooleanQuery.setMaxClauseCount(savedBoolMaxClauseCount);
     try {
       // this isn't as useful as calling directly from the scope where the
       // index readers are used, because they could be gc'ed just before