You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2010/09/10 14:34:32 UTC
svn commit: r995772 [6/8] - in /lucene/dev/trunk: lucene/
lucene/contrib/db/bdb-je/src/test/org/apache/lucene/store/je/
lucene/contrib/db/bdb/src/test/org/apache/lucene/store/db/
lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/ l...
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTermVectorsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTermVectorsReader.java?rev=995772&r1=995771&r2=995772&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTermVectorsReader.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTermVectorsReader.java Fri Sep 10 12:34:18 2010
@@ -22,7 +22,6 @@ import java.io.Reader;
import java.util.Arrays;
import java.util.Iterator;
import java.util.Map;
-import java.util.Random;
import java.util.SortedSet;
import org.apache.lucene.analysis.Analyzer;
@@ -94,9 +93,8 @@ public class TestTermVectorsReader exten
}
Arrays.sort(tokens);
- Random random = newRandom();
- dir = newDirectory(random);
- IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MyAnalyzer()).setMaxBufferedDocs(-1));
+ dir = newDirectory();
+ IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MyAnalyzer()).setMaxBufferedDocs(-1));
((LogMergePolicy) writer.getConfig().getMergePolicy()).setUseCompoundFile(false);
((LogMergePolicy) writer.getConfig().getMergePolicy()).setUseCompoundDocStore(false);
((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(10);
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTermdocPerf.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTermdocPerf.java?rev=995772&r1=995771&r2=995772&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTermdocPerf.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTermdocPerf.java Fri Sep 10 12:34:18 2010
@@ -70,7 +70,7 @@ public class TestTermdocPerf extends Luc
Document doc = new Document();
doc.add(new Field(field,val, Field.Store.NO, Field.Index.NOT_ANALYZED_NO_NORMS));
- IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random,
+ IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(
TEST_VERSION_CURRENT, analyzer)
.setOpenMode(OpenMode.CREATE).setMaxBufferedDocs(100));
((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(100);
@@ -85,8 +85,7 @@ public class TestTermdocPerf extends Luc
public int doTest(int iter, int ndocs, int maxTF, float percentDocs) throws IOException {
- Random random = newRandom();
- Directory dir = newDirectory(random);
+ Directory dir = newDirectory();
long start = System.currentTimeMillis();
addDocs(random, dir, ndocs, "foo", "val", maxTF, percentDocs);
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestThreadedOptimize.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestThreadedOptimize.java?rev=995772&r1=995771&r2=995772&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestThreadedOptimize.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestThreadedOptimize.java Fri Sep 10 12:34:18 2010
@@ -54,7 +54,7 @@ public class TestThreadedOptimize extend
public void runTest(Random random, Directory directory, MergeScheduler merger) throws Exception {
- IndexWriter writer = new IndexWriter(directory, newIndexWriterConfig(random,
+ IndexWriter writer = new IndexWriter(directory, newIndexWriterConfig(
TEST_VERSION_CURRENT, ANALYZER)
.setOpenMode(OpenMode.CREATE).setMaxBufferedDocs(2).setMergeScheduler(
merger));
@@ -119,7 +119,7 @@ public class TestThreadedOptimize extend
assertEquals(expectedDocCount, writer.maxDoc());
writer.close();
- writer = new IndexWriter(directory, newIndexWriterConfig(random,
+ writer = new IndexWriter(directory, newIndexWriterConfig(
TEST_VERSION_CURRENT, ANALYZER).setOpenMode(
OpenMode.APPEND).setMaxBufferedDocs(2));
@@ -136,8 +136,7 @@ public class TestThreadedOptimize extend
FSDirectory.
*/
public void testThreadedOptimize() throws Exception {
- Random random = newRandom();
- Directory directory = newDirectory(random);
+ Directory directory = newDirectory();
runTest(random, directory, new SerialMergeScheduler());
runTest(random, directory, new ConcurrentMergeScheduler());
directory.close();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTransactionRollback.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTransactionRollback.java?rev=995772&r1=995771&r2=995772&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTransactionRollback.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTransactionRollback.java Fri Sep 10 12:34:18 2010
@@ -25,7 +25,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.HashMap;
-import java.util.Random;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.analysis.MockAnalyzer;
@@ -45,7 +44,6 @@ public class TestTransactionRollback ext
private static final String FIELD_RECORD_ID = "record_id";
private Directory dir;
- private Random random;
//Rolls back index to a chosen ID
private void rollBackLast(int id) throws Exception {
@@ -65,7 +63,7 @@ public class TestTransactionRollback ext
if (last==null)
throw new RuntimeException("Couldn't find commit point "+id);
- IndexWriter w = new IndexWriter(dir, newIndexWriterConfig(random,
+ IndexWriter w = new IndexWriter(dir, newIndexWriterConfig(
TEST_VERSION_CURRENT, new MockAnalyzer()).setIndexDeletionPolicy(
new RollbackDeletionPolicy(id)).setIndexCommit(last));
Map<String,String> data = new HashMap<String,String>();
@@ -126,11 +124,10 @@ public class TestTransactionRollback ext
@Override
protected void setUp() throws Exception {
super.setUp();
- random = newRandom();
- dir = newDirectory(random);
+ dir = newDirectory();
//Build index, of records 1 to 100, committing after each batch of 10
IndexDeletionPolicy sdp=new KeepAllDeletionPolicy();
- IndexWriter w=new IndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer()).setIndexDeletionPolicy(sdp));
+ IndexWriter w=new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer()).setIndexDeletionPolicy(sdp));
for(int currentRecordId=1;currentRecordId<=100;currentRecordId++) {
Document doc=new Document();
doc.add(new Field(FIELD_RECORD_ID,""+currentRecordId,Field.Store.YES,Field.Index.ANALYZED));
@@ -204,7 +201,7 @@ public class TestTransactionRollback ext
for(int i=0;i<2;i++) {
// Unless you specify a prior commit point, rollback
// should not work:
- new IndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer())
+ new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer())
.setIndexDeletionPolicy(new DeleteLastCommitPolicy())).close();
IndexReader r = IndexReader.open(dir, true);
assertEquals(100, r.numDocs());
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTransactions.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTransactions.java?rev=995772&r1=995771&r2=995772&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTransactions.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTransactions.java Fri Sep 10 12:34:18 2010
@@ -18,7 +18,6 @@ package org.apache.lucene.index;
*/
import java.io.IOException;
-import java.util.Random;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
@@ -28,17 +27,15 @@ import org.apache.lucene.store.MockDirec
import org.apache.lucene.store.RAMDirectory;
import org.apache.lucene.util.English;
import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util._TestUtil;
public class TestTransactions extends LuceneTestCase {
- private Random RANDOM;
private static volatile boolean doFail;
private class RandomFailure extends MockDirectoryWrapper.Failure {
@Override
public void eval(MockDirectoryWrapper dir) throws IOException {
- if (TestTransactions.doFail && RANDOM.nextInt() % 10 <= 3)
+ if (TestTransactions.doFail && random.nextInt() % 10 <= 3)
throw new IOException("now failing randomly but on purpose");
}
}
@@ -94,14 +91,14 @@ public class TestTransactions extends Lu
@Override
public void doWork() throws Throwable {
- IndexWriter writer1 = new IndexWriter(dir1, newIndexWriterConfig(RANDOM, TEST_VERSION_CURRENT, new MockAnalyzer())
+ IndexWriter writer1 = new IndexWriter(dir1, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer())
.setMaxBufferedDocs(3).setMergeScheduler(new ConcurrentMergeScheduler()));
((LogMergePolicy) writer1.getConfig().getMergePolicy()).setMergeFactor(2);
((ConcurrentMergeScheduler) writer1.getConfig().getMergeScheduler()).setSuppressExceptions();
// Intentionally use different params so flush/merge
// happen @ different times
- IndexWriter writer2 = new IndexWriter(dir2, newIndexWriterConfig(RANDOM, TEST_VERSION_CURRENT, new MockAnalyzer())
+ IndexWriter writer2 = new IndexWriter(dir2, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer())
.setMaxBufferedDocs(2).setMergeScheduler(new ConcurrentMergeScheduler()));
((LogMergePolicy) writer2.getConfig().getMergePolicy()).setMergeFactor(3);
((ConcurrentMergeScheduler) writer2.getConfig().getMergeScheduler()).setSuppressExceptions();
@@ -142,7 +139,7 @@ public class TestTransactions extends Lu
// Add 10 docs:
for(int j=0; j<10; j++) {
Document d = new Document();
- int n = RANDOM.nextInt();
+ int n = random.nextInt();
d.add(new Field("id", Integer.toString(nextID++), Field.Store.YES, Field.Index.NOT_ANALYZED));
d.add(new Field("contents", English.intToEnglish(n), Field.Store.NO, Field.Index.ANALYZED));
writer.addDocument(d);
@@ -184,10 +181,10 @@ public class TestTransactions extends Lu
}
public void initIndex(Directory dir) throws Throwable {
- IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(RANDOM, TEST_VERSION_CURRENT, new MockAnalyzer()));
+ IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer()));
for(int j=0; j<7; j++) {
Document d = new Document();
- int n = RANDOM.nextInt();
+ int n = random.nextInt();
d.add(new Field("contents", English.intToEnglish(n), Field.Store.NO, Field.Index.ANALYZED));
writer.addDocument(d);
}
@@ -195,7 +192,6 @@ public class TestTransactions extends Lu
}
public void testTransactions() throws Throwable {
- RANDOM = newRandom();
// we cant use non-ramdir on windows, because this test needs to double-write.
MockDirectoryWrapper dir1 = new MockDirectoryWrapper(new RAMDirectory());
MockDirectoryWrapper dir2 = new MockDirectoryWrapper(new RAMDirectory());
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/codecs/intblock/TestIntBlockCodec.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/codecs/intblock/TestIntBlockCodec.java?rev=995772&r1=995771&r2=995772&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/codecs/intblock/TestIntBlockCodec.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/codecs/intblock/TestIntBlockCodec.java Fri Sep 10 12:34:18 2010
@@ -25,7 +25,7 @@ import org.apache.lucene.index.codecs.mo
public class TestIntBlockCodec extends LuceneTestCase {
public void testSimpleIntBlocks() throws Exception {
- Directory dir = newDirectory(newRandom());
+ Directory dir = newDirectory();
IntStreamFactory f = new MockFixedIntBlockCodec(128).getIntFactory();
@@ -47,7 +47,7 @@ public class TestIntBlockCodec extends L
}
public void testEmptySimpleIntBlocks() throws Exception {
- Directory dir = newDirectory(newRandom());
+ Directory dir = newDirectory();
IntStreamFactory f = new MockFixedIntBlockCodec(128).getIntFactory();
IntIndexOutput out = f.createOutput(dir, "test");
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/codecs/preflex/TestSurrogates.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/codecs/preflex/TestSurrogates.java?rev=995772&r1=995771&r2=995772&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/codecs/preflex/TestSurrogates.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/codecs/preflex/TestSurrogates.java Fri Sep 10 12:34:18 2010
@@ -272,15 +272,13 @@ public class TestSurrogates extends Luce
@Test
public void testSurrogatesOrder() throws Exception {
- Random r = newRandom();
-
- Directory dir = newDirectory(r);
- RandomIndexWriter w = new RandomIndexWriter(r,
+ Directory dir = newDirectory();
+ RandomIndexWriter w = new RandomIndexWriter(random,
dir,
- newIndexWriterConfig(r, TEST_VERSION_CURRENT,
+ newIndexWriterConfig( TEST_VERSION_CURRENT,
new MockAnalyzer()).setCodecProvider(_TestUtil.alwaysCodec(new PreFlexRWCodec())));
- final int numField = _TestUtil.nextInt(r, 2, 5);
+ final int numField = _TestUtil.nextInt(random, 2, 5);
int uniqueTermCount = 0;
@@ -295,7 +293,7 @@ public class TestSurrogates extends Luce
final Set<String> uniqueTerms = new HashSet<String>();
for(int i=0;i<numTerms;i++) {
- String term = getRandomString(r) + "_ " + (tc++);
+ String term = getRandomString(random) + "_ " + (tc++);
uniqueTerms.add(term);
fieldTerms.add(new Term(field, term));
Document doc = new Document();
@@ -334,8 +332,8 @@ public class TestSurrogates extends Luce
//assertNotNull(fields);
doTestStraightEnum(fieldTerms, reader, uniqueTermCount);
- doTestSeekExists(r, fieldTerms, reader);
- doTestSeekDoesNotExist(r, numField, fieldTerms, fieldTermsArray, reader);
+ doTestSeekExists(random, fieldTerms, reader);
+ doTestSeekDoesNotExist(random, numField, fieldTerms, fieldTermsArray, reader);
reader.close();
w.close();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/queryParser/TestMultiFieldQueryParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/queryParser/TestMultiFieldQueryParser.java?rev=995772&r1=995771&r2=995772&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/queryParser/TestMultiFieldQueryParser.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/queryParser/TestMultiFieldQueryParser.java Fri Sep 10 12:34:18 2010
@@ -21,7 +21,6 @@ import java.io.IOException;
import java.io.Reader;
import java.util.HashMap;
import java.util.Map;
-import java.util.Random;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.TokenStream;
@@ -282,9 +281,8 @@ public class TestMultiFieldQueryParser e
public void testStopWordSearching() throws Exception {
Analyzer analyzer = new MockAnalyzer();
- Random random = newRandom();
- Directory ramDir = newDirectory(random);
- IndexWriter iw = new IndexWriter(ramDir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, analyzer));
+ Directory ramDir = newDirectory();
+ IndexWriter iw = new IndexWriter(ramDir, newIndexWriterConfig(TEST_VERSION_CURRENT, analyzer));
Document doc = new Document();
doc.add(new Field("body", "blah the footest blah", Field.Store.NO, Field.Index.ANALYZED));
iw.addDocument(doc);
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/queryParser/TestQueryParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/queryParser/TestQueryParser.java?rev=995772&r1=995771&r2=995772&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/queryParser/TestQueryParser.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/queryParser/TestQueryParser.java Fri Sep 10 12:34:18 2010
@@ -27,7 +27,6 @@ import java.util.Date;
import java.util.GregorianCalendar;
import java.util.HashSet;
import java.util.Locale;
-import java.util.Random;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.MockAnalyzer;
@@ -569,9 +568,8 @@ public class TestQueryParser extends Loc
}
public void testFarsiRangeCollating() throws Exception {
- Random random = newRandom();
- Directory ramDir = newDirectory(random);
- IndexWriter iw = new IndexWriter(ramDir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer(MockTokenizer.WHITESPACE, false)));
+ Directory ramDir = newDirectory();
+ IndexWriter iw = new IndexWriter(ramDir, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(MockTokenizer.WHITESPACE, false)));
Document doc = new Document();
doc.add(new Field("content","\u0633\u0627\u0628",
Field.Store.YES, Field.Index.NOT_ANALYZED));
@@ -979,9 +977,8 @@ public class TestQueryParser extends Loc
}
public void testLocalDateFormat() throws IOException, ParseException {
- Random random = newRandom();
- Directory ramDir = newDirectory(random);
- IndexWriter iw = new IndexWriter(ramDir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer(MockTokenizer.WHITESPACE, false)));
+ Directory ramDir = newDirectory();
+ IndexWriter iw = new IndexWriter(ramDir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(MockTokenizer.WHITESPACE, false)));
addDateDoc("a", 2005, 12, 2, 10, 15, 33, iw);
addDateDoc("b", 2005, 12, 4, 22, 15, 00, iw);
iw.close();
@@ -1154,10 +1151,9 @@ public class TestQueryParser extends Loc
// enableStopPositionIncr & QueryParser's enablePosIncr
// "match"
public void testPositionIncrements() throws Exception {
- Random random = newRandom();
- Directory dir = newDirectory(random);
+ Directory dir = newDirectory();
Analyzer a = new MockAnalyzer(MockTokenizer.SIMPLE, true, MockTokenFilter.ENGLISH_STOPSET, true);
- IndexWriter w = new IndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, a));
+ IndexWriter w = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, a));
Document doc = new Document();
doc.add(new Field("f", "the wizard of ozzy", Field.Store.NO, Field.Index.ANALYZED));
w.addDocument(doc);
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/BaseTestRangeFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/BaseTestRangeFilter.java?rev=995772&r1=995771&r2=995772&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/BaseTestRangeFilter.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/BaseTestRangeFilter.java Fri Sep 10 12:34:18 2010
@@ -34,8 +34,6 @@ public class BaseTestRangeFilter extends
public static final boolean F = false;
public static final boolean T = true;
- protected Random rand = newRandom();
-
/**
* Collation interacts badly with hyphens -- collation produces different
* ordering than Unicode code-point ordering -- so two indexes are created:
@@ -48,12 +46,12 @@ public class BaseTestRangeFilter extends
boolean allowNegativeRandomInts;
Directory index;
- TestIndex(int minR, int maxR, boolean allowNegativeRandomInts) {
+ TestIndex(Random random, int minR, int maxR, boolean allowNegativeRandomInts) {
this.minR = minR;
this.maxR = maxR;
this.allowNegativeRandomInts = allowNegativeRandomInts;
try {
- index = newDirectory(rand);
+ index = newDirectory();
} catch (IOException e) { throw new RuntimeException(e); }
}
}
@@ -91,10 +89,10 @@ public class BaseTestRangeFilter extends
protected void setUp() throws Exception {
super.setUp();
- signedIndexDir = new TestIndex(Integer.MAX_VALUE, Integer.MIN_VALUE, true);
- unsignedIndexDir = new TestIndex(Integer.MAX_VALUE, 0, false);
- signedIndexReader = build(rand, signedIndexDir);
- unsignedIndexReader = build(rand, unsignedIndexDir);
+ signedIndexDir = new TestIndex(random, Integer.MAX_VALUE, Integer.MIN_VALUE, true);
+ unsignedIndexDir = new TestIndex(random, Integer.MAX_VALUE, 0, false);
+ signedIndexReader = build(random, signedIndexDir);
+ unsignedIndexReader = build(random, unsignedIndexDir);
}
protected void tearDown() throws Exception {
@@ -108,14 +106,14 @@ public class BaseTestRangeFilter extends
private IndexReader build(Random random, TestIndex index) throws IOException {
/* build an index */
RandomIndexWriter writer = new RandomIndexWriter(random, index.index,
- newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer())
+ newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer())
.setOpenMode(OpenMode.CREATE));
for (int d = minId; d <= maxId; d++) {
Document doc = new Document();
doc.add(new Field("id", pad(d), Field.Store.YES,
Field.Index.NOT_ANALYZED));
- int r = index.allowNegativeRandomInts ? rand.nextInt() : rand
+ int r = index.allowNegativeRandomInts ? random.nextInt() : random
.nextInt(Integer.MAX_VALUE);
if (index.maxR < r) {
index.maxR = r;
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestAutomatonQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestAutomatonQuery.java?rev=995772&r1=995771&r2=995772&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestAutomatonQuery.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestAutomatonQuery.java Fri Sep 10 12:34:18 2010
@@ -18,7 +18,6 @@ package org.apache.lucene.search;
*/
import java.io.IOException;
-import java.util.Random;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
@@ -41,8 +40,7 @@ public class TestAutomatonQuery extends
public void setUp() throws Exception {
super.setUp();
- Random random = newRandom();
- directory = newDirectory(random);
+ directory = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random, directory);
Document doc = new Document();
Field titleField = new Field("title", "some title", Field.Store.NO,
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestAutomatonQueryUnicode.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestAutomatonQueryUnicode.java?rev=995772&r1=995771&r2=995772&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestAutomatonQueryUnicode.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestAutomatonQueryUnicode.java Fri Sep 10 12:34:18 2010
@@ -18,7 +18,6 @@ package org.apache.lucene.search;
*/
import java.io.IOException;
-import java.util.Random;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
@@ -44,8 +43,7 @@ public class TestAutomatonQueryUnicode e
public void setUp() throws Exception {
super.setUp();
- Random random = newRandom();
- directory = newDirectory(random);
+ directory = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random, directory);
Document doc = new Document();
Field titleField = new Field("title", "some title", Field.Store.NO,
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBoolean2.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBoolean2.java?rev=995772&r1=995771&r2=995772&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBoolean2.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBoolean2.java Fri Sep 10 12:34:18 2010
@@ -40,7 +40,6 @@ public class TestBoolean2 extends Lucene
private IndexSearcher searcher;
private IndexSearcher bigSearcher;
private IndexReader reader;
- private Random rnd;
private static int NUM_EXTRA_DOCS = 6000;
public static final String field = "field";
@@ -51,9 +50,8 @@ public class TestBoolean2 extends Lucene
@Override
protected void setUp() throws Exception {
super.setUp();
- rnd = newRandom();
- directory = newDirectory(rnd);
- RandomIndexWriter writer= new RandomIndexWriter(rnd, directory);
+ directory = newDirectory();
+ RandomIndexWriter writer= new RandomIndexWriter(random, directory);
for (int i = 0; i < docFields.length; i++) {
Document doc = new Document();
doc.add(new Field(field, docFields[i], Field.Store.NO, Field.Index.ANALYZED));
@@ -70,14 +68,14 @@ public class TestBoolean2 extends Lucene
int docCount = 0;
do {
final Directory copy = new MockDirectoryWrapper(new RAMDirectory(dir2));
- RandomIndexWriter w = new RandomIndexWriter(rnd, dir2);
+ RandomIndexWriter w = new RandomIndexWriter(random, dir2);
w.addIndexes(new Directory[] {copy});
docCount = w.maxDoc();
w.close();
mulFactor *= 2;
} while(docCount < 3000);
- RandomIndexWriter w = new RandomIndexWriter(rnd, dir2);
+ RandomIndexWriter w = new RandomIndexWriter(random, dir2);
Document doc = new Document();
doc.add(new Field("field2", "xxx", Field.Store.NO, Field.Index.ANALYZED));
for(int i=0;i<NUM_EXTRA_DOCS/2;i++) {
@@ -211,8 +209,8 @@ public class TestBoolean2 extends Lucene
// increase number of iterations for more complete testing
int num = 50 * RANDOM_MULTIPLIER;
for (int i=0; i<num; i++) {
- int level = rnd.nextInt(3);
- q1 = randBoolQuery(new Random(rnd.nextLong()), rnd.nextBoolean(), level, field, vals, null);
+ int level = random.nextInt(3);
+ q1 = randBoolQuery(new Random(random.nextLong()), random.nextBoolean(), level, field, vals, null);
// Can't sort by relevance since floating point numbers may not quite
// match up.
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java?rev=995772&r1=995771&r2=995772&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java Fri Sep 10 12:34:18 2010
@@ -32,7 +32,6 @@ import java.util.Random;
*/
public class TestBooleanMinShouldMatch extends LuceneTestCase {
- private Random rnd;
private Directory index;
private IndexReader r;
private IndexSearcher s;
@@ -41,8 +40,6 @@ public class TestBooleanMinShouldMatch e
protected void setUp() throws Exception {
super.setUp();
- rnd = newRandom();
-
String[] data = new String [] {
"A 1 2 3 4 5 6",
"Z 4 5 6",
@@ -54,8 +51,8 @@ public class TestBooleanMinShouldMatch e
"X 4 5 6"
};
- index = newDirectory(rnd);
- RandomIndexWriter w = new RandomIndexWriter(rnd, index);
+ index = newDirectory();
+ RandomIndexWriter w = new RandomIndexWriter(random, index);
for (int i = 0; i < data.length; i++) {
Document doc = new Document();
@@ -308,7 +305,7 @@ public class TestBooleanMinShouldMatch e
for (int i=0; i<c.length;i++) {
if (c[i].getOccur() == BooleanClause.Occur.SHOULD) opt++;
}
- q.setMinimumNumberShouldMatch(rnd.nextInt(opt+2));
+ q.setMinimumNumberShouldMatch(random.nextInt(opt+2));
}
};
@@ -317,8 +314,8 @@ public class TestBooleanMinShouldMatch e
// increase number of iterations for more complete testing
int num = 50 * RANDOM_MULTIPLIER;
for (int i=0; i<num; i++) {
- int lev = rnd.nextInt(maxLev);
- final long seed = rnd.nextLong();
+ int lev = random.nextInt(maxLev);
+ final long seed = random.nextLong();
BooleanQuery q1 = TestBoolean2.randBoolQuery(new Random(seed), true, lev, field, vals, null);
// BooleanQuery q2 = TestBoolean2.randBoolQuery(new Random(seed), lev, field, vals, minNrCB);
BooleanQuery q2 = TestBoolean2.randBoolQuery(new Random(seed), true, lev, field, vals, null);
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanOr.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanOr.java?rev=995772&r1=995771&r2=995772&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanOr.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanOr.java Fri Sep 10 12:34:18 2010
@@ -16,7 +16,6 @@ package org.apache.lucene.search;
* limitations under the License.
*/
import java.io.IOException;
-import java.util.Random;
import org.apache.lucene.util.LuceneTestCase;
@@ -136,8 +135,7 @@ public class TestBooleanOr extends Lucen
super.setUp();
//
- Random random = newRandom();
- dir = newDirectory(random);
+ dir = newDirectory();
//
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanPrefixQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanPrefixQuery.java?rev=995772&r1=995771&r2=995772&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanPrefixQuery.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanPrefixQuery.java Fri Sep 10 12:34:18 2010
@@ -17,8 +17,6 @@ package org.apache.lucene.search;
* limitations under the License.
*/
-import java.util.Random;
-
import org.apache.lucene.util.LuceneTestCase;
import junit.framework.Test;
import junit.framework.TestSuite;
@@ -67,8 +65,7 @@ public class TestBooleanPrefixQuery exte
}
public void testMethod() throws Exception {
- Random random = newRandom();
- Directory directory = newDirectory(random);
+ Directory directory = newDirectory();
String[] categories = new String[]{"food",
"foodanddrink",
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanQuery.java?rev=995772&r1=995771&r2=995772&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanQuery.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanQuery.java Fri Sep 10 12:34:18 2010
@@ -17,8 +17,6 @@ package org.apache.lucene.search;
* limitations under the License.
*/
-import java.util.Random;
-
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.document.Document;
@@ -60,8 +58,7 @@ public class TestBooleanQuery extends Lu
// LUCENE-1630
public void testNullOrSubScorer() throws Throwable {
- Random random = newRandom();
- Directory dir = newDirectory(random);
+ Directory dir = newDirectory();
RandomIndexWriter w = new RandomIndexWriter(random, dir);
Document doc = new Document();
doc.add(new Field("field", "a b c d", Field.Store.NO, Field.Index.ANALYZED));
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanScorer.java?rev=995772&r1=995771&r2=995772&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanScorer.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanScorer.java Fri Sep 10 12:34:18 2010
@@ -19,7 +19,6 @@ package org.apache.lucene.search;
import java.io.IOException;
import java.util.Arrays;
-import java.util.Random;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
@@ -40,8 +39,7 @@ public class TestBooleanScorer extends L
private static final String FIELD = "category";
public void testMethod() throws Exception {
- Random random = newRandom();
- Directory directory = newDirectory(random);
+ Directory directory = newDirectory();
String[] values = new String[] { "1", "2", "3", "4" };
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestCachingSpanFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestCachingSpanFilter.java?rev=995772&r1=995771&r2=995772&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestCachingSpanFilter.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestCachingSpanFilter.java Fri Sep 10 12:34:18 2010
@@ -18,7 +18,6 @@ package org.apache.lucene.search;
*/
import java.io.IOException;
-import java.util.Random;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
@@ -32,8 +31,7 @@ import org.apache.lucene.util.LuceneTest
public class TestCachingSpanFilter extends LuceneTestCase {
public void testEnforceDeletions() throws Exception {
- Random random = newRandom();
- Directory dir = newDirectory(random);
+ Directory dir = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random, dir);
// NOTE: cannot use writer.getReader because RIW (on
// flipping a coin) may give us a newly opened reader,
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java?rev=995772&r1=995771&r2=995772&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java Fri Sep 10 12:34:18 2010
@@ -17,7 +17,6 @@ package org.apache.lucene.search;
* limitations under the License.
*/
-import java.util.Random;
import java.io.IOException;
import org.apache.lucene.index.IndexReader;
@@ -34,17 +33,10 @@ import org.apache.lucene.util.OpenBitSet
import org.apache.lucene.util.OpenBitSetDISI;
public class TestCachingWrapperFilter extends LuceneTestCase {
- Random rand;
-
- @Override
- public void setUp() throws Exception {
- super.setUp();
- rand = newRandom();
- }
public void testCachingWorks() throws Exception {
- Directory dir = newDirectory(rand);
- RandomIndexWriter writer = new RandomIndexWriter(rand, dir);
+ Directory dir = newDirectory();
+ RandomIndexWriter writer = new RandomIndexWriter(random, dir);
writer.close();
IndexReader reader = IndexReader.open(dir, true);
@@ -69,8 +61,8 @@ public class TestCachingWrapperFilter ex
}
public void testNullDocIdSet() throws Exception {
- Directory dir = newDirectory(rand);
- RandomIndexWriter writer = new RandomIndexWriter(rand, dir);
+ Directory dir = newDirectory();
+ RandomIndexWriter writer = new RandomIndexWriter(random, dir);
writer.close();
IndexReader reader = IndexReader.open(dir, true);
@@ -91,8 +83,8 @@ public class TestCachingWrapperFilter ex
}
public void testNullDocIdSetIterator() throws Exception {
- Directory dir = newDirectory(rand);
- RandomIndexWriter writer = new RandomIndexWriter(rand, dir);
+ Directory dir = newDirectory();
+ RandomIndexWriter writer = new RandomIndexWriter(random, dir);
writer.close();
IndexReader reader = IndexReader.open(dir, true);
@@ -132,8 +124,8 @@ public class TestCachingWrapperFilter ex
}
public void testIsCacheAble() throws Exception {
- Directory dir = newDirectory(rand);
- RandomIndexWriter writer = new RandomIndexWriter(rand, dir);
+ Directory dir = newDirectory();
+ RandomIndexWriter writer = new RandomIndexWriter(random, dir);
writer.addDocument(new Document());
writer.close();
@@ -159,9 +151,9 @@ public class TestCachingWrapperFilter ex
}
public void testEnforceDeletions() throws Exception {
- Directory dir = newDirectory(rand);
- RandomIndexWriter writer = new RandomIndexWriter(rand, dir,
- newIndexWriterConfig(rand, TEST_VERSION_CURRENT, new MockAnalyzer()).setMergeScheduler(new SerialMergeScheduler()));
+ Directory dir = newDirectory();
+ RandomIndexWriter writer = new RandomIndexWriter(random, dir,
+ newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer()).setMergeScheduler(new SerialMergeScheduler()));
// NOTE: cannot use writer.getReader because RIW (on
// flipping a coin) may give us a newly opened reader,
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestCustomSearcherSort.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestCustomSearcherSort.java?rev=995772&r1=995771&r2=995772&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestCustomSearcherSort.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestCustomSearcherSort.java Fri Sep 10 12:34:18 2010
@@ -48,10 +48,9 @@ public class TestCustomSearcherSort exte
@Override
protected void setUp() throws Exception {
super.setUp();
- Random rand = newRandom();
- index = newDirectory(rand);
- RandomIndexWriter writer = new RandomIndexWriter(rand, index);
- RandomGen random = new RandomGen(rand);
+ index = newDirectory();
+ RandomIndexWriter writer = new RandomIndexWriter(random, index);
+ RandomGen random = new RandomGen(this.random);
for (int i = 0; i < INDEX_SIZE; ++i) { // don't decrease; if to low the
// problem doesn't show up
Document doc = new Document();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDateFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDateFilter.java?rev=995772&r1=995771&r2=995772&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDateFilter.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDateFilter.java Fri Sep 10 12:34:18 2010
@@ -27,7 +27,6 @@ import org.apache.lucene.index.RandomInd
import org.apache.lucene.index.Term;
import java.io.IOException;
-import java.util.Random;
/**
* DateFilter JUnit tests.
@@ -45,8 +44,7 @@ public class TestDateFilter extends Luce
*/
public void testBefore() throws IOException {
// create an index
- Random random = newRandom();
- Directory indexStore = newDirectory(random);
+ Directory indexStore = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random, indexStore);
long now = System.currentTimeMillis();
@@ -112,8 +110,7 @@ public class TestDateFilter extends Luce
*/
public void testAfter() throws IOException {
// create an index
- Random random = newRandom();
- Directory indexStore = newDirectory(random);
+ Directory indexStore = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random, indexStore);
long now = System.currentTimeMillis();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDateSort.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDateSort.java?rev=995772&r1=995771&r2=995772&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDateSort.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDateSort.java Fri Sep 10 12:34:18 2010
@@ -18,7 +18,6 @@ package org.apache.lucene.search;
*/
import java.util.Arrays;
-import java.util.Random;
import org.apache.lucene.util.LuceneTestCase;
@@ -51,8 +50,7 @@ public class TestDateSort extends Lucene
protected void setUp() throws Exception {
super.setUp();
// Create an index writer.
- Random random = newRandom();
- directory = newDirectory(random);
+ directory = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random, directory);
// oldest doc:
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java?rev=995772&r1=995771&r2=995772&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java Fri Sep 10 12:34:18 2010
@@ -28,7 +28,6 @@ import org.apache.lucene.index.Term;
import org.apache.lucene.store.Directory;
import java.text.DecimalFormat;
-import java.util.Random;
import java.io.IOException;
/**
@@ -79,10 +78,9 @@ public class TestDisjunctionMaxQuery ext
protected void setUp() throws Exception {
super.setUp();
- Random random = newRandom();
- index = newDirectory(random);
+ index = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random, index,
- newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer())
+ newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer())
.setSimilarity(sim));
// hed is the most important field, dek is secondary
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDocBoost.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDocBoost.java?rev=995772&r1=995771&r2=995772&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDocBoost.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDocBoost.java Fri Sep 10 12:34:18 2010
@@ -18,7 +18,6 @@ package org.apache.lucene.search;
*/
import java.io.IOException;
-import java.util.Random;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.document.*;
@@ -38,8 +37,7 @@ public class TestDocBoost extends Lucene
}
public void testDocBoost() throws Exception {
- Random random = newRandom();
- Directory store = newDirectory(random);
+ Directory store = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random, store);
Fieldable f1 = new Field("field", "word", Field.Store.YES, Field.Index.ANALYZED);
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDocIdSet.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDocIdSet.java?rev=995772&r1=995771&r2=995772&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDocIdSet.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDocIdSet.java Fri Sep 10 12:34:18 2010
@@ -21,7 +21,6 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
-import java.util.Random;
import junit.framework.Assert;
@@ -101,8 +100,7 @@ public class TestDocIdSet extends Lucene
public void testNullDocIdSet() throws Exception {
// Tests that if a Filter produces a null DocIdSet, which is given to
// IndexSearcher, everything works fine. This came up in LUCENE-1754.
- Random random = newRandom();
- Directory dir = newDirectory(random);
+ Directory dir = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random, dir);
Document doc = new Document();
doc.add(new Field("c", "val", Store.NO, Index.NOT_ANALYZED_NO_NORMS));
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestElevationComparator.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestElevationComparator.java?rev=995772&r1=995771&r2=995772&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestElevationComparator.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestElevationComparator.java Fri Sep 10 12:34:18 2010
@@ -28,7 +28,6 @@ import org.apache.lucene.util.BytesRef;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import java.util.Random;
public class TestElevationComparator extends LuceneTestCase {
@@ -36,9 +35,8 @@ public class TestElevationComparator ext
//@Test
public void testSorting() throws Throwable {
- Random random = newRandom();
- Directory directory = newDirectory(random);
- IndexWriter writer = new IndexWriter(directory, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer()).setMaxBufferedDocs(2));
+ Directory directory = newDirectory();
+ IndexWriter writer = new IndexWriter(directory, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer()).setMaxBufferedDocs(2));
((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(1000);
writer.addDocument(adoc(new String[] {"id", "a", "title", "ipod", "str_s", "a"}));
writer.addDocument(adoc(new String[] {"id", "b", "title", "ipod ipod", "str_s", "b"}));
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestExplanations.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestExplanations.java?rev=995772&r1=995771&r2=995772&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestExplanations.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestExplanations.java Fri Sep 10 12:34:18 2010
@@ -17,8 +17,6 @@ package org.apache.lucene.search;
* limitations under the License.
*/
-import java.util.Random;
-
import org.apache.lucene.queryParser.QueryParser;
import org.apache.lucene.queryParser.ParseException;
import org.apache.lucene.analysis.MockAnalyzer;
@@ -52,7 +50,6 @@ public class TestExplanations extends Lu
protected IndexSearcher searcher;
protected IndexReader reader;
protected Directory directory;
- protected Random random;
public static final String KEY = "KEY";
public static final String FIELD = "field";
@@ -70,8 +67,7 @@ public class TestExplanations extends Lu
@Override
protected void setUp() throws Exception {
super.setUp();
- random = newRandom();
- directory = newDirectory(random);
+ directory = newDirectory();
RandomIndexWriter writer= new RandomIndexWriter(random, directory);
for (int i = 0; i < docFields.length; i++) {
Document doc = new Document();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFieldCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFieldCache.java?rev=995772&r1=995771&r2=995772&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFieldCache.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFieldCache.java Fri Sep 10 12:34:18 2010
@@ -28,7 +28,6 @@ import org.apache.lucene.util.LuceneTest
import org.apache.lucene.util._TestUtil;
import org.apache.lucene.util.BytesRef;
import java.io.IOException;
-import java.util.Random;
import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
@@ -36,7 +35,6 @@ public class TestFieldCache extends Luce
protected IndexReader reader;
private static final int NUM_DOCS = 1000 * RANDOM_MULTIPLIER;
private String[] unicodeStrings;
- private Random random;
private Directory directory;
public TestFieldCache(String s) {
@@ -46,8 +44,7 @@ public class TestFieldCache extends Luce
@Override
protected void setUp() throws Exception {
super.setUp();
- random = newRandom();
- directory = newDirectory(random);
+ directory = newDirectory();
RandomIndexWriter writer= new RandomIndexWriter(random, directory);
long theLong = Long.MAX_VALUE;
double theDouble = Double.MAX_VALUE;
@@ -208,8 +205,8 @@ public class TestFieldCache extends Luce
}
public void testEmptyIndex() throws Exception {
- Directory dir = newDirectory(random);
- IndexWriter writer= new IndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer()).setMaxBufferedDocs(500));
+ Directory dir = newDirectory();
+ IndexWriter writer= new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer()).setMaxBufferedDocs(500));
IndexReader r = writer.getReader();
FieldCache.DocTerms terms = FieldCache.DEFAULT.getTerms(r, "foobar");
FieldCache.DocTermsIndex termsIndex = FieldCache.DEFAULT.getTermsIndex(r, "foobar");
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFieldCacheRangeFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFieldCacheRangeFilter.java?rev=995772&r1=995771&r2=995772&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFieldCacheRangeFilter.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFieldCacheRangeFilter.java Fri Sep 10 12:34:18 2010
@@ -515,8 +515,8 @@ public class TestFieldCacheRangeFilter e
// test using a sparse index (with deleted docs).
public void testSparseIndex() throws IOException {
- Directory dir = newDirectory(rand);
- IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(rand, TEST_VERSION_CURRENT, new MockAnalyzer()));
+ Directory dir = newDirectory();
+ IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer()));
for (int d = -20; d <= 20; d++) {
Document doc = new Document();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFieldCacheTermsFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFieldCacheTermsFilter.java?rev=995772&r1=995771&r2=995772&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFieldCacheTermsFilter.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFieldCacheTermsFilter.java Fri Sep 10 12:34:18 2010
@@ -27,7 +27,6 @@ import org.apache.lucene.store.Directory
import java.util.ArrayList;
import java.util.List;
-import java.util.Random;
/**
* A basic unit test for FieldCacheTermsFilter
@@ -37,8 +36,7 @@ import java.util.Random;
public class TestFieldCacheTermsFilter extends LuceneTestCase {
public void testMissingTerms() throws Exception {
String fieldName = "field1";
- Random random = newRandom();
- Directory rd = newDirectory(random);
+ Directory rd = newDirectory();
RandomIndexWriter w = new RandomIndexWriter(random, rd);
for (int i = 0; i < 100; i++) {
Document doc = new Document();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFilteredQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFilteredQuery.java?rev=995772&r1=995771&r2=995772&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFilteredQuery.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFilteredQuery.java Fri Sep 10 12:34:18 2010
@@ -27,7 +27,6 @@ import org.apache.lucene.store.Directory
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.DocIdBitSet;
import java.util.BitSet;
-import java.util.Random;
/**
* FilteredQuery JUnit tests.
@@ -48,8 +47,7 @@ public class TestFilteredQuery extends L
@Override
protected void setUp() throws Exception {
super.setUp();
- Random random = newRandom();
- directory = newDirectory(random);
+ directory = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter (random, directory);
Document doc = new Document();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFilteredSearch.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFilteredSearch.java?rev=995772&r1=995771&r2=995772&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFilteredSearch.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFilteredSearch.java Fri Sep 10 12:34:18 2010
@@ -18,7 +18,6 @@
package org.apache.lucene.search;
import java.io.IOException;
-import java.util.Random;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.analysis.MockAnalyzer;
@@ -47,18 +46,17 @@ public class TestFilteredSearch extends
public void testFilteredSearch() throws CorruptIndexException, LockObtainFailedException, IOException {
boolean enforceSingleSegment = true;
- Random random = newRandom();
- Directory directory = newDirectory(random);
+ Directory directory = newDirectory();
int[] filterBits = {1, 36};
SimpleDocIdSetFilter filter = new SimpleDocIdSetFilter(filterBits);
- IndexWriter writer = new IndexWriter(directory, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer()));
+ IndexWriter writer = new IndexWriter(directory, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer()));
searchFiltered(writer, directory, filter, enforceSingleSegment);
// run the test on more than one segment
enforceSingleSegment = false;
// reset - it is stateful
filter.reset();
writer.close();
- writer = new IndexWriter(directory, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer()).setOpenMode(OpenMode.CREATE).setMaxBufferedDocs(10));
+ writer = new IndexWriter(directory, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer()).setOpenMode(OpenMode.CREATE).setMaxBufferedDocs(10));
// we index 60 docs - this will create 6 segments
searchFiltered(writer, directory, filter, enforceSingleSegment);
writer.close();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFuzzyQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFuzzyQuery.java?rev=995772&r1=995771&r2=995772&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFuzzyQuery.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFuzzyQuery.java Fri Sep 10 12:34:18 2010
@@ -19,7 +19,6 @@ package org.apache.lucene.search;
import java.util.List;
import java.util.Arrays;
-import java.util.Random;
import java.io.IOException;
import org.apache.lucene.analysis.MockAnalyzer;
@@ -39,8 +38,7 @@ import org.apache.lucene.util.LuceneTest
public class TestFuzzyQuery extends LuceneTestCase {
public void testFuzziness() throws Exception {
- Random random = newRandom();
- Directory directory = newDirectory(random);
+ Directory directory = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random, directory);
addDoc("aaaaa", writer);
addDoc("aaaab", writer);
@@ -193,8 +191,7 @@ public class TestFuzzyQuery extends Luce
}
public void testFuzzinessLong() throws Exception {
- Random random = newRandom();
- Directory directory = newDirectory(random);
+ Directory directory = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random, directory);
addDoc("aaaaaaa", writer);
addDoc("segment", writer);
@@ -284,8 +281,7 @@ public class TestFuzzyQuery extends Luce
}
public void testTokenLengthOpt() throws IOException {
- Random random = newRandom();
- Directory directory = newDirectory(random);
+ Directory directory = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random, directory);
addDoc("12345678911", writer);
addDoc("segment", writer);
@@ -322,8 +318,7 @@ public class TestFuzzyQuery extends Luce
/** Test the TopTermsBoostOnlyBooleanQueryRewrite rewrite method. */
public void testBoostOnlyRewrite() throws Exception {
- Random random = newRandom();
- Directory directory = newDirectory(random);
+ Directory directory = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random, directory);
addDoc("Lucene", writer);
addDoc("Lucene", writer);
@@ -349,8 +344,7 @@ public class TestFuzzyQuery extends Luce
public void testGiga() throws Exception {
MockAnalyzer analyzer = new MockAnalyzer();
- Random random = newRandom();
- Directory index = newDirectory(random);
+ Directory index = newDirectory();
RandomIndexWriter w = new RandomIndexWriter(random, index);
addDoc("Lucene in Action", w);
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFuzzyQuery2.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFuzzyQuery2.java?rev=995772&r1=995771&r2=995772&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFuzzyQuery2.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFuzzyQuery2.java Fri Sep 10 12:34:18 2010
@@ -20,7 +20,6 @@ package org.apache.lucene.search;
import java.io.BufferedReader;
import java.io.InputStream;
import java.io.InputStreamReader;
-import java.util.Random;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.analysis.MockTokenizer;
@@ -57,13 +56,6 @@ import org.apache.lucene.util.LuceneTest
public class TestFuzzyQuery2 extends LuceneTestCase {
/** epsilon for score comparisons */
static final float epsilon = 0.00001f;
- private Random random;
-
- @Override
- public void setUp() throws Exception {
- super.setUp();
- random = newRandom();
- }
public void testFromTestData() throws Exception {
// TODO: randomize!
@@ -86,7 +78,7 @@ public class TestFuzzyQuery2 extends Luc
int bits = Integer.parseInt(reader.readLine());
int terms = (int) Math.pow(2, bits);
- Directory dir = newDirectory(random);
+ Directory dir = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random, dir, new MockAnalyzer(MockTokenizer.KEYWORD, false));
Document doc = new Document();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMatchAllDocsQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMatchAllDocsQuery.java?rev=995772&r1=995771&r2=995772&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMatchAllDocsQuery.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMatchAllDocsQuery.java Fri Sep 10 12:34:18 2010
@@ -17,7 +17,6 @@
package org.apache.lucene.search;
import java.io.IOException;
-import java.util.Random;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.MockAnalyzer;
@@ -39,9 +38,8 @@ public class TestMatchAllDocsQuery exten
private Analyzer analyzer = new MockAnalyzer();
public void testQuery() throws Exception {
- Random random = newRandom();
- Directory dir = newDirectory(random);
- IndexWriter iw = new IndexWriter(dir, newIndexWriterConfig(random,
+ Directory dir = newDirectory();
+ IndexWriter iw = new IndexWriter(dir, newIndexWriterConfig(
TEST_VERSION_CURRENT, analyzer).setMaxBufferedDocs(2));
addDoc("one", iw, 1f);
addDoc("two", iw, 20f);
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java?rev=995772&r1=995771&r2=995772&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java Fri Sep 10 12:34:18 2010
@@ -31,7 +31,6 @@ import org.apache.lucene.util.LuceneTest
import java.io.IOException;
import java.util.LinkedList;
-import java.util.Random;
/**
* This class tests the MultiPhraseQuery class.
@@ -44,8 +43,7 @@ public class TestMultiPhraseQuery extend
}
public void testPhrasePrefix() throws IOException {
- Random random = newRandom();
- Directory indexStore = newDirectory(random);
+ Directory indexStore = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random, indexStore);
add("blueberry pie", writer);
add("blueberry strudel", writer);
@@ -138,8 +136,7 @@ public class TestMultiPhraseQuery extend
// LUCENE-2580
public void testTall() throws IOException {
- Random random = newRandom();
- Directory indexStore = newDirectory(random);
+ Directory indexStore = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random, indexStore);
add("blueberry chocolate pie", writer);
add("blueberry chocolate tart", writer);
@@ -168,8 +165,7 @@ public class TestMultiPhraseQuery extend
// In order to cause the bug, the outer query must have more than one term
// and all terms required.
// The contained PhraseMultiQuery must contain exactly one term array.
- Random random = newRandom();
- Directory indexStore = newDirectory(random);
+ Directory indexStore = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random, indexStore);
add("blueberry pie", writer);
add("blueberry chewing gum", writer);
@@ -201,8 +197,7 @@ public class TestMultiPhraseQuery extend
}
public void testPhrasePrefixWithBooleanQuery() throws IOException {
- Random random = newRandom();
- Directory indexStore = newDirectory(random);
+ Directory indexStore = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random, indexStore);
add("This is a test", "object", writer);
add("a note", "note", writer);
@@ -230,8 +225,7 @@ public class TestMultiPhraseQuery extend
}
public void testNoDocs() throws Exception {
- Random random = newRandom();
- Directory indexStore = newDirectory(random);
+ Directory indexStore = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random, indexStore);
add("a note", "note", writer);
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiSearcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiSearcher.java?rev=995772&r1=995771&r2=995772&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiSearcher.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiSearcher.java Fri Sep 10 12:34:18 2010
@@ -18,6 +18,7 @@ package org.apache.lucene.search;
*/
import org.apache.lucene.util.LuceneTestCase;
+import org.apache.lucene.util.LuceneTestCaseJ4;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
@@ -41,13 +42,6 @@ import java.util.Set;
*/
public class TestMultiSearcher extends LuceneTestCase
{
- private Random random;
-
- @Override
- public void setUp() throws Exception {
- super.setUp();
- random = newRandom();
- }
public TestMultiSearcher(String name)
{
@@ -64,8 +58,8 @@ public class TestMultiSearcher extends L
public void testEmptyIndex() throws Exception {
// creating two directories for indices
- Directory indexStoreA = newDirectory(random);
- Directory indexStoreB = newDirectory(random);
+ Directory indexStoreA = newDirectory();
+ Directory indexStoreB = newDirectory();
// creating a document to store
Document lDoc = new Document();
@@ -88,9 +82,9 @@ public class TestMultiSearcher extends L
lDoc3.add(new Field("handle", "1", Field.Store.YES, Field.Index.NOT_ANALYZED));
// creating an index writer for the first index
- IndexWriter writerA = new IndexWriter(indexStoreA, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer()));
+ IndexWriter writerA = new IndexWriter(indexStoreA, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer()));
// creating an index writer for the second index, but writing nothing
- IndexWriter writerB = new IndexWriter(indexStoreB, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer()));
+ IndexWriter writerB = new IndexWriter(indexStoreB, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer()));
//--------------------------------------------------------------------
// scenario 1
@@ -134,7 +128,7 @@ public class TestMultiSearcher extends L
//--------------------------------------------------------------------
// adding one document to the empty index
- writerB = new IndexWriter(indexStoreB, newIndexWriterConfig(random,
+ writerB = new IndexWriter(indexStoreB, newIndexWriterConfig(
TEST_VERSION_CURRENT,
new MockAnalyzer())
.setOpenMode(OpenMode.APPEND));
@@ -227,7 +221,7 @@ public class TestMultiSearcher extends L
IndexWriter indexWriter=null;
try {
- indexWriter = new IndexWriter(directory, newIndexWriterConfig(random,
+ indexWriter = new IndexWriter(directory, LuceneTestCaseJ4.newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new MockAnalyzer()).setOpenMode(
create ? OpenMode.CREATE : OpenMode.APPEND));
@@ -245,8 +239,8 @@ public class TestMultiSearcher extends L
Directory ramDirectory1, ramDirectory2;
IndexSearcher indexSearcher1, indexSearcher2;
- ramDirectory1 = newDirectory(random);
- ramDirectory2 = newDirectory(random);
+ ramDirectory1 = newDirectory();
+ ramDirectory2 = newDirectory();
Query query = new TermQuery(new Term("contents", "doc0"));
// Now put the documents in a different index
@@ -307,7 +301,7 @@ public class TestMultiSearcher extends L
IndexSearcher indexSearcher1;
ScoreDoc[] hits;
- ramDirectory1=newDirectory(random);
+ ramDirectory1=newDirectory();
// First put the documents in the same index
initIndex(random, ramDirectory1, nDocs, true, null); // documents with a single token "doc0", "doc1", etc...
@@ -334,8 +328,8 @@ public class TestMultiSearcher extends L
Directory ramDirectory2;
IndexSearcher indexSearcher2;
- ramDirectory1=newDirectory(random);
- ramDirectory2=newDirectory(random);
+ ramDirectory1=newDirectory();
+ ramDirectory2=newDirectory();
// Now put the documents in a different index
initIndex(random, ramDirectory1, nDocs, true, null); // documents with a single token "doc0", "doc1", etc...
@@ -377,7 +371,7 @@ public class TestMultiSearcher extends L
* @throws IOException
*/
public void testCustomSimilarity () throws IOException {
- Directory dir = newDirectory(random);
+ Directory dir = newDirectory();
initIndex(random, dir, 10, true, "x"); // documents with two tokens "doc0" and "x", "doc1" and x, etc...
IndexSearcher srchr = new IndexSearcher(dir, true);
MultiSearcher msrchr = getMultiSearcherInstance(new Searcher[]{srchr});
@@ -420,8 +414,8 @@ public class TestMultiSearcher extends L
}
public void testDocFreq() throws IOException{
- Directory dir1 = newDirectory(random);
- Directory dir2 = newDirectory(random);
+ Directory dir1 = newDirectory();
+ Directory dir2 = newDirectory();
initIndex(random, dir1, 10, true, "x"); // documents with two tokens "doc0" and "x", "doc1" and x, etc...
initIndex(random, dir2, 5, true, "x"); // documents with two tokens "doc0" and "x", "doc1" and x, etc...
@@ -438,8 +432,8 @@ public class TestMultiSearcher extends L
}
public void testCreateDocFrequencyMap() throws IOException{
- Directory dir1 = newDirectory(random);
- Directory dir2 = newDirectory(random);
+ Directory dir1 = newDirectory();
+ Directory dir2 = newDirectory();
Term template = new Term("contents") ;
String[] contents = {"a", "b", "c"};
HashSet<Term> termsSet = new HashSet<Term>();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiSearcherRanking.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiSearcherRanking.java?rev=995772&r1=995771&r2=995772&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiSearcherRanking.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiSearcherRanking.java Fri Sep 10 12:34:18 2010
@@ -26,7 +26,6 @@ import org.apache.lucene.queryParser.Par
import org.apache.lucene.queryParser.QueryParser;
import org.apache.lucene.store.Directory;
import java.io.IOException;
-import java.util.Random;
/**
* Tests {@link MultiSearcher} ranking, i.e. makes sure this bug is fixed:
@@ -110,14 +109,13 @@ public class TestMultiSearcherRanking ex
@Override
protected void setUp() throws Exception {
super.setUp();
- Random random = newRandom();
// create MultiSearcher from two seperate searchers
- d1 = newDirectory(random);
- IndexWriter iw1 = new IndexWriter(d1, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer()));
+ d1 = newDirectory();
+ IndexWriter iw1 = new IndexWriter(d1, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer()));
addCollection1(iw1);
iw1.close();
- d2 = newDirectory(random);
- IndexWriter iw2 = new IndexWriter(d2, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer()));
+ d2 = newDirectory();
+ IndexWriter iw2 = new IndexWriter(d2, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer()));
addCollection2(iw2);
iw2.close();
@@ -127,8 +125,8 @@ public class TestMultiSearcherRanking ex
multiSearcher = new MultiSearcher(s);
// create IndexSearcher which contains all documents
- d = newDirectory(random);
- IndexWriter iw = new IndexWriter(d, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer()));
+ d = newDirectory();
+ IndexWriter iw = new IndexWriter(d, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer()));
addCollection1(iw);
addCollection2(iw);
iw.close();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java?rev=995772&r1=995771&r2=995772&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java Fri Sep 10 12:34:18 2010
@@ -54,8 +54,8 @@ public class TestMultiTermConstantScore
"B 2 4 5 6", "Y 3 5 6", null, "C 3 6",
"X 4 5 6" };
- small = newDirectory(rand);
- RandomIndexWriter writer = new RandomIndexWriter(rand, small, new MockAnalyzer(MockTokenizer.WHITESPACE, false));
+ small = newDirectory();
+ RandomIndexWriter writer = new RandomIndexWriter(random, small, new MockAnalyzer(MockTokenizer.WHITESPACE, false));
for (int i = 0; i < data.length; i++) {
Document doc = new Document();
@@ -608,8 +608,8 @@ public class TestMultiTermConstantScore
public void testFarsi() throws Exception {
/* build an index */
- Directory farsiIndex = newDirectory(rand);
- RandomIndexWriter writer = new RandomIndexWriter(rand, farsiIndex, new MockAnalyzer(MockTokenizer.SIMPLE, true));
+ Directory farsiIndex = newDirectory();
+ RandomIndexWriter writer = new RandomIndexWriter(random, farsiIndex, new MockAnalyzer(MockTokenizer.SIMPLE, true));
Document doc = new Document();
doc.add(new Field("content", "\u0633\u0627\u0628", Field.Store.YES,
Field.Index.NOT_ANALYZED));
@@ -648,8 +648,8 @@ public class TestMultiTermConstantScore
public void testDanish() throws Exception {
/* build an index */
- Directory danishIndex = newDirectory(rand);
- RandomIndexWriter writer = new RandomIndexWriter(rand, danishIndex, new MockAnalyzer(MockTokenizer.SIMPLE, true));
+ Directory danishIndex = newDirectory();
+ RandomIndexWriter writer = new RandomIndexWriter(random, danishIndex, new MockAnalyzer(MockTokenizer.SIMPLE, true));
// Danish collation orders the words below in the given order
// (example taken from TestSort.testInternationalSort() ).
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java?rev=995772&r1=995771&r2=995772&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java Fri Sep 10 12:34:18 2010
@@ -28,7 +28,6 @@ import org.apache.lucene.store.Directory
import org.apache.lucene.util.English;
import java.io.IOException;
-import java.util.Random;
public class TestMultiThreadTermVectors extends LuceneTestCase {
private Directory directory;
@@ -42,9 +41,8 @@ public class TestMultiThreadTermVectors
@Override
protected void setUp() throws Exception {
super.setUp();
- Random random = newRandom();
- directory = newDirectory(random);
- IndexWriter writer = new IndexWriter(directory, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer()));
+ directory = newDirectory();
+ IndexWriter writer = new IndexWriter(directory, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer()));
//writer.setUseCompoundFile(false);
//writer.infoStream = System.out;
for (int i = 0; i < numDocs; i++) {
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiValuedNumericRangeQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiValuedNumericRangeQuery.java?rev=995772&r1=995771&r2=995772&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiValuedNumericRangeQuery.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiValuedNumericRangeQuery.java Fri Sep 10 12:34:18 2010
@@ -17,7 +17,6 @@ package org.apache.lucene.search;
* limitations under the License.
*/
-import java.util.Random;
import java.util.Locale;
import java.text.DecimalFormat;
import java.text.DecimalFormatSymbols;
@@ -38,18 +37,16 @@ public class TestMultiValuedNumericRange
* do not interfere with multiple numeric values.
*/
public void testMultiValuedNRQ() throws Exception {
- final Random rnd = newRandom();
-
- Directory directory = newDirectory(rnd);
- RandomIndexWriter writer = new RandomIndexWriter(rnd, directory);
+ Directory directory = newDirectory();
+ RandomIndexWriter writer = new RandomIndexWriter(random, directory);
DecimalFormat format = new DecimalFormat("00000000000", new DecimalFormatSymbols(Locale.US));
int num = 5000 * RANDOM_MULTIPLIER;
for (int l = 0; l < num; l++) {
Document doc = new Document();
- for (int m=0, c=rnd.nextInt(10); m<=c; m++) {
- int value = rnd.nextInt(Integer.MAX_VALUE);
+ for (int m=0, c=random.nextInt(10); m<=c; m++) {
+ int value = random.nextInt(Integer.MAX_VALUE);
doc.add(new Field("asc", format.format(value), Field.Store.NO, Field.Index.NOT_ANALYZED));
doc.add(new NumericField("trie", Field.Store.NO, true).setIntValue(value));
}
@@ -61,8 +58,8 @@ public class TestMultiValuedNumericRange
Searcher searcher=new IndexSearcher(reader);
num = 50 * RANDOM_MULTIPLIER;
for (int i = 0; i < num; i++) {
- int lower=rnd.nextInt(Integer.MAX_VALUE);
- int upper=rnd.nextInt(Integer.MAX_VALUE);
+ int lower=random.nextInt(Integer.MAX_VALUE);
+ int upper=random.nextInt(Integer.MAX_VALUE);
if (lower>upper) {
int a=lower; lower=upper; upper=a;
}
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestNot.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestNot.java?rev=995772&r1=995771&r2=995772&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestNot.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestNot.java Fri Sep 10 12:34:18 2010
@@ -17,8 +17,6 @@ package org.apache.lucene.search;
* limitations under the License.
*/
-import java.util.Random;
-
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.index.IndexReader;
@@ -40,8 +38,7 @@ public class TestNot extends LuceneTestC
}
public void testNot() throws Exception {
- Random random = newRandom();
- Directory store = newDirectory(random);
+ Directory store = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random, store);
Document d1 = new Document();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java?rev=995772&r1=995771&r2=995772&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java Fri Sep 10 12:34:18 2010
@@ -25,7 +25,6 @@ import org.apache.lucene.document.Field;
import org.apache.lucene.document.NumericField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
-import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.TermsEnum;
import org.apache.lucene.store.Directory;
@@ -281,8 +280,8 @@ public class TestNumericRangeQuery32 ext
@Test
public void testInfiniteValues() throws Exception {
- Directory dir = newDirectory(random);
- IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer()));
+ Directory dir = newDirectory();
+ IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer()));
Document doc = new Document();
doc.add(new NumericField("float").setFloatValue(Float.NEGATIVE_INFINITY));
doc.add(new NumericField("int").setIntValue(Integer.MIN_VALUE));
@@ -330,13 +329,12 @@ public class TestNumericRangeQuery32 ext
}
private void testRandomTrieAndClassicRangeQuery(int precisionStep) throws Exception {
- final Random rnd=newRandom();
String field="field"+precisionStep;
int termCountT=0,termCountC=0;
int num = 10 * RANDOM_MULTIPLIER;
for (int i = 0; i < num; i++) {
- int lower=(int)(rnd.nextDouble()*noDocs*distance)+startOffset;
- int upper=(int)(rnd.nextDouble()*noDocs*distance)+startOffset;
+ int lower=(int)(random.nextDouble()*noDocs*distance)+startOffset;
+ int upper=(int)(random.nextDouble()*noDocs*distance)+startOffset;
if (lower>upper) {
int a=lower; lower=upper; upper=a;
}
@@ -409,13 +407,12 @@ public class TestNumericRangeQuery32 ext
}
private void testRangeSplit(int precisionStep) throws Exception {
- final Random rnd=newRandom();
String field="ascfield"+precisionStep;
// 10 random tests
int num = 10 * RANDOM_MULTIPLIER;
for (int i =0; i< num; i++) {
- int lower=(int)(rnd.nextDouble()*noDocs - noDocs/2);
- int upper=(int)(rnd.nextDouble()*noDocs - noDocs/2);
+ int lower=(int)(random.nextDouble()*noDocs - noDocs/2);
+ int upper=(int)(random.nextDouble()*noDocs - noDocs/2);
if (lower>upper) {
int a=lower; lower=upper; upper=a;
}
@@ -485,14 +482,13 @@ public class TestNumericRangeQuery32 ext
}
private void testSorting(int precisionStep) throws Exception {
- final Random rnd=newRandom();
String field="field"+precisionStep;
// 10 random tests, the index order is ascending,
// so using a reverse sort field should retun descending documents
int num = 10 * RANDOM_MULTIPLIER;
for (int i = 0; i < num; i++) {
- int lower=(int)(rnd.nextDouble()*noDocs*distance)+startOffset;
- int upper=(int)(rnd.nextDouble()*noDocs*distance)+startOffset;
+ int lower=(int)(random.nextDouble()*noDocs*distance)+startOffset;
+ int upper=(int)(random.nextDouble()*noDocs*distance)+startOffset;
if (lower>upper) {
int a=lower; lower=upper; upper=a;
}
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java?rev=995772&r1=995771&r2=995772&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java Fri Sep 10 12:34:18 2010
@@ -25,7 +25,6 @@ import org.apache.lucene.document.Field;
import org.apache.lucene.document.NumericField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
-import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BytesRef;
@@ -299,8 +298,8 @@ public class TestNumericRangeQuery64 ext
@Test
public void testInfiniteValues() throws Exception {
- Directory dir = newDirectory(random);
- IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random,
+ Directory dir = newDirectory();
+ IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(
TEST_VERSION_CURRENT, new MockAnalyzer()));
Document doc = new Document();
doc.add(new NumericField("double").setDoubleValue(Double.NEGATIVE_INFINITY));
@@ -349,13 +348,12 @@ public class TestNumericRangeQuery64 ext
}
private void testRandomTrieAndClassicRangeQuery(int precisionStep) throws Exception {
- final Random rnd=newRandom();
String field="field"+precisionStep;
int termCountT=0,termCountC=0;
int num = 10 * RANDOM_MULTIPLIER;
for (int i = 0; i < num; i++) {
- long lower=(long)(rnd.nextDouble()*noDocs*distance)+startOffset;
- long upper=(long)(rnd.nextDouble()*noDocs*distance)+startOffset;
+ long lower=(long)(random.nextDouble()*noDocs*distance)+startOffset;
+ long upper=(long)(random.nextDouble()*noDocs*distance)+startOffset;
if (lower>upper) {
long a=lower; lower=upper; upper=a;
}
@@ -433,13 +431,12 @@ public class TestNumericRangeQuery64 ext
}
private void testRangeSplit(int precisionStep) throws Exception {
- final Random rnd=newRandom();
String field="ascfield"+precisionStep;
// 10 random tests
int num = 10 * RANDOM_MULTIPLIER;
for (int i = 0; i < num; i++) {
- long lower=(long)(rnd.nextDouble()*noDocs - noDocs/2);
- long upper=(long)(rnd.nextDouble()*noDocs - noDocs/2);
+ long lower=(long)(random.nextDouble()*noDocs - noDocs/2);
+ long upper=(long)(random.nextDouble()*noDocs - noDocs/2);
if (lower>upper) {
long a=lower; lower=upper; upper=a;
}
@@ -519,14 +516,13 @@ public class TestNumericRangeQuery64 ext
}
private void testSorting(int precisionStep) throws Exception {
- final Random rnd=newRandom();
String field="field"+precisionStep;
// 10 random tests, the index order is ascending,
// so using a reverse sort field should retun descending documents
int num = 10 * RANDOM_MULTIPLIER;
for (int i = 0; i < num; i++) {
- long lower=(long)(rnd.nextDouble()*noDocs*distance)+startOffset;
- long upper=(long)(rnd.nextDouble()*noDocs*distance)+startOffset;
+ long lower=(long)(random.nextDouble()*noDocs*distance)+startOffset;
+ long upper=(long)(random.nextDouble()*noDocs*distance)+startOffset;
if (lower>upper) {
long a=lower; lower=upper; upper=a;
}