You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by dw...@apache.org on 2012/04/15 16:42:01 UTC
svn commit: r1326351 [9/22] - in /lucene/dev/trunk: ./ dev-tools/eclipse/
lucene/
lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/
lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/custom/
lucene/contrib/high...
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsWriter.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsWriter.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsWriter.java Sun Apr 15 14:41:44 2012
@@ -44,7 +44,7 @@ public class TestTermVectorsWriter exten
public void testDoubleOffsetCounting() throws Exception {
Directory dir = newDirectory();
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig(
- TEST_VERSION_CURRENT, new MockAnalyzer(random)));
+ TEST_VERSION_CURRENT, new MockAnalyzer(random())));
Document doc = new Document();
FieldType customType = new FieldType(StringField.TYPE_UNSTORED);
customType.setStoreTermVectors(true);
@@ -103,7 +103,7 @@ public class TestTermVectorsWriter exten
// LUCENE-1442
public void testDoubleOffsetCounting2() throws Exception {
Directory dir = newDirectory();
- IndexWriter w = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random)));
+ IndexWriter w = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random())));
Document doc = new Document();
FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
customType.setStoreTermVectors(true);
@@ -138,7 +138,7 @@ public class TestTermVectorsWriter exten
// LUCENE-1448
public void testEndOffsetPositionCharAnalyzer() throws Exception {
Directory dir = newDirectory();
- IndexWriter w = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random)));
+ IndexWriter w = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random())));
Document doc = new Document();
FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
customType.setStoreTermVectors(true);
@@ -173,7 +173,7 @@ public class TestTermVectorsWriter exten
// LUCENE-1448
public void testEndOffsetPositionWithCachingTokenFilter() throws Exception {
Directory dir = newDirectory();
- Analyzer analyzer = new MockAnalyzer(random);
+ Analyzer analyzer = new MockAnalyzer(random());
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, analyzer));
Document doc = new Document();
TokenStream stream = analyzer.tokenStream("field", new StringReader("abcd "));
@@ -213,7 +213,7 @@ public class TestTermVectorsWriter exten
public void testEndOffsetPositionStopFilter() throws Exception {
Directory dir = newDirectory();
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig(
- TEST_VERSION_CURRENT, new MockAnalyzer(random, MockTokenizer.SIMPLE, true, MockTokenFilter.ENGLISH_STOPSET, true)));
+ TEST_VERSION_CURRENT, new MockAnalyzer(random(), MockTokenizer.SIMPLE, true, MockTokenFilter.ENGLISH_STOPSET, true)));
Document doc = new Document();
FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
customType.setStoreTermVectors(true);
@@ -249,7 +249,7 @@ public class TestTermVectorsWriter exten
public void testEndOffsetPositionStandard() throws Exception {
Directory dir = newDirectory();
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig(
- TEST_VERSION_CURRENT, new MockAnalyzer(random)));
+ TEST_VERSION_CURRENT, new MockAnalyzer(random())));
Document doc = new Document();
FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
customType.setStoreTermVectors(true);
@@ -294,7 +294,7 @@ public class TestTermVectorsWriter exten
public void testEndOffsetPositionStandardEmptyField() throws Exception {
Directory dir = newDirectory();
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig(
- TEST_VERSION_CURRENT, new MockAnalyzer(random)));
+ TEST_VERSION_CURRENT, new MockAnalyzer(random())));
Document doc = new Document();
FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
customType.setStoreTermVectors(true);
@@ -333,7 +333,7 @@ public class TestTermVectorsWriter exten
public void testEndOffsetPositionStandardEmptyField2() throws Exception {
Directory dir = newDirectory();
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig(
- TEST_VERSION_CURRENT, new MockAnalyzer(random)));
+ TEST_VERSION_CURRENT, new MockAnalyzer(random())));
Document doc = new Document();
FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
customType.setStoreTermVectors(true);
@@ -379,7 +379,7 @@ public class TestTermVectorsWriter exten
Directory dir = newDirectory();
for(int iter=0;iter<2;iter++) {
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(
- TEST_VERSION_CURRENT, new MockAnalyzer(random))
+ TEST_VERSION_CURRENT, new MockAnalyzer(random()))
.setMaxBufferedDocs(2).setRAMBufferSizeMB(
IndexWriterConfig.DISABLE_AUTO_FLUSH).setMergeScheduler(
new SerialMergeScheduler()).setMergePolicy(
@@ -415,12 +415,12 @@ public class TestTermVectorsWriter exten
reader.close();
writer = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT,
- new MockAnalyzer(random)).setMaxBufferedDocs(2)
+ new MockAnalyzer(random())).setMaxBufferedDocs(2)
.setRAMBufferSizeMB(IndexWriterConfig.DISABLE_AUTO_FLUSH)
.setMergeScheduler(new SerialMergeScheduler()).setMergePolicy(
new LogDocMergePolicy()));
- Directory[] indexDirs = {new MockDirectoryWrapper(random, new RAMDirectory(dir, newIOContext(random)))};
+ Directory[] indexDirs = {new MockDirectoryWrapper(random(), new RAMDirectory(dir, newIOContext(random())))};
writer.addIndexes(indexDirs);
writer.forceMerge(1);
writer.close();
@@ -433,7 +433,7 @@ public class TestTermVectorsWriter exten
Directory dir = newDirectory();
for(int iter=0;iter<2;iter++) {
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(
- TEST_VERSION_CURRENT, new MockAnalyzer(random))
+ TEST_VERSION_CURRENT, new MockAnalyzer(random()))
.setMaxBufferedDocs(2).setRAMBufferSizeMB(
IndexWriterConfig.DISABLE_AUTO_FLUSH).setMergeScheduler(
new SerialMergeScheduler()).setMergePolicy(
@@ -474,7 +474,7 @@ public class TestTermVectorsWriter exten
public void testTermVectorCorruption3() throws IOException {
Directory dir = newDirectory();
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(
- TEST_VERSION_CURRENT, new MockAnalyzer(random))
+ TEST_VERSION_CURRENT, new MockAnalyzer(random()))
.setMaxBufferedDocs(2).setRAMBufferSizeMB(
IndexWriterConfig.DISABLE_AUTO_FLUSH).setMergeScheduler(
new SerialMergeScheduler()).setMergePolicy(new LogDocMergePolicy()));
@@ -496,7 +496,7 @@ public class TestTermVectorsWriter exten
writer.close();
writer = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT,
- new MockAnalyzer(random)).setMaxBufferedDocs(2)
+ new MockAnalyzer(random())).setMaxBufferedDocs(2)
.setRAMBufferSizeMB(IndexWriterConfig.DISABLE_AUTO_FLUSH)
.setMergeScheduler(new SerialMergeScheduler()).setMergePolicy(
new LogDocMergePolicy()));
@@ -519,7 +519,7 @@ public class TestTermVectorsWriter exten
public void testNoTermVectorAfterTermVector() throws IOException {
Directory dir = newDirectory();
IndexWriter iw = new IndexWriter(dir, newIndexWriterConfig(
- TEST_VERSION_CURRENT, new MockAnalyzer(random)));
+ TEST_VERSION_CURRENT, new MockAnalyzer(random())));
Document document = new Document();
FieldType customType2 = new FieldType(StringField.TYPE_UNSTORED);
customType2.setStoreTermVectors(true);
@@ -549,7 +549,7 @@ public class TestTermVectorsWriter exten
public void testNoTermVectorAfterTermVectorMerge() throws IOException {
Directory dir = newDirectory();
IndexWriter iw = new IndexWriter(dir, newIndexWriterConfig(
- TEST_VERSION_CURRENT, new MockAnalyzer(random)));
+ TEST_VERSION_CURRENT, new MockAnalyzer(random())));
Document document = new Document();
FieldType customType = new FieldType(StringField.TYPE_UNSTORED);
customType.setStoreTermVectors(true);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermdocPerf.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermdocPerf.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermdocPerf.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermdocPerf.java Sun Apr 15 14:41:44 2012
@@ -109,7 +109,7 @@ public class TestTermdocPerf extends Luc
Directory dir = newDirectory();
long start = System.currentTimeMillis();
- addDocs(random, dir, ndocs, "foo", "val", maxTF, percentDocs);
+ addDocs(random(), dir, ndocs, "foo", "val", maxTF, percentDocs);
long end = System.currentTimeMillis();
if (VERBOSE) System.out.println("milliseconds for creation of " + ndocs + " docs = " + (end-start));
@@ -121,6 +121,7 @@ public class TestTermdocPerf extends Luc
int ret=0;
DocsEnum tdocs = null;
+ final Random random = new Random(random().nextLong());
for (int i=0; i<iter; i++) {
tenum.seekCeil(new BytesRef("val"));
tdocs = _TestUtil.docs(random, tenum, MultiFields.getLiveDocs(reader), tdocs, false);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum.java Sun Apr 15 14:41:44 2012
@@ -18,16 +18,7 @@ package org.apache.lucene.index;
*/
import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
+import java.util.*;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
@@ -52,9 +43,10 @@ import org.apache.lucene.util.automaton.
public class TestTermsEnum extends LuceneTestCase {
public void test() throws Exception {
+ Random random = new Random(random().nextLong());
final LineFileDocs docs = new LineFileDocs(random, defaultCodecSupportsDocValues());
final Directory d = newDirectory();
- final RandomIndexWriter w = new RandomIndexWriter(random, d);
+ final RandomIndexWriter w = new RandomIndexWriter(random(), d);
final int numDocs = atLeast(10);
for(int docCount=0;docCount<numDocs;docCount++) {
w.addDocument(docs.nextDoc());
@@ -76,7 +68,7 @@ public class TestTermsEnum extends Lucen
final int iters = atLeast(200);
for(int iter=0;iter<iters;iter++) {
final boolean isEnd;
- if (upto != -1 && random.nextBoolean()) {
+ if (upto != -1 && random().nextBoolean()) {
// next
if (VERBOSE) {
System.out.println("TEST: iter next");
@@ -100,28 +92,28 @@ public class TestTermsEnum extends Lucen
final BytesRef target;
final String exists;
- if (random.nextBoolean()) {
+ if (random().nextBoolean()) {
// likely fake term
- if (random.nextBoolean()) {
- target = new BytesRef(_TestUtil.randomSimpleString(random));
+ if (random().nextBoolean()) {
+ target = new BytesRef(_TestUtil.randomSimpleString(random()));
} else {
- target = new BytesRef(_TestUtil.randomRealisticUnicodeString(random));
+ target = new BytesRef(_TestUtil.randomRealisticUnicodeString(random()));
}
exists = "likely not";
} else {
// real term
- target = terms.get(random.nextInt(terms.size()));
+ target = terms.get(random().nextInt(terms.size()));
exists = "yes";
}
upto = Collections.binarySearch(terms, target);
- if (random.nextBoolean()) {
+ if (random().nextBoolean()) {
if (VERBOSE) {
System.out.println("TEST: iter seekCeil target=" + target.utf8ToString() + " exists=" + exists);
}
// seekCeil
- final TermsEnum.SeekStatus status = termsEnum.seekCeil(target, random.nextBoolean());
+ final TermsEnum.SeekStatus status = termsEnum.seekCeil(target, random().nextBoolean());
if (VERBOSE) {
System.out.println(" got " + status);
}
@@ -190,7 +182,7 @@ public class TestTermsEnum extends Lucen
public void testIntersectRandom() throws IOException {
final Directory dir = newDirectory();
- final RandomIndexWriter w = new RandomIndexWriter(random, dir);
+ final RandomIndexWriter w = new RandomIndexWriter(random(), dir);
final int numTerms = atLeast(300);
@@ -203,7 +195,7 @@ public class TestTermsEnum extends Lucen
if (!terms.contains(s)) {
terms.add(s);
pendingTerms.add(s);
- if (random.nextInt(20) == 7) {
+ if (random().nextInt(20) == 7) {
addDoc(w, pendingTerms, termToID, id++);
}
}
@@ -243,7 +235,7 @@ public class TestTermsEnum extends Lucen
// automaton:
final Set<String> acceptTerms = new HashSet<String>();
final TreeSet<BytesRef> sortedAcceptTerms = new TreeSet<BytesRef>();
- final double keepPct = random.nextDouble();
+ final double keepPct = random().nextDouble();
Automaton a;
if (iter == 0) {
if (VERBOSE) {
@@ -256,7 +248,7 @@ public class TestTermsEnum extends Lucen
}
for (String s : terms) {
final String s2;
- if (random.nextDouble() <= keepPct) {
+ if (random().nextDouble() <= keepPct) {
s2 = s;
} else {
s2 = getRandomString();
@@ -288,7 +280,7 @@ public class TestTermsEnum extends Lucen
}
for(int iter2=0;iter2<100;iter2++) {
- final BytesRef startTerm = acceptTermsArray.length == 0 || random.nextBoolean() ? null : acceptTermsArray[random.nextInt(acceptTermsArray.length)];
+ final BytesRef startTerm = acceptTermsArray.length == 0 || random().nextBoolean() ? null : acceptTermsArray[random().nextInt(acceptTermsArray.length)];
if (VERBOSE) {
System.out.println("\nTEST: iter2=" + iter2 + " startTerm=" + (startTerm == null ? "<null>" : startTerm.utf8ToString()));
@@ -332,7 +324,7 @@ public class TestTermsEnum extends Lucen
}
assertEquals(expected, actual);
assertEquals(1, te.docFreq());
- docsEnum = _TestUtil.docs(random, te, null, docsEnum, false);
+ docsEnum = _TestUtil.docs(random(), te, null, docsEnum, false);
final int docID = docsEnum.nextDoc();
assertTrue(docID != DocIdSetIterator.NO_MORE_DOCS);
assertEquals(docIDToID[docID], termToID.get(expected).intValue());
@@ -356,13 +348,13 @@ public class TestTermsEnum extends Lucen
private IndexReader makeIndex(String... terms) throws Exception {
d = newDirectory();
- IndexWriterConfig iwc = newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random));
+ IndexWriterConfig iwc = newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random()));
/*
iwc.setCodec(new StandardCodec(minTermsInBlock, maxTermsInBlock));
*/
- final RandomIndexWriter w = new RandomIndexWriter(random, d, iwc);
+ final RandomIndexWriter w = new RandomIndexWriter(random(), d, iwc);
for(String term : terms) {
Document doc = new Document();
Field f = newField(FIELD, term, StringField.TYPE_UNSTORED);
@@ -502,7 +494,7 @@ public class TestTermsEnum extends Lucen
public void testZeroTerms() throws Exception {
d = newDirectory();
- final RandomIndexWriter w = new RandomIndexWriter(random, d);
+ final RandomIndexWriter w = new RandomIndexWriter(random(), d);
Document doc = new Document();
doc.add(newField("field", "one two three", TextField.TYPE_UNSTORED));
doc = new Document();
@@ -525,18 +517,18 @@ public class TestTermsEnum extends Lucen
private String getRandomString() {
//return _TestUtil.randomSimpleString(random);
- return _TestUtil.randomRealisticUnicodeString(random);
+ return _TestUtil.randomRealisticUnicodeString(random());
}
public void testRandomTerms() throws Exception {
- final String[] terms = new String[_TestUtil.nextInt(random, 1, atLeast(1000))];
+ final String[] terms = new String[_TestUtil.nextInt(random(), 1, atLeast(1000))];
final Set<String> seen = new HashSet<String>();
- final boolean allowEmptyString = random.nextBoolean();
+ final boolean allowEmptyString = random().nextBoolean();
- if (random.nextInt(10) == 7 && terms.length > 2) {
+ if (random().nextInt(10) == 7 && terms.length > 2) {
// Sometimes add a bunch of terms sharing a longish common prefix:
- final int numTermsSamePrefix = random.nextInt(terms.length/2);
+ final int numTermsSamePrefix = random().nextInt(terms.length/2);
if (numTermsSamePrefix > 0) {
String prefix;
while(true) {
@@ -571,7 +563,7 @@ public class TestTermsEnum extends Lucen
// sugar
private boolean seekExact(TermsEnum te, String term) throws IOException {
- return te.seekExact(new BytesRef(term), random.nextBoolean());
+ return te.seekExact(new BytesRef(term), random().nextBoolean());
}
// sugar
@@ -628,7 +620,7 @@ public class TestTermsEnum extends Lucen
final BytesRef t;
int loc;
final TermState termState;
- if (random.nextInt(6) == 4) {
+ if (random().nextInt(6) == 4) {
// pick term that doens't exist:
t = getNonExistTerm(validTerms);
termState = null;
@@ -636,8 +628,8 @@ public class TestTermsEnum extends Lucen
System.out.println("\nTEST: invalid term=" + t.utf8ToString());
}
loc = Arrays.binarySearch(validTerms, t);
- } else if (termStates.size() != 0 && random.nextInt(4) == 1) {
- final TermAndState ts = termStates.get(random.nextInt(termStates.size()));
+ } else if (termStates.size() != 0 && random().nextInt(4) == 1) {
+ final TermAndState ts = termStates.get(random().nextInt(termStates.size()));
t = ts.term;
loc = Arrays.binarySearch(validTerms, t);
assertTrue(loc >= 0);
@@ -647,7 +639,7 @@ public class TestTermsEnum extends Lucen
}
} else {
// pick valid term
- loc = random.nextInt(validTerms.length);
+ loc = random().nextInt(validTerms.length);
t = BytesRef.deepCopyOf(validTerms[loc]);
termState = null;
if (VERBOSE) {
@@ -656,7 +648,7 @@ public class TestTermsEnum extends Lucen
}
// seekCeil or seekExact:
- final boolean doSeekExact = random.nextBoolean();
+ final boolean doSeekExact = random().nextBoolean();
if (termState != null) {
if (VERBOSE) {
System.out.println(" seekExact termState");
@@ -666,13 +658,13 @@ public class TestTermsEnum extends Lucen
if (VERBOSE) {
System.out.println(" seekExact");
}
- assertEquals(loc >= 0, te.seekExact(t, random.nextBoolean()));
+ assertEquals(loc >= 0, te.seekExact(t, random().nextBoolean()));
} else {
if (VERBOSE) {
System.out.println(" seekCeil");
}
- final TermsEnum.SeekStatus result = te.seekCeil(t, random.nextBoolean());
+ final TermsEnum.SeekStatus result = te.seekCeil(t, random().nextBoolean());
if (VERBOSE) {
System.out.println(" got " + result);
}
@@ -700,7 +692,7 @@ public class TestTermsEnum extends Lucen
}
// Do a bunch of next's after the seek
- final int numNext = random.nextInt(validTerms.length);
+ final int numNext = random().nextInt(validTerms.length);
for(int nextCount=0;nextCount<numNext;nextCount++) {
if (VERBOSE) {
@@ -713,7 +705,7 @@ public class TestTermsEnum extends Lucen
break;
} else {
assertEquals(validTerms[loc], t2);
- if (random.nextInt(40) == 17 && termStates.size() < 100) {
+ if (random().nextInt(40) == 17 && termStates.size() < 100) {
termStates.add(new TermAndState(validTerms[loc], te.termState()));
}
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum2.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum2.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum2.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum2.java Sun Apr 15 14:41:44 2012
@@ -59,10 +59,10 @@ public class TestTermsEnum2 extends Luce
// but for preflex codec, the test can be very slow, so use less iterations.
numIterations = Codec.getDefault().getName().equals("Lucene3x") ? 10 * RANDOM_MULTIPLIER : atLeast(50);
dir = newDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(random, dir,
+ RandomIndexWriter writer = new RandomIndexWriter(random(), dir,
newIndexWriterConfig(TEST_VERSION_CURRENT,
- new MockAnalyzer(random, MockTokenizer.KEYWORD, false))
- .setMaxBufferedDocs(_TestUtil.nextInt(random, 50, 1000)));
+ new MockAnalyzer(random(), MockTokenizer.KEYWORD, false))
+ .setMaxBufferedDocs(_TestUtil.nextInt(random(), 50, 1000)));
Document doc = new Document();
Field field = newField("field", "", StringField.TYPE_STORED);
doc.add(field);
@@ -70,7 +70,7 @@ public class TestTermsEnum2 extends Luce
int num = atLeast(200);
for (int i = 0; i < num; i++) {
- String s = _TestUtil.randomUnicodeString(random);
+ String s = _TestUtil.randomUnicodeString(random());
field.setStringValue(s);
terms.add(new BytesRef(s));
writer.addDocument(doc);
@@ -92,7 +92,7 @@ public class TestTermsEnum2 extends Luce
/** tests a pre-intersected automaton against the original */
public void testFiniteVersusInfinite() throws Exception {
for (int i = 0; i < numIterations; i++) {
- String reg = AutomatonTestUtil.randomRegexp(random);
+ String reg = AutomatonTestUtil.randomRegexp(random());
Automaton automaton = new RegExp(reg, RegExp.NONE).toAutomaton();
final List<BytesRef> matchedTerms = new ArrayList<BytesRef>();
for(BytesRef t : terms) {
@@ -114,21 +114,21 @@ public class TestTermsEnum2 extends Luce
/** seeks to every term accepted by some automata */
public void testSeeking() throws Exception {
for (int i = 0; i < numIterations; i++) {
- String reg = AutomatonTestUtil.randomRegexp(random);
+ String reg = AutomatonTestUtil.randomRegexp(random());
Automaton automaton = new RegExp(reg, RegExp.NONE).toAutomaton();
TermsEnum te = MultiFields.getTerms(reader, "field").iterator(null);
ArrayList<BytesRef> unsortedTerms = new ArrayList<BytesRef>(terms);
- Collections.shuffle(unsortedTerms, random);
+ Collections.shuffle(unsortedTerms, random());
for (BytesRef term : unsortedTerms) {
if (BasicOperations.run(automaton, term.utf8ToString())) {
// term is accepted
- if (random.nextBoolean()) {
+ if (random().nextBoolean()) {
// seek exact
- assertTrue(te.seekExact(term, random.nextBoolean()));
+ assertTrue(te.seekExact(term, random().nextBoolean()));
} else {
// seek ceil
- assertEquals(SeekStatus.FOUND, te.seekCeil(term, random.nextBoolean()));
+ assertEquals(SeekStatus.FOUND, te.seekCeil(term, random().nextBoolean()));
assertEquals(term, te.term());
}
}
@@ -142,14 +142,14 @@ public class TestTermsEnum2 extends Luce
TermsEnum te = MultiFields.getTerms(reader, "field").iterator(null);
for (BytesRef term : terms) {
- int c = random.nextInt(3);
+ int c = random().nextInt(3);
if (c == 0) {
assertEquals(term, te.next());
} else if (c == 1) {
- assertEquals(SeekStatus.FOUND, te.seekCeil(term, random.nextBoolean()));
+ assertEquals(SeekStatus.FOUND, te.seekCeil(term, random().nextBoolean()));
assertEquals(term, te.term());
} else {
- assertTrue(te.seekExact(term, random.nextBoolean()));
+ assertTrue(te.seekExact(term, random().nextBoolean()));
}
}
}
@@ -158,7 +158,7 @@ public class TestTermsEnum2 extends Luce
/** tests intersect: TODO start at a random term! */
public void testIntersect() throws Exception {
for (int i = 0; i < numIterations; i++) {
- String reg = AutomatonTestUtil.randomRegexp(random);
+ String reg = AutomatonTestUtil.randomRegexp(random());
Automaton automaton = new RegExp(reg, RegExp.NONE).toAutomaton();
CompiledAutomaton ca = new CompiledAutomaton(automaton, SpecialOperations.isFinite(automaton), false);
TermsEnum te = MultiFields.getTerms(reader, "field").intersect(ca, null);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestThreadedForceMerge.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestThreadedForceMerge.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestThreadedForceMerge.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestThreadedForceMerge.java Sun Apr 15 14:41:44 2012
@@ -28,12 +28,13 @@ import org.apache.lucene.index.IndexWrit
import org.apache.lucene.util.English;
import org.apache.lucene.util.LuceneTestCase;
+import org.junit.BeforeClass;
import java.util.Random;
public class TestThreadedForceMerge extends LuceneTestCase {
-
- private static final Analyzer ANALYZER = new MockAnalyzer(random, MockTokenizer.SIMPLE, true);
+
+ private static Analyzer ANALYZER;
private final static int NUM_THREADS = 3;
//private final static int NUM_THREADS = 5;
@@ -44,6 +45,11 @@ public class TestThreadedForceMerge exte
private volatile boolean failed;
+ @BeforeClass
+ public static void setup() {
+ ANALYZER = new MockAnalyzer(random(), MockTokenizer.SIMPLE, true);
+ }
+
private void setFailed() {
failed = true;
}
@@ -137,7 +143,7 @@ public class TestThreadedForceMerge exte
*/
public void testThreadedForceMerge() throws Exception {
Directory directory = newDirectory();
- runTest(random, directory);
+ runTest(random(), directory);
directory.close();
}
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTieredMergePolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTieredMergePolicy.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTieredMergePolicy.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTieredMergePolicy.java Sun Apr 15 14:41:44 2012
@@ -29,7 +29,7 @@ public class TestTieredMergePolicy exten
public void testForceMergeDeletes() throws Exception {
Directory dir = newDirectory();
- IndexWriterConfig conf = newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random));
+ IndexWriterConfig conf = newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random()));
TieredMergePolicy tmp = newTieredMergePolicy();
conf.setMergePolicy(tmp);
conf.setMaxBufferedDocs(4);
@@ -72,7 +72,7 @@ public class TestTieredMergePolicy exten
System.out.println("TEST: iter=" + iter);
}
Directory dir = newDirectory();
- IndexWriterConfig conf = newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random));
+ IndexWriterConfig conf = newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random()));
conf.setMergeScheduler(new SerialMergeScheduler());
TieredMergePolicy tmp = newTieredMergePolicy();
conf.setMergePolicy(tmp);
@@ -82,7 +82,7 @@ public class TestTieredMergePolicy exten
IndexWriter w = new IndexWriter(dir, conf);
int maxCount = 0;
- final int numDocs = _TestUtil.nextInt(random, 20, 100);
+ final int numDocs = _TestUtil.nextInt(random(), 20, 100);
for(int i=0;i<numDocs;i++) {
Document doc = new Document();
doc.add(newField("content", "aaa " + (i%4), TextField.TYPE_UNSTORED));
@@ -95,7 +95,7 @@ public class TestTieredMergePolicy exten
w.flush(true, true);
int segmentCount = w.getSegmentCount();
- int targetCount = _TestUtil.nextInt(random, 1, segmentCount);
+ int targetCount = _TestUtil.nextInt(random(), 1, segmentCount);
if (VERBOSE) {
System.out.println("TEST: merge to " + targetCount + " segs (current count=" + segmentCount + ")");
}
@@ -109,13 +109,13 @@ public class TestTieredMergePolicy exten
public void testForceMergeDeletesMaxSegSize() throws Exception {
final Directory dir = newDirectory();
- final IndexWriterConfig conf = newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random));
+ final IndexWriterConfig conf = newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random()));
final TieredMergePolicy tmp = new TieredMergePolicy();
tmp.setMaxMergedSegmentMB(0.01);
tmp.setForceMergeDeletesPctAllowed(0.0);
conf.setMergePolicy(tmp);
- final RandomIndexWriter w = new RandomIndexWriter(random, dir, conf);
+ final RandomIndexWriter w = new RandomIndexWriter(random(), dir, conf);
w.setDoRandomForceMerge(false);
final int numDocs = atLeast(200);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTransactionRollback.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTransactionRollback.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTransactionRollback.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTransactionRollback.java Sun Apr 15 14:41:44 2012
@@ -64,7 +64,7 @@ public class TestTransactionRollback ext
throw new RuntimeException("Couldn't find commit point "+id);
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig(
- TEST_VERSION_CURRENT, new MockAnalyzer(random)).setIndexDeletionPolicy(
+ TEST_VERSION_CURRENT, new MockAnalyzer(random())).setIndexDeletionPolicy(
new RollbackDeletionPolicy(id)).setIndexCommit(last));
Map<String,String> data = new HashMap<String,String>();
data.put("index", "Rolled back to 1-"+id);
@@ -127,7 +127,7 @@ public class TestTransactionRollback ext
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( TEST_VERSION_CURRENT, new MockAnalyzer(random)).setIndexDeletionPolicy(sdp));
+ IndexWriter w=new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random())).setIndexDeletionPolicy(sdp));
for(int currentRecordId=1;currentRecordId<=100;currentRecordId++) {
Document doc=new Document();
@@ -202,7 +202,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( TEST_VERSION_CURRENT, new MockAnalyzer(random))
+ new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random()))
.setIndexDeletionPolicy(new DeleteLastCommitPolicy())).close();
IndexReader r = IndexReader.open(dir);
assertEquals(100, r.numDocs());
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTransactions.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTransactions.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTransactions.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTransactions.java Sun Apr 15 14:41:44 2012
@@ -37,7 +37,7 @@ public class TestTransactions extends Lu
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");
}
}
@@ -96,7 +96,7 @@ public class TestTransactions extends Lu
IndexWriter writer1 = new IndexWriter(
dir1,
- newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)).
+ newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())).
setMaxBufferedDocs(3).
setMergeScheduler(new ConcurrentMergeScheduler()).
setMergePolicy(newLogMergePolicy(2))
@@ -107,7 +107,7 @@ public class TestTransactions extends Lu
// happen @ different times
IndexWriter writer2 = new IndexWriter(
dir2,
- newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random)).
+ newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random())).
setMaxBufferedDocs(2).
setMergeScheduler(new ConcurrentMergeScheduler()).
setMergePolicy(newLogMergePolicy(3))
@@ -152,7 +152,7 @@ public class TestTransactions extends Lu
customType.setStoreTermVectors(true);
for(int j=0; j<10; j++) {
Document d = new Document();
- int n = random.nextInt();
+ int n = random().nextInt();
d.add(newField("id", Integer.toString(nextID++), customType));
d.add(newField("contents", English.intToEnglish(n), TextField.TYPE_UNSTORED));
writer.addDocument(d);
@@ -194,10 +194,10 @@ public class TestTransactions extends Lu
}
public void initIndex(Directory dir) throws Throwable {
- IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random)));
+ IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random())));
for(int j=0; j<7; j++) {
Document d = new Document();
- int n = random.nextInt();
+ int n = random().nextInt();
d.add(newField("contents", English.intToEnglish(n), TextField.TYPE_UNSTORED));
writer.addDocument(d);
}
@@ -206,8 +206,8 @@ public class TestTransactions extends Lu
public void testTransactions() throws Throwable {
// we cant use non-ramdir on windows, because this test needs to double-write.
- MockDirectoryWrapper dir1 = new MockDirectoryWrapper(random, new RAMDirectory());
- MockDirectoryWrapper dir2 = new MockDirectoryWrapper(random, new RAMDirectory());
+ MockDirectoryWrapper dir1 = new MockDirectoryWrapper(random(), new RAMDirectory());
+ MockDirectoryWrapper dir2 = new MockDirectoryWrapper(random(), new RAMDirectory());
dir1.setPreventDoubleWrite(false);
dir2.setPreventDoubleWrite(false);
dir1.failOn(new RandomFailure());
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTypePromotion.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTypePromotion.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTypePromotion.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTypePromotion.java Sun Apr 15 14:41:44 2012
@@ -69,28 +69,28 @@ public class TestTypePromotion extends L
throws CorruptIndexException, IOException {
Directory dir = newDirectory();
IndexWriter writer = new IndexWriter(dir,
- newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)));
+ newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())));
int num_1 = atLeast(200);
int num_2 = atLeast(200);
int num_3 = atLeast(200);
long[] values = new long[num_1 + num_2 + num_3];
index(writer,
- randomValueType(types, random), values, 0, num_1);
+ randomValueType(types, random()), values, 0, num_1);
writer.commit();
index(writer,
- randomValueType(types, random), values, num_1, num_2);
+ randomValueType(types, random()), values, num_1, num_2);
writer.commit();
- if (random.nextInt(4) == 0) {
+ if (random().nextInt(4) == 0) {
// once in a while use addIndexes
writer.forceMerge(1);
Directory dir_2 = newDirectory() ;
IndexWriter writer_2 = new IndexWriter(dir_2,
- newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)));
+ newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())));
index(writer_2,
- randomValueType(types, random), values, num_1 + num_2, num_3);
+ randomValueType(types, random()), values, num_1 + num_2, num_3);
writer_2.commit();
writer_2.close();
if (rarely()) {
@@ -104,7 +104,7 @@ public class TestTypePromotion extends L
dir_2.close();
} else {
index(writer,
- randomValueType(types, random), values, num_1 + num_2, num_3);
+ randomValueType(types, random()), values, num_1 + num_2, num_3);
}
writer.forceMerge(1);
@@ -214,28 +214,28 @@ public class TestTypePromotion extends L
doc.add(new Field("id", i + "", TextField.TYPE_STORED));
switch (valueType) {
case VAR_INTS:
- values[i] = random.nextInt();
+ values[i] = random().nextInt();
valField.setLongValue(values[i]);
break;
case FIXED_INTS_16:
- values[i] = random.nextInt(Short.MAX_VALUE);
+ values[i] = random().nextInt(Short.MAX_VALUE);
valField.setIntValue((short) values[i]);
break;
case FIXED_INTS_32:
- values[i] = random.nextInt();
+ values[i] = random().nextInt();
valField.setIntValue((int) values[i]);
break;
case FIXED_INTS_64:
- values[i] = random.nextLong();
+ values[i] = random().nextLong();
valField.setLongValue(values[i]);
break;
case FLOAT_64:
- double nextDouble = random.nextDouble();
+ double nextDouble = random().nextDouble();
values[i] = Double.doubleToRawLongBits(nextDouble);
valField.setDoubleValue(nextDouble);
break;
case FLOAT_32:
- final float nextFloat = random.nextFloat();
+ final float nextFloat = random().nextFloat();
values[i] = Double.doubleToRawLongBits(nextFloat);
valField.setFloatValue(nextFloat);
break;
@@ -246,7 +246,7 @@ public class TestTypePromotion extends L
case BYTES_FIXED_DEREF:
case BYTES_FIXED_SORTED:
case BYTES_FIXED_STRAIGHT:
- values[i] = random.nextLong();
+ values[i] = random().nextLong();
byte bytes[] = new byte[8];
ByteArrayDataOutput out = new ByteArrayDataOutput(bytes, 0, 8);
out.writeLong(values[i]);
@@ -258,12 +258,12 @@ public class TestTypePromotion extends L
byte lbytes[] = new byte[8];
ByteArrayDataOutput lout = new ByteArrayDataOutput(lbytes, 0, 8);
final int len;
- if (random.nextBoolean()) {
- values[i] = random.nextInt();
+ if (random().nextBoolean()) {
+ values[i] = random().nextInt();
lout.writeInt((int)values[i]);
len = 4;
} else {
- values[i] = random.nextLong();
+ values[i] = random().nextLong();
lout.writeLong(values[i]);
len = 8;
}
@@ -275,7 +275,7 @@ public class TestTypePromotion extends L
}
doc.add(valField);
writer.addDocument(doc);
- if (random.nextInt(10) == 0) {
+ if (random().nextInt(10) == 0) {
writer.commit();
}
}
@@ -300,26 +300,26 @@ public class TestTypePromotion extends L
public void testMergeIncompatibleTypes() throws IOException {
Directory dir = newDirectory();
- IndexWriterConfig writerConfig = newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random));
+ IndexWriterConfig writerConfig = newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random()));
writerConfig.setMergePolicy(NoMergePolicy.NO_COMPOUND_FILES); // no merges until we are done with adding values
IndexWriter writer = new IndexWriter(dir, writerConfig);
int num_1 = atLeast(200);
int num_2 = atLeast(200);
long[] values = new long[num_1 + num_2];
index(writer,
- randomValueType(INTEGERS, random), values, 0, num_1);
+ randomValueType(INTEGERS, random()), values, 0, num_1);
writer.commit();
- if (random.nextInt(4) == 0) {
+ if (random().nextInt(4) == 0) {
// once in a while use addIndexes
Directory dir_2 = newDirectory() ;
IndexWriter writer_2 = new IndexWriter(dir_2,
- newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)));
+ newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())));
index(writer_2,
- randomValueType(random.nextBoolean() ? UNSORTED_BYTES : SORTED_BYTES, random), values, num_1, num_2);
+ randomValueType(random().nextBoolean() ? UNSORTED_BYTES : SORTED_BYTES, random()), values, num_1, num_2);
writer_2.commit();
writer_2.close();
- if (random.nextBoolean()) {
+ if (random().nextBoolean()) {
writer.addIndexes(dir_2);
} else {
// do a real merge here
@@ -330,11 +330,11 @@ public class TestTypePromotion extends L
dir_2.close();
} else {
index(writer,
- randomValueType(random.nextBoolean() ? UNSORTED_BYTES : SORTED_BYTES, random), values, num_1, num_2);
+ randomValueType(random().nextBoolean() ? UNSORTED_BYTES : SORTED_BYTES, random()), values, num_1, num_2);
writer.commit();
}
writer.close();
- writerConfig = newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random));
+ writerConfig = newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random()));
if (writerConfig.getMergePolicy() instanceof NoMergePolicy) {
writerConfig.setMergePolicy(newLogMergePolicy()); // make sure we merge to one segment (merge everything together)
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestUniqueTermCount.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestUniqueTermCount.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestUniqueTermCount.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestUniqueTermCount.java Sun Apr 15 14:41:44 2012
@@ -45,9 +45,9 @@ public class TestUniqueTermCount extends
super.setUp();
dir = newDirectory();
IndexWriterConfig config = newIndexWriterConfig(TEST_VERSION_CURRENT,
- new MockAnalyzer(random, MockTokenizer.SIMPLE, true)).setMergePolicy(newLogMergePolicy());
+ new MockAnalyzer(random(), MockTokenizer.SIMPLE, true)).setMergePolicy(newLogMergePolicy());
config.setSimilarity(new TestSimilarity());
- RandomIndexWriter writer = new RandomIndexWriter(random, dir, config);
+ RandomIndexWriter writer = new RandomIndexWriter(random(), dir, config);
Document doc = new Document();
Field foo = newField("foo", "", TextField.TYPE_UNSTORED);
doc.add(foo);
@@ -79,10 +79,10 @@ public class TestUniqueTermCount extends
private String addValue() {
StringBuilder sb = new StringBuilder();
HashSet<String> terms = new HashSet<String>();
- int num = _TestUtil.nextInt(random, 0, 255);
+ int num = _TestUtil.nextInt(random(), 0, 255);
for (int i = 0; i < num; i++) {
sb.append(' ');
- char term = (char) _TestUtil.nextInt(random, 'a', 'z');
+ char term = (char) _TestUtil.nextInt(random(), 'a', 'z');
sb.append(term);
terms.add("" + term);
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/BaseTestRangeFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/BaseTestRangeFilter.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/BaseTestRangeFilter.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/BaseTestRangeFilter.java Sun Apr 15 14:41:44 2012
@@ -95,10 +95,10 @@ public class BaseTestRangeFilter extends
@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);
- unsignedIndexReader = build(random, 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);
}
@AfterClass
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQuery.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQuery.java Sun Apr 15 14:41:44 2012
@@ -46,7 +46,7 @@ public class TestAutomatonQuery extends
public void setUp() throws Exception {
super.setUp();
directory = newDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(random, directory);
+ RandomIndexWriter writer = new RandomIndexWriter(random(), directory);
Document doc = new Document();
Field titleField = newField("title", "some title", TextField.TYPE_UNSTORED);
Field field = newField(FN, "this is document one 2345", TextField.TYPE_UNSTORED);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQueryUnicode.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQueryUnicode.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQueryUnicode.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQueryUnicode.java Sun Apr 15 14:41:44 2012
@@ -46,7 +46,7 @@ public class TestAutomatonQueryUnicode e
public void setUp() throws Exception {
super.setUp();
directory = newDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(random, directory);
+ RandomIndexWriter writer = new RandomIndexWriter(random(), directory);
Document doc = new Document();
Field titleField = newField("title", "some title", TextField.TYPE_UNSTORED);
Field field = newField(FN, "", TextField.TYPE_UNSTORED);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBoolean2.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBoolean2.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBoolean2.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBoolean2.java Sun Apr 15 14:41:44 2012
@@ -56,7 +56,7 @@ public class TestBoolean2 extends Lucene
@BeforeClass
public static void beforeClass() throws Exception {
directory = newDirectory();
- RandomIndexWriter writer= new RandomIndexWriter(random, directory, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)).setMergePolicy(newLogMergePolicy()));
+ RandomIndexWriter writer= new RandomIndexWriter(random(), directory, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())).setMergePolicy(newLogMergePolicy()));
for (int i = 0; i < docFields.length; i++) {
Document doc = new Document();
doc.add(newField(field, docFields[i], TextField.TYPE_UNSTORED));
@@ -67,23 +67,23 @@ public class TestBoolean2 extends Lucene
searcher = new IndexSearcher(littleReader);
// Make big index
- dir2 = new MockDirectoryWrapper(random, new RAMDirectory(directory, IOContext.DEFAULT));
+ dir2 = new MockDirectoryWrapper(random(), new RAMDirectory(directory, IOContext.DEFAULT));
// First multiply small test index:
mulFactor = 1;
int docCount = 0;
do {
- final Directory copy = new MockDirectoryWrapper(random, new RAMDirectory(dir2, IOContext.DEFAULT));
- RandomIndexWriter w = new RandomIndexWriter(random, dir2);
+ final Directory copy = new MockDirectoryWrapper(random(), new RAMDirectory(dir2, IOContext.DEFAULT));
+ RandomIndexWriter w = new RandomIndexWriter(random(), dir2);
w.addIndexes(copy);
docCount = w.maxDoc();
w.close();
mulFactor *= 2;
} while(docCount < 3000);
- RandomIndexWriter w = new RandomIndexWriter(random, dir2,
- newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random))
- .setMaxBufferedDocs(_TestUtil.nextInt(random, 50, 1000)));
+ RandomIndexWriter w = new RandomIndexWriter(random(), dir2,
+ newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random()))
+ .setMaxBufferedDocs(_TestUtil.nextInt(random(), 50, 1000)));
Document doc = new Document();
doc.add(newField("field2", "xxx", TextField.TYPE_UNSTORED));
for(int i=0;i<NUM_EXTRA_DOCS/2;i++) {
@@ -256,14 +256,14 @@ public class TestBoolean2 extends Lucene
// increase number of iterations for more complete testing
int num = atLeast(10);
for (int i=0; i<num; i++) {
- int level = random.nextInt(3);
- q1 = randBoolQuery(new Random(random.nextLong()), random.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.
Sort sort = Sort.INDEXORDER;
- QueryUtils.check(random, q1,searcher);
+ QueryUtils.check(random(), q1,searcher);
TopFieldCollector collector = TopFieldCollector.create(sort, 1000,
false, true, true, true);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java Sun Apr 15 14:41:44 2012
@@ -53,7 +53,7 @@ public class TestBooleanMinShouldMatch e
};
index = newDirectory();
- RandomIndexWriter w = new RandomIndexWriter(random, index);
+ RandomIndexWriter w = new RandomIndexWriter(random(), index);
for (int i = 0; i < data.length; i++) {
Document doc = new Document();
@@ -88,7 +88,7 @@ public class TestBooleanMinShouldMatch e
}
assertEquals("result count", expected, h.length);
//System.out.println("TEST: now check");
- QueryUtils.check(random, q,s);
+ QueryUtils.check(random(), q,s);
}
public void testAllOptional() throws Exception {
@@ -308,7 +308,7 @@ public class TestBooleanMinShouldMatch e
for (int i=0; i<c.length;i++) {
if (c[i].getOccur() == BooleanClause.Occur.SHOULD) opt++;
}
- q.setMinimumNumberShouldMatch(random.nextInt(opt+2));
+ q.setMinimumNumberShouldMatch(random().nextInt(opt+2));
}
};
@@ -317,8 +317,8 @@ public class TestBooleanMinShouldMatch e
// increase number of iterations for more complete testing
int num = atLeast(10);
for (int i=0; i<num; i++) {
- int lev = random.nextInt(maxLev);
- final long seed = random.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);
@@ -332,8 +332,8 @@ public class TestBooleanMinShouldMatch e
TopDocs top1 = s.search(q1,null,100);
TopDocs top2 = s.search(q2,null,100);
if (i < 100) {
- QueryUtils.check(random, q1,s);
- QueryUtils.check(random, q2,s);
+ QueryUtils.check(random(), q1,s);
+ QueryUtils.check(random(), q2,s);
}
// The constrained query
// should be a superset to the unconstrained query.
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBooleanOr.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBooleanOr.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBooleanOr.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBooleanOr.java Sun Apr 15 14:41:44 2012
@@ -42,7 +42,7 @@ public class TestBooleanOr extends Lucen
private int search(Query q) throws IOException {
- QueryUtils.check(random, q,searcher);
+ QueryUtils.check(random(), q,searcher);
return searcher.search(q, null, 1000).totalHits;
}
@@ -134,7 +134,7 @@ public class TestBooleanOr extends Lucen
//
- RandomIndexWriter writer = new RandomIndexWriter(random, dir);
+ RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
//
Document d = new Document();
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBooleanQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBooleanQuery.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBooleanQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBooleanQuery.java Sun Apr 15 14:41:44 2012
@@ -71,7 +71,7 @@ public class TestBooleanQuery extends Lu
// LUCENE-1630
public void testNullOrSubScorer() throws Throwable {
Directory dir = newDirectory();
- RandomIndexWriter w = new RandomIndexWriter(random, dir);
+ RandomIndexWriter w = new RandomIndexWriter(random(), dir);
Document doc = new Document();
doc.add(newField("field", "a b c d", TextField.TYPE_UNSTORED));
w.addDocument(doc);
@@ -135,7 +135,7 @@ public class TestBooleanQuery extends Lu
public void testDeMorgan() throws Exception {
Directory dir1 = newDirectory();
- RandomIndexWriter iw1 = new RandomIndexWriter(random, dir1);
+ RandomIndexWriter iw1 = new RandomIndexWriter(random(), dir1);
Document doc1 = new Document();
doc1.add(newField("field", "foo bar", TextField.TYPE_UNSTORED));
iw1.addDocument(doc1);
@@ -143,7 +143,7 @@ public class TestBooleanQuery extends Lu
iw1.close();
Directory dir2 = newDirectory();
- RandomIndexWriter iw2 = new RandomIndexWriter(random, dir2);
+ RandomIndexWriter iw2 = new RandomIndexWriter(random(), dir2);
Document doc2 = new Document();
doc2.add(newField("field", "foo baz", TextField.TYPE_UNSTORED));
iw2.addDocument(doc2);
@@ -177,23 +177,23 @@ public class TestBooleanQuery extends Lu
public void testBS2DisjunctionNextVsAdvance() throws Exception {
final Directory d = newDirectory();
- final RandomIndexWriter w = new RandomIndexWriter(random, d);
+ final RandomIndexWriter w = new RandomIndexWriter(random(), d);
final int numDocs = atLeast(300);
for(int docUpto=0;docUpto<numDocs;docUpto++) {
String contents = "a";
- if (random.nextInt(20) <= 16) {
+ if (random().nextInt(20) <= 16) {
contents += " b";
}
- if (random.nextInt(20) <= 8) {
+ if (random().nextInt(20) <= 8) {
contents += " c";
}
- if (random.nextInt(20) <= 4) {
+ if (random().nextInt(20) <= 4) {
contents += " d";
}
- if (random.nextInt(20) <= 2) {
+ if (random().nextInt(20) <= 2) {
contents += " e";
}
- if (random.nextInt(20) <= 1) {
+ if (random().nextInt(20) <= 1) {
contents += " f";
}
Document doc = new Document();
@@ -210,9 +210,9 @@ public class TestBooleanQuery extends Lu
System.out.println("iter=" + iter);
}
final List<String> terms = new ArrayList<String>(Arrays.asList("a", "b", "c", "d", "e", "f"));
- final int numTerms = _TestUtil.nextInt(random, 1, terms.size());
+ final int numTerms = _TestUtil.nextInt(random(), 1, terms.size());
while(terms.size() > numTerms) {
- terms.remove(random.nextInt(terms.size()));
+ terms.remove(random().nextInt(terms.size()));
}
if (VERBOSE) {
@@ -256,13 +256,13 @@ public class TestBooleanQuery extends Lu
final int nextUpto;
final int nextDoc;
final int left = hits.size() - upto;
- if (left == 1 || random.nextBoolean()) {
+ if (left == 1 || random().nextBoolean()) {
// next
nextUpto = 1+upto;
nextDoc = scorer.nextDoc();
} else {
// advance
- int inc = _TestUtil.nextInt(random, 1, left-1);
+ int inc = _TestUtil.nextInt(random(), 1, left-1);
nextUpto = inc + upto;
nextDoc = scorer.advance(hits.get(nextUpto).doc);
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBooleanScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBooleanScorer.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBooleanScorer.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBooleanScorer.java Sun Apr 15 14:41:44 2012
@@ -42,7 +42,7 @@ public class TestBooleanScorer extends L
String[] values = new String[] { "1", "2", "3", "4" };
- RandomIndexWriter writer = new RandomIndexWriter(random, directory);
+ RandomIndexWriter writer = new RandomIndexWriter(random(), directory);
for (int i = 0; i < values.length; i++) {
Document doc = new Document();
doc.add(newField(FIELD, values[i], StringField.TYPE_STORED));
@@ -73,7 +73,7 @@ public class TestBooleanScorer extends L
// changes, we have a test to back it up.
Directory directory = newDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(random, directory);
+ RandomIndexWriter writer = new RandomIndexWriter(random(), directory);
writer.commit();
IndexReader ir = writer.getReader();
writer.close();
@@ -127,7 +127,7 @@ public class TestBooleanScorer extends L
public void testMoreThan32ProhibitedClauses() throws Exception {
final Directory d = newDirectory();
- final RandomIndexWriter w = new RandomIndexWriter(random, d);
+ final RandomIndexWriter w = new RandomIndexWriter(random(), d);
Document doc = new Document();
doc.add(new TextField("field", "0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33"));
w.addDocument(doc);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestCachingCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestCachingCollector.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestCachingCollector.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestCachingCollector.java Sun Apr 15 14:41:44 2012
@@ -153,7 +153,7 @@ public class TestCachingCollector extend
// caching would terminate even if a smaller length would suffice.
// set RAM limit enough for 150 docs + random(10000)
- int numDocs = random.nextInt(10000) + 150;
+ int numDocs = random().nextInt(10000) + 150;
for (boolean cacheScores : new boolean[] { false, true }) {
int bytesPerDoc = cacheScores ? 8 : 4;
CachingCollector cc = CachingCollector.create(new NoOpCollector(false),
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java Sun Apr 15 14:41:44 2012
@@ -39,7 +39,7 @@ public class TestCachingWrapperFilter ex
public void testCachingWorks() throws Exception {
Directory dir = newDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(random, dir);
+ RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
writer.close();
IndexReader reader = SlowCompositeReaderWrapper.wrap(IndexReader.open(dir));
@@ -65,7 +65,7 @@ public class TestCachingWrapperFilter ex
public void testNullDocIdSet() throws Exception {
Directory dir = newDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(random, dir);
+ RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
writer.close();
IndexReader reader = SlowCompositeReaderWrapper.wrap(IndexReader.open(dir));
@@ -88,7 +88,7 @@ public class TestCachingWrapperFilter ex
public void testNullDocIdSetIterator() throws Exception {
Directory dir = newDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(random, dir);
+ RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
writer.close();
IndexReader reader = SlowCompositeReaderWrapper.wrap(IndexReader.open(dir));
@@ -132,7 +132,7 @@ public class TestCachingWrapperFilter ex
public void testIsCacheAble() throws Exception {
Directory dir = newDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(random, dir);
+ RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
writer.addDocument(new Document());
writer.close();
@@ -159,9 +159,9 @@ public class TestCachingWrapperFilter ex
public void testEnforceDeletions() throws Exception {
Directory dir = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(
- random,
+ random(),
dir,
- newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)).
+ newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())).
setMergeScheduler(new SerialMergeScheduler()).
// asserts below requires no unexpected merges:
setMergePolicy(newLogMergePolicy(10))
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestConstantScoreQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestConstantScoreQuery.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestConstantScoreQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestConstantScoreQuery.java Sun Apr 15 14:41:44 2012
@@ -87,7 +87,7 @@ public class TestConstantScoreQuery exte
IndexSearcher searcher = null;
try {
directory = newDirectory();
- RandomIndexWriter writer = new RandomIndexWriter (random, directory);
+ RandomIndexWriter writer = new RandomIndexWriter (random(), directory);
Document doc = new Document();
doc.add(newField("field", "term", StringField.TYPE_UNSTORED));
@@ -132,7 +132,7 @@ public class TestConstantScoreQuery exte
public void testConstantScoreQueryAndFilter() throws Exception {
Directory d = newDirectory();
- RandomIndexWriter w = new RandomIndexWriter(random, d);
+ RandomIndexWriter w = new RandomIndexWriter(random(), d);
Document doc = new Document();
doc.add(newField("field", "a", StringField.TYPE_UNSTORED));
w.addDocument(doc);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestCustomSearcherSort.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestCustomSearcherSort.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestCustomSearcherSort.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestCustomSearcherSort.java Sun Apr 15 14:41:44 2012
@@ -50,8 +50,8 @@ public class TestCustomSearcherSort exte
super.setUp();
INDEX_SIZE = atLeast(2000);
index = newDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(random, index);
- RandomGen random = new RandomGen(LuceneTestCase.random);
+ RandomIndexWriter writer = new RandomIndexWriter(random(), index);
+ RandomGen random = new RandomGen(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/core/src/test/org/apache/lucene/search/TestDateFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDateFilter.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDateFilter.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDateFilter.java Sun Apr 15 14:41:44 2012
@@ -42,7 +42,7 @@ public class TestDateFilter extends Luce
public void testBefore() throws IOException {
// create an index
Directory indexStore = newDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(random, indexStore);
+ RandomIndexWriter writer = new RandomIndexWriter(random(), indexStore);
long now = System.currentTimeMillis();
@@ -107,7 +107,7 @@ public class TestDateFilter extends Luce
public void testAfter() throws IOException {
// create an index
Directory indexStore = newDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(random, indexStore);
+ RandomIndexWriter writer = new RandomIndexWriter(random(), indexStore);
long now = System.currentTimeMillis();
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDateSort.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDateSort.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDateSort.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDateSort.java Sun Apr 15 14:41:44 2012
@@ -48,7 +48,7 @@ public class TestDateSort extends Lucene
super.setUp();
// Create an index writer.
directory = newDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(random, directory);
+ RandomIndexWriter writer = new RandomIndexWriter(random(), directory);
// oldest doc:
// Add the first document. text = "Document 1" dateTime = Oct 10 03:25:22 EDT 2007
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java Sun Apr 15 14:41:44 2012
@@ -91,8 +91,8 @@ public class TestDisjunctionMaxQuery ext
super.setUp();
index = newDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(random, index,
- newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random))
+ RandomIndexWriter writer = new RandomIndexWriter(random(), index,
+ newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random()))
.setSimilarity(sim).setMergePolicy(newLogMergePolicy()));
// hed is the most important field, dek is secondary
@@ -167,7 +167,7 @@ public class TestDisjunctionMaxQuery ext
dq.add(tq("id", "d1"));
dq.add(tq("dek", "DOES_NOT_EXIST"));
- QueryUtils.check(random, dq, s);
+ QueryUtils.check(random(), dq, s);
assertTrue(s.getTopReaderContext() instanceof AtomicReaderContext);
final Weight dw = s.createNormalizedWeight(dq);
AtomicReaderContext context = (AtomicReaderContext)s.getTopReaderContext();
@@ -184,7 +184,7 @@ public class TestDisjunctionMaxQuery ext
dq.add(tq("dek", "albino"));
dq.add(tq("dek", "DOES_NOT_EXIST"));
assertTrue(s.getTopReaderContext() instanceof AtomicReaderContext);
- QueryUtils.check(random, dq, s);
+ QueryUtils.check(random(), dq, s);
final Weight dw = s.createNormalizedWeight(dq);
AtomicReaderContext context = (AtomicReaderContext)s.getTopReaderContext();
final Scorer ds = dw.scorer(context, true, false, context.reader().getLiveDocs());
@@ -198,7 +198,7 @@ public class TestDisjunctionMaxQuery ext
DisjunctionMaxQuery q = new DisjunctionMaxQuery(0.0f);
q.add(tq("hed", "albino"));
q.add(tq("hed", "elephant"));
- QueryUtils.check(random, q, s);
+ QueryUtils.check(random(), q, s);
ScoreDoc[] h = s.search(q, null, 1000).scoreDocs;
@@ -222,7 +222,7 @@ public class TestDisjunctionMaxQuery ext
DisjunctionMaxQuery q = new DisjunctionMaxQuery(0.0f);
q.add(tq("dek", "albino"));
q.add(tq("dek", "elephant"));
- QueryUtils.check(random, q, s);
+ QueryUtils.check(random(), q, s);
ScoreDoc[] h = s.search(q, null, 1000).scoreDocs;
@@ -247,7 +247,7 @@ public class TestDisjunctionMaxQuery ext
q.add(tq("hed", "elephant"));
q.add(tq("dek", "albino"));
q.add(tq("dek", "elephant"));
- QueryUtils.check(random, q, s);
+ QueryUtils.check(random(), q, s);
ScoreDoc[] h = s.search(q, null, 1000).scoreDocs;
@@ -270,7 +270,7 @@ public class TestDisjunctionMaxQuery ext
DisjunctionMaxQuery q = new DisjunctionMaxQuery(0.01f);
q.add(tq("dek", "albino"));
q.add(tq("dek", "elephant"));
- QueryUtils.check(random, q, s);
+ QueryUtils.check(random(), q, s);
ScoreDoc[] h = s.search(q, null, 1000).scoreDocs;
@@ -298,7 +298,7 @@ public class TestDisjunctionMaxQuery ext
q1.add(tq("hed", "albino"));
q1.add(tq("dek", "albino"));
q.add(q1, BooleanClause.Occur.MUST);// true,false);
- QueryUtils.check(random, q1, s);
+ QueryUtils.check(random(), q1, s);
}
{
@@ -306,10 +306,10 @@ public class TestDisjunctionMaxQuery ext
q2.add(tq("hed", "elephant"));
q2.add(tq("dek", "elephant"));
q.add(q2, BooleanClause.Occur.MUST);// true,false);
- QueryUtils.check(random, q2, s);
+ QueryUtils.check(random(), q2, s);
}
- QueryUtils.check(random, q, s);
+ QueryUtils.check(random(), q, s);
ScoreDoc[] h = s.search(q, null, 1000).scoreDocs;
@@ -341,7 +341,7 @@ public class TestDisjunctionMaxQuery ext
q2.add(tq("dek", "elephant"));
q.add(q2, BooleanClause.Occur.SHOULD);// false,false);
}
- QueryUtils.check(random, q, s);
+ QueryUtils.check(random(), q, s);
ScoreDoc[] h = s.search(q, null, 1000).scoreDocs;
@@ -377,7 +377,7 @@ public class TestDisjunctionMaxQuery ext
q2.add(tq("dek", "elephant"));
q.add(q2, BooleanClause.Occur.SHOULD);// false,false);
}
- QueryUtils.check(random, q, s);
+ QueryUtils.check(random(), q, s);
ScoreDoc[] h = s.search(q, null, 1000).scoreDocs;
@@ -431,7 +431,7 @@ public class TestDisjunctionMaxQuery ext
q2.add(tq("dek", "elephant"));
q.add(q2, BooleanClause.Occur.SHOULD);// false,false);
}
- QueryUtils.check(random, q, s);
+ QueryUtils.check(random(), q, s);
ScoreDoc[] h = s.search(q, null, 1000).scoreDocs;
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDocBoost.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDocBoost.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDocBoost.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDocBoost.java Sun Apr 15 14:41:44 2012
@@ -36,7 +36,7 @@ public class TestDocBoost extends Lucene
public void testDocBoost() throws Exception {
Directory store = newDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(random, store, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)).setMergePolicy(newLogMergePolicy()));
+ RandomIndexWriter writer = new RandomIndexWriter(random(), store, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())).setMergePolicy(newLogMergePolicy()));
Field f1 = newField("field", "word", TextField.TYPE_STORED);
Field f2 = newField("field", "word", TextField.TYPE_STORED);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDocIdSet.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDocIdSet.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDocIdSet.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDocIdSet.java Sun Apr 15 14:41:44 2012
@@ -101,7 +101,7 @@ public class TestDocIdSet extends Lucene
// Tests that if a Filter produces a null DocIdSet, which is given to
// IndexSearcher, everything works fine. This came up in LUCENE-1754.
Directory dir = newDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(random, dir);
+ RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
Document doc = new Document();
doc.add(newField("c", "val", StringField.TYPE_UNSTORED));
writer.addDocument(doc);
@@ -127,7 +127,7 @@ public class TestDocIdSet extends Lucene
public void testNullIteratorFilteredDocIdSet() throws Exception {
Directory dir = newDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(random, dir);
+ RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
Document doc = new Document();
doc.add(newField("c", "val", StringField.TYPE_UNSTORED));
writer.addDocument(doc);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDocValuesScoring.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDocValuesScoring.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDocValuesScoring.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDocValuesScoring.java Sun Apr 15 14:41:44 2012
@@ -52,7 +52,7 @@ public class TestDocValuesScoring extend
"Lucene3x".equals(Codec.getDefault().getName()));
Directory dir = newDirectory();
- RandomIndexWriter iw = new RandomIndexWriter(random, dir);
+ RandomIndexWriter iw = new RandomIndexWriter(random(), dir);
Document doc = new Document();
Field field = newField("foo", "", TextField.TYPE_UNSTORED);
doc.add(field);
@@ -98,8 +98,8 @@ public class TestDocValuesScoring extend
// in this case, we searched on field "foo". first document should have 2x the score.
TermQuery tq = new TermQuery(new Term("foo", "quick"));
- QueryUtils.check(random, tq, searcher1);
- QueryUtils.check(random, tq, searcher2);
+ QueryUtils.check(random(), tq, searcher1);
+ QueryUtils.check(random(), tq, searcher2);
TopDocs noboost = searcher1.search(tq, 10);
TopDocs boost = searcher2.search(tq, 10);
@@ -111,8 +111,8 @@ public class TestDocValuesScoring extend
// this query matches only the second document, which should have 4x the score.
tq = new TermQuery(new Term("foo", "jumps"));
- QueryUtils.check(random, tq, searcher1);
- QueryUtils.check(random, tq, searcher2);
+ QueryUtils.check(random(), tq, searcher1);
+ QueryUtils.check(random(), tq, searcher2);
noboost = searcher1.search(tq, 10);
boost = searcher2.search(tq, 10);
@@ -124,8 +124,8 @@ public class TestDocValuesScoring extend
// search on on field bar just for kicks, nothing should happen, since we setup
// our sim provider to only use foo_boost for field foo.
tq = new TermQuery(new Term("bar", "quick"));
- QueryUtils.check(random, tq, searcher1);
- QueryUtils.check(random, tq, searcher2);
+ QueryUtils.check(random(), tq, searcher1);
+ QueryUtils.check(random(), tq, searcher2);
noboost = searcher1.search(tq, 10);
boost = searcher2.search(tq, 10);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestElevationComparator.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestElevationComparator.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestElevationComparator.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestElevationComparator.java Sun Apr 15 14:41:44 2012
@@ -39,7 +39,7 @@ public class TestElevationComparator ext
Directory directory = newDirectory();
IndexWriter writer = new IndexWriter(
directory,
- newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)).
+ newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())).
setMaxBufferedDocs(2).
setMergePolicy(newLogMergePolicy(1000)).
setSimilarity(new DefaultSimilarity())
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestExplanations.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestExplanations.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestExplanations.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestExplanations.java Sun Apr 15 14:41:44 2012
@@ -71,7 +71,7 @@ public class TestExplanations extends Lu
@BeforeClass
public static void beforeClassTestExplanations() throws Exception {
directory = newDirectory();
- RandomIndexWriter writer= new RandomIndexWriter(random, directory, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)).setMergePolicy(newLogMergePolicy()));
+ RandomIndexWriter writer= new RandomIndexWriter(random(), directory, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())).setMergePolicy(newLogMergePolicy()));
for (int i = 0; i < docFields.length; i++) {
Document doc = new Document();
doc.add(newField(KEY, ""+i, StringField.TYPE_UNSTORED));
@@ -95,7 +95,7 @@ public class TestExplanations extends Lu
/** check the expDocNrs first, then check the query (and the explanations) */
public void qtest(Query q, int[] expDocNrs) throws Exception {
- CheckHits.checkHitCollector(random, q, FIELD, searcher, expDocNrs);
+ CheckHits.checkHitCollector(random(), q, FIELD, searcher, expDocNrs);
}
/**