fix randomization of tests

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1145730 13f79535-47bb-0310-9956-ffa450edef68

lucene/src/test/org/apache/lucene/search/BaseTestRangeFilter.java

@@ -67,7 +67,7 @@ public class BaseTestRangeFilter extends LuceneTestCase {
   static TestIndex unsignedIndexDir;
   
   static int minId = 0;
-  static int maxId = atLeast(500);
+  static int maxId;
   
   static final int intLength = Integer.toString(Integer.MAX_VALUE).length();
   
@@ -93,6 +93,7 @@ public class BaseTestRangeFilter extends LuceneTestCase {
   
   @BeforeClass
   public static void beforeClassBaseTestRangeFilter() throws Exception {
+    maxId = atLeast(500);
     signedIndexDir = new TestIndex(random, Integer.MAX_VALUE, Integer.MIN_VALUE, true);
     unsignedIndexDir = new TestIndex(random, Integer.MAX_VALUE, 0, false);
     signedIndexReader = build(random, signedIndexDir);

lucene/src/test/org/apache/lucene/search/TestCustomSearcherSort.java

@@ -39,7 +39,7 @@ public class TestCustomSearcherSort extends LuceneTestCase {
   private IndexReader reader;
   private Query query = null;
   // reduced from 20000 to 2000 to speed up test...
-  private final static int INDEX_SIZE = atLeast(2000);
+  private int INDEX_SIZE;
   
   /**
    * Create index and query for test cases.
@@ -47,6 +47,7 @@ public class TestCustomSearcherSort extends LuceneTestCase {
   @Override
   public void setUp() throws Exception {
     super.setUp();
+    INDEX_SIZE = atLeast(2000);
     index = newDirectory();
     RandomIndexWriter writer = new RandomIndexWriter(random, index);
     RandomGen random = new RandomGen(this.random);

lucene/src/test/org/apache/lucene/search/TestFieldCache.java

@@ -33,13 +33,14 @@ import java.io.PrintStream;
 
 public class TestFieldCache extends LuceneTestCase {
   protected IndexReader reader;
-  private static final int NUM_DOCS = atLeast(1000);
+  private int NUM_DOCS;
   private String[] unicodeStrings;
   private Directory directory;
 
   @Override
   public void setUp() throws Exception {
     super.setUp();
+    NUM_DOCS = atLeast(1000);
     directory = newDirectory();
     RandomIndexWriter writer= new RandomIndexWriter(random, directory, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)).setMergePolicy(newLogMergePolicy()));
     long theLong = Long.MAX_VALUE;

lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java

@@ -44,7 +44,7 @@ public class TestNumericRangeQuery32 extends LuceneTestCase {
   // shift the starting of the values to the left, to also have negative values:
   private static final int startOffset = - 1 << 15;
   // number of docs to generate for testing
-  private static final int noDocs = atLeast(4096);
+  private static int noDocs;
   
   private static Directory directory = null;
   private static IndexReader reader = null;
@@ -52,6 +52,7 @@ public class TestNumericRangeQuery32 extends LuceneTestCase {
   
   @BeforeClass
   public static void beforeClass() throws Exception {
+    noDocs = atLeast(4096);
     directory = newDirectory();
     RandomIndexWriter writer = new RandomIndexWriter(random, directory,
         newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random))

lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java

@@ -41,7 +41,7 @@ public class TestNumericRangeQuery64 extends LuceneTestCase {
   // shift the starting of the values to the left, to also have negative values:
   private static final long startOffset = - 1L << 31;
   // number of docs to generate for testing
-  private static final int noDocs = atLeast(4096);
+  private static int noDocs;
   
   private static Directory directory = null;
   private static IndexReader reader = null;
@@ -49,6 +49,7 @@ public class TestNumericRangeQuery64 extends LuceneTestCase {
   
   @BeforeClass
   public static void beforeClass() throws Exception {
+    noDocs = atLeast(4096);
     directory = newDirectory();
     RandomIndexWriter writer = new RandomIndexWriter(random, directory,
         newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random))

lucene/src/test/org/apache/lucene/search/TestSort.java

@@ -53,6 +53,7 @@ import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.DocIdBitSet;
 import org.apache.lucene.util.LuceneTestCase;
 import org.apache.lucene.util._TestUtil;
+import org.junit.BeforeClass;
 
 /**
  * Unit tests for sorting code.
@@ -65,7 +66,7 @@ import org.apache.lucene.util._TestUtil;
 public class TestSort extends LuceneTestCase {
   // true if our codec supports docvalues: true unless codec is preflex (3.x)
   boolean supportsDocValues = CodecProvider.getDefault().getDefaultFieldCodec().equals("PreFlex") == false;
-  private static final int NUM_STRINGS = atLeast(6000);
+  private static int NUM_STRINGS;
   private IndexSearcher full;
   private IndexSearcher searchX;
   private IndexSearcher searchY;
@@ -78,6 +79,10 @@ public class TestSort extends LuceneTestCase {
   private Query queryM;
   private Sort sort;
 
+  @BeforeClass
+  public static void beforeClass() throws Exception {
+    NUM_STRINGS = atLeast(6000);
+  }
   // document data:
   // the tracer field is used to determine which document was hit
   // the contents field is used to search and sort by relevance

lucene/src/test/org/apache/lucene/search/cache/TestEntryCreators.java

@@ -32,13 +32,19 @@ import org.apache.lucene.search.FieldCache;
 import org.apache.lucene.store.Directory;
 import org.apache.lucene.util.LuceneTestCase;
 import org.apache.lucene.util.FixedBitSet;
+import org.junit.BeforeClass;
 
 import static org.hamcrest.CoreMatchers.*;
 
 public class TestEntryCreators extends LuceneTestCase {
   protected IndexReader reader;
-  private static final int NUM_DOCS = atLeast(500);
+  private static int NUM_DOCS;
   private Directory directory;
+  
+  @BeforeClass
+  public static void beforeClass() throws Exception {
+    NUM_DOCS = atLeast(500);
+  }
 
   static class NumberTypeTester {
     String funcName;

lucene/src/test/org/apache/lucene/util/TestIndexableBinaryStringTools.java

@@ -1,5 +1,7 @@
 package org.apache.lucene.util;
 
+import org.junit.BeforeClass;
+
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -22,8 +24,14 @@ package org.apache.lucene.util;
  */
 @Deprecated
 public class TestIndexableBinaryStringTools extends LuceneTestCase {
-  private static final int NUM_RANDOM_TESTS = atLeast(200);
-  private static final int MAX_RANDOM_BINARY_LENGTH = atLeast(300);
+  private static int NUM_RANDOM_TESTS;
+  private static int MAX_RANDOM_BINARY_LENGTH;
+  
+  @BeforeClass
+  public static void beforeClass() throws Exception {
+    NUM_RANDOM_TESTS = atLeast(200);
+    MAX_RANDOM_BINARY_LENGTH = atLeast(300);
+  }
   
   public void testSingleBinaryRoundTrip() {
     byte[] binary = new byte[] { (byte) 0x23, (byte) 0x98, (byte) 0x13,