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 [11/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/hig...
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestScorerPerf.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestScorerPerf.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestScorerPerf.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestScorerPerf.java Sun Apr 15 14:41:44 2012
@@ -48,7 +48,7 @@ public class TestScorerPerf extends Luce
// Create a dummy index with nothing in it.
// This could possibly fail if Lucene starts checking for docid ranges...
d = newDirectory();
- IndexWriter iw = new IndexWriter(d, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random)));
+ IndexWriter iw = new IndexWriter(d, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random())));
iw.addDocument(new Document());
iw.close();
r = IndexReader.open(d);
@@ -64,11 +64,11 @@ public class TestScorerPerf extends Luce
terms[i] = new Term("f",Character.toString((char)('A'+i)));
}
- IndexWriter iw = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random)).setOpenMode(OpenMode.CREATE));
+ IndexWriter iw = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random())).setOpenMode(OpenMode.CREATE));
for (int i=0; i<nDocs; i++) {
Document d = new Document();
for (int j=0; j<nTerms; j++) {
- if (random.nextInt(freq[j]) == 0) {
+ if (random().nextInt(freq[j]) == 0) {
d.add(newField("f", terms[j].text(), StringField.TYPE_UNSTORED));
//System.out.println(d);
}
@@ -83,7 +83,7 @@ public class TestScorerPerf extends Luce
public BitSet randBitSet(int sz, int numBitsToSet) {
BitSet set = new BitSet(sz);
for (int i=0; i<numBitsToSet; i++) {
- set.set(random.nextInt(sz));
+ set.set(random().nextInt(sz));
}
return set;
}
@@ -91,7 +91,7 @@ public class TestScorerPerf extends Luce
public BitSet[] randBitSets(int numSets, int setSize) {
BitSet[] sets = new BitSet[numSets];
for (int i=0; i<sets.length; i++) {
- sets[i] = randBitSet(setSize, random.nextInt(setSize));
+ sets[i] = randBitSet(setSize, random().nextInt(setSize));
}
return sets;
}
@@ -143,7 +143,7 @@ public class TestScorerPerf extends Luce
BitSet addClause(BooleanQuery bq, BitSet result) {
- final BitSet rnd = sets[random.nextInt(sets.length)];
+ final BitSet rnd = sets[random().nextInt(sets.length)];
Query q = new ConstantScoreQuery(new Filter() {
@Override
public DocIdSet getDocIdSet (AtomicReaderContext context, Bits acceptDocs) {
@@ -164,7 +164,7 @@ public class TestScorerPerf extends Luce
int ret=0;
for (int i=0; i<iter; i++) {
- int nClauses = random.nextInt(maxClauses-1)+2; // min 2 clauses
+ int nClauses = random().nextInt(maxClauses-1)+2; // min 2 clauses
BooleanQuery bq = new BooleanQuery();
BitSet result=null;
for (int j=0; j<nClauses; j++) {
@@ -188,13 +188,13 @@ public class TestScorerPerf extends Luce
long nMatches=0;
for (int i=0; i<iter; i++) {
- int oClauses = random.nextInt(maxOuterClauses-1)+2;
+ int oClauses = random().nextInt(maxOuterClauses-1)+2;
BooleanQuery oq = new BooleanQuery();
BitSet result=null;
for (int o=0; o<oClauses; o++) {
- int nClauses = random.nextInt(maxClauses-1)+2; // min 2 clauses
+ int nClauses = random().nextInt(maxClauses-1)+2; // min 2 clauses
BooleanQuery bq = new BooleanQuery();
for (int j=0; j<nClauses; j++) {
result = addClause(bq,result);
@@ -225,13 +225,13 @@ public class TestScorerPerf extends Luce
long nMatches=0;
for (int i=0; i<iter; i++) {
- int nClauses = random.nextInt(maxClauses-1)+2; // min 2 clauses
+ int nClauses = random().nextInt(maxClauses-1)+2; // min 2 clauses
BooleanQuery bq = new BooleanQuery();
BitSet termflag = new BitSet(termsInIndex);
for (int j=0; j<nClauses; j++) {
int tnum;
// don't pick same clause twice
- tnum = random.nextInt(termsInIndex);
+ tnum = random().nextInt(termsInIndex);
if (termflag.get(tnum)) tnum=termflag.nextClearBit(tnum);
if (tnum<0 || tnum>=termsInIndex) tnum=termflag.nextClearBit(0);
termflag.set(tnum);
@@ -259,17 +259,17 @@ public class TestScorerPerf extends Luce
int ret=0;
long nMatches=0;
for (int i=0; i<iter; i++) {
- int oClauses = random.nextInt(maxOuterClauses-1)+2;
+ int oClauses = random().nextInt(maxOuterClauses-1)+2;
BooleanQuery oq = new BooleanQuery();
for (int o=0; o<oClauses; o++) {
- int nClauses = random.nextInt(maxClauses-1)+2; // min 2 clauses
+ int nClauses = random().nextInt(maxClauses-1)+2; // min 2 clauses
BooleanQuery bq = new BooleanQuery();
BitSet termflag = new BitSet(termsInIndex);
for (int j=0; j<nClauses; j++) {
int tnum;
// don't pick same clause twice
- tnum = random.nextInt(termsInIndex);
+ tnum = random().nextInt(termsInIndex);
if (termflag.get(tnum)) tnum=termflag.nextClearBit(tnum);
if (tnum<0 || tnum>=25) tnum=termflag.nextClearBit(0);
termflag.set(tnum);
@@ -299,10 +299,10 @@ public class TestScorerPerf extends Luce
int ret=0;
for (int i=0; i<iter; i++) {
- int nClauses = random.nextInt(maxClauses-1)+2; // min 2 clauses
+ int nClauses = random().nextInt(maxClauses-1)+2; // min 2 clauses
PhraseQuery q = new PhraseQuery();
for (int j=0; j<nClauses; j++) {
- int tnum = random.nextInt(termsInIndex);
+ int tnum = random().nextInt(termsInIndex);
q.add(new Term("f",Character.toString((char)(tnum+'A'))), j);
}
q.setSlop(termsInIndex); // this could be random too
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSearchAfter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSearchAfter.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSearchAfter.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSearchAfter.java Sun Apr 15 14:41:44 2012
@@ -39,7 +39,7 @@ public class TestSearchAfter extends Luc
public void setUp() throws Exception {
super.setUp();
dir = newDirectory();
- RandomIndexWriter iw = new RandomIndexWriter(random, dir);
+ RandomIndexWriter iw = new RandomIndexWriter(random(), dir);
int numDocs = atLeast(200);
for (int i = 0; i < numDocs; i++) {
Document document = new Document();
@@ -80,7 +80,7 @@ public class TestSearchAfter extends Luc
void assertQuery(Query query, Filter filter) throws Exception {
int maxDoc = searcher.getIndexReader().maxDoc();
TopDocs all = searcher.search(query, filter, maxDoc);
- int pageSize = _TestUtil.nextInt(random, 1, maxDoc*2);
+ int pageSize = _TestUtil.nextInt(random(), 1, maxDoc*2);
int pageStart = 0;
ScoreDoc lastBottom = null;
while (pageStart < all.totalHits) {
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSearchWithThreads.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSearchWithThreads.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSearchWithThreads.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSearchWithThreads.java Sun Apr 15 14:41:44 2012
@@ -32,14 +32,20 @@ import org.apache.lucene.util.LuceneTest
@UseNoMemoryExpensiveCodec
public class TestSearchWithThreads extends LuceneTestCase {
-
- final int NUM_DOCS = atLeast(10000);
+ int NUM_DOCS;
final int NUM_SEARCH_THREADS = 5;
- final int RUN_TIME_MSEC = atLeast(1000);
+ int RUN_TIME_MSEC;
+
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
+ NUM_DOCS = atLeast(10000);
+ RUN_TIME_MSEC = atLeast(1000);
+ }
public void test() throws Exception {
final Directory dir = newDirectory();
- final RandomIndexWriter w = new RandomIndexWriter(random, dir);
+ final RandomIndexWriter w = new RandomIndexWriter(random(), dir);
final long startTime = System.currentTimeMillis();
@@ -50,9 +56,9 @@ public class TestSearchWithThreads exten
doc.add(body);
final StringBuilder sb = new StringBuilder();
for(int docCount=0;docCount<NUM_DOCS;docCount++) {
- final int numTerms = random.nextInt(10);
+ final int numTerms = random().nextInt(10);
for(int termCount=0;termCount<numTerms;termCount++) {
- sb.append(random.nextBoolean() ? "aaa" : "bbb");
+ sb.append(random().nextBoolean() ? "aaa" : "bbb");
sb.append(' ');
}
body.setStringValue(sb.toString());
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSearcherManager.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSearcherManager.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSearcherManager.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSearcherManager.java Sun Apr 15 14:41:44 2012
@@ -20,6 +20,7 @@ package org.apache.lucene.search;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
+import java.util.Random;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@@ -50,7 +51,7 @@ public class TestSearcherManager extends
private SearcherLifetimeManager.Pruner pruner;
public void testSearcherManager() throws Exception {
- pruner = new SearcherLifetimeManager.PruneByAge(TEST_NIGHTLY ? _TestUtil.nextInt(random, 1, 20) : 1);
+ pruner = new SearcherLifetimeManager.PruneByAge(TEST_NIGHTLY ? _TestUtil.nextInt(random(), 1, 20) : 1);
runTest("TestSearcherManager");
}
@@ -79,7 +80,7 @@ public class TestSearcherManager extends
return s;
}
};
- if (random.nextBoolean()) {
+ if (random().nextBoolean()) {
// TODO: can we randomize the applyAllDeletes? But
// somehow for final searcher we must apply
// deletes...
@@ -104,9 +105,9 @@ public class TestSearcherManager extends
public void run() {
try {
while(System.currentTimeMillis() < stopTime) {
- Thread.sleep(_TestUtil.nextInt(random, 1, 100));
+ Thread.sleep(_TestUtil.nextInt(random(), 1, 100));
writer.commit();
- Thread.sleep(_TestUtil.nextInt(random, 1, 5));
+ Thread.sleep(_TestUtil.nextInt(random(), 1, 5));
if (mgr.maybeRefresh()) {
lifetimeMGR.prune(pruner);
}
@@ -131,7 +132,7 @@ public class TestSearcherManager extends
@Override
protected IndexSearcher getCurrentSearcher() throws Exception {
- if (random.nextInt(10) == 7) {
+ if (random().nextInt(10) == 7) {
// NOTE: not best practice to call maybeReopen
// synchronous to your search threads, but still we
// test as apps will presumably do this for
@@ -144,12 +145,12 @@ public class TestSearcherManager extends
IndexSearcher s = null;
synchronized(pastSearchers) {
- while (pastSearchers.size() != 0 && random.nextDouble() < 0.25) {
+ while (pastSearchers.size() != 0 && random().nextDouble() < 0.25) {
// 1/4 of the time pull an old searcher, ie, simulate
// a user doing a follow-on action on a previous
// search (drilling down/up, clicking next/prev page,
// etc.)
- final Long token = pastSearchers.get(random.nextInt(pastSearchers.size()));
+ final Long token = pastSearchers.get(random().nextInt(pastSearchers.size()));
s = lifetimeMGR.acquire(token);
if (s == null) {
// Searcher was pruned
@@ -189,18 +190,18 @@ public class TestSearcherManager extends
mgr.close();
lifetimeMGR.close();
}
-
+
public void testIntermediateClose() throws IOException, InterruptedException {
Directory dir = newDirectory();
// Test can deadlock if we use SMS:
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(
- TEST_VERSION_CURRENT, new MockAnalyzer(random)).setMergeScheduler(new ConcurrentMergeScheduler()));
+ TEST_VERSION_CURRENT, new MockAnalyzer(random())).setMergeScheduler(new ConcurrentMergeScheduler()));
writer.addDocument(new Document());
writer.commit();
final CountDownLatch awaitEnterWarm = new CountDownLatch(1);
final CountDownLatch awaitClose = new CountDownLatch(1);
final AtomicBoolean triedReopen = new AtomicBoolean(false);
- final ExecutorService es = random.nextBoolean() ? null : Executors.newCachedThreadPool(new NamedThreadFactory("testIntermediateClose"));
+ final ExecutorService es = random().nextBoolean() ? null : Executors.newCachedThreadPool(new NamedThreadFactory("testIntermediateClose"));
final SearcherFactory factory = new SearcherFactory() {
@Override
public IndexSearcher newSearcher(IndexReader r) throws IOException {
@@ -215,9 +216,9 @@ public class TestSearcherManager extends
return new IndexSearcher(r, es);
}
};
- final SearcherManager searcherManager = random.nextBoolean()
+ final SearcherManager searcherManager = random().nextBoolean()
? new SearcherManager(dir, factory)
- : new SearcherManager(writer, random.nextBoolean(), factory);
+ : new SearcherManager(writer, random().nextBoolean(), factory);
if (VERBOSE) {
System.out.println("sm created");
}
@@ -320,6 +321,7 @@ public class TestSearcherManager extends
}
public void testEvilSearcherFactory() throws Exception {
+ final Random random = random();
final Directory dir = newDirectory();
final RandomIndexWriter w = new RandomIndexWriter(random, dir);
w.commit();
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestShardSearching.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestShardSearching.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestShardSearching.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestShardSearching.java Sun Apr 15 14:41:44 2012
@@ -65,13 +65,13 @@ public class TestShardSearching extends
}
public void testSimple() throws Exception {
- final int numNodes = _TestUtil.nextInt(random, 1, 10);
+ final int numNodes = _TestUtil.nextInt(random(), 1, 10);
final double runTimeSec = atLeast(3);
- final int minDocsToMakeTerms = _TestUtil.nextInt(random, 5, 20);
+ final int minDocsToMakeTerms = _TestUtil.nextInt(random(), 5, 20);
- final int maxSearcherAgeSeconds = _TestUtil.nextInt(random, 1, 3);
+ final int maxSearcherAgeSeconds = _TestUtil.nextInt(random(), 1, 3);
if (VERBOSE) {
System.out.println("TEST: numNodes=" + numNodes + " runTimeSec=" + runTimeSec + " maxSearcherAgeSeconds=" + maxSearcherAgeSeconds);
@@ -87,10 +87,10 @@ public class TestShardSearching extends
List<BytesRef> terms = null;
while (System.nanoTime() < endTimeNanos) {
- final boolean doFollowon = priorSearches.size() > 0 && random.nextInt(7) == 1;
+ final boolean doFollowon = priorSearches.size() > 0 && random().nextInt(7) == 1;
// Pick a random node; we will run the query on this node:
- final int myNodeID = random.nextInt(numNodes);
+ final int myNodeID = random().nextInt(numNodes);
final NodeState.ShardIndexSearcher localShardSearcher;
@@ -98,7 +98,7 @@ public class TestShardSearching extends
if (doFollowon) {
// Pretend user issued a followon query:
- prevSearchState = priorSearches.get(random.nextInt(priorSearches.size()));
+ prevSearchState = priorSearches.get(random().nextInt(priorSearches.size()));
if (VERBOSE) {
System.out.println("\nTEST: follow-on query age=" + ((System.nanoTime() - prevSearchState.searchTimeNanos)/1000000000.0));
@@ -193,24 +193,24 @@ public class TestShardSearching extends
}
if (terms != null) {
- if (random.nextBoolean()) {
- query = new TermQuery(new Term("body", terms.get(random.nextInt(terms.size()))));
+ if (random().nextBoolean()) {
+ query = new TermQuery(new Term("body", terms.get(random().nextInt(terms.size()))));
} else {
- final String t = terms.get(random.nextInt(terms.size())).utf8ToString();
+ final String t = terms.get(random().nextInt(terms.size())).utf8ToString();
final String prefix;
if (t.length() <= 1) {
prefix = t;
} else {
- prefix = t.substring(0, _TestUtil.nextInt(random, 1, 2));
+ prefix = t.substring(0, _TestUtil.nextInt(random(), 1, 2));
}
query = new PrefixQuery(new Term("body", prefix));
}
- if (random.nextBoolean()) {
+ if (random().nextBoolean()) {
sort = null;
} else {
// TODO: sort by more than 1 field
- final int what = random.nextInt(3);
+ final int what = random().nextInt(3);
if (what == 0) {
sort = new Sort(SortField.FIELD_SCORE);
} else if (what == 1) {
@@ -220,9 +220,9 @@ public class TestShardSearching extends
//sort = new Sort(SortField.FIELD_DOC);
sort = null;
} else if (what == 2) {
- sort = new Sort(new SortField[] {new SortField("docid", SortField.Type.INT, random.nextBoolean())});
+ sort = new Sort(new SortField[] {new SortField("docid", SortField.Type.INT, random().nextBoolean())});
} else {
- sort = new Sort(new SortField[] {new SortField("title", SortField.Type.STRING, random.nextBoolean())});
+ sort = new Sort(new SortField[] {new SortField("title", SortField.Type.STRING, random().nextBoolean())});
}
}
} else {
@@ -258,10 +258,10 @@ public class TestShardSearching extends
}
}
- if (searchState != null && searchState.searchAfterLocal != null && random.nextInt(5) == 3) {
+ if (searchState != null && searchState.searchAfterLocal != null && random().nextInt(5) == 3) {
priorSearches.add(searchState);
if (priorSearches.size() > 200) {
- Collections.shuffle(priorSearches, random);
+ Collections.shuffle(priorSearches, random());
priorSearches.subList(100, priorSearches.size()).clear();
}
}
@@ -272,7 +272,7 @@ public class TestShardSearching extends
private PreviousSearchState assertSame(IndexSearcher mockSearcher, NodeState.ShardIndexSearcher shardSearcher, Query q, Sort sort, PreviousSearchState state) throws IOException {
- int numHits = _TestUtil.nextInt(random, 1, 100);
+ int numHits = _TestUtil.nextInt(random(), 1, 100);
if (state != null && state.searchAfterLocal == null) {
// In addition to what we last searched:
numHits += state.numHitsPaged;
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSimilarity.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSimilarity.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSimilarity.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSimilarity.java Sun Apr 15 14:41:44 2012
@@ -54,8 +54,8 @@ public class TestSimilarity extends Luce
public void testSimilarity() throws Exception {
Directory store = newDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(random, store,
- newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random))
+ RandomIndexWriter writer = new RandomIndexWriter(random(), store,
+ newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random()))
.setSimilarity(new SimpleSimilarity()));
Document d1 = new Document();
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSimilarityProvider.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSimilarityProvider.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSimilarityProvider.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSimilarityProvider.java Sun Apr 15 14:41:44 2012
@@ -46,8 +46,8 @@ public class TestSimilarityProvider exte
directory = newDirectory();
PerFieldSimilarityWrapper sim = new ExampleSimilarityProvider();
IndexWriterConfig iwc = newIndexWriterConfig(TEST_VERSION_CURRENT,
- new MockAnalyzer(random)).setSimilarity(sim);
- RandomIndexWriter iw = new RandomIndexWriter(random, directory, iwc);
+ new MockAnalyzer(random())).setSimilarity(sim);
+ RandomIndexWriter iw = new RandomIndexWriter(random(), directory, iwc);
Document doc = new Document();
Field field = newField("foo", "", TextField.TYPE_UNSTORED);
doc.add(field);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java Sun Apr 15 14:41:44 2012
@@ -137,7 +137,7 @@ public class TestSloppyPhraseQuery exten
query.setSlop(slop);
Directory ramDir = newDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(random, ramDir, new MockAnalyzer(random, MockTokenizer.WHITESPACE, false));
+ RandomIndexWriter writer = new RandomIndexWriter(random(), ramDir, new MockAnalyzer(random(), MockTokenizer.WHITESPACE, false));
writer.addDocument(doc);
IndexReader reader = writer.getReader();
@@ -227,13 +227,13 @@ public class TestSloppyPhraseQuery exten
return false;
}
});
- QueryUtils.check(random, pq, searcher);
+ QueryUtils.check(random(), pq, searcher);
}
// LUCENE-3215
public void testSlopWithHoles() throws Exception {
Directory dir = newDirectory();
- RandomIndexWriter iw = new RandomIndexWriter(random, dir);
+ RandomIndexWriter iw = new RandomIndexWriter(random(), dir);
FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
customType.setOmitNorms(true);
Field f = new Field("lyrics", "", customType);
@@ -270,7 +270,7 @@ public class TestSloppyPhraseQuery exten
String document = "drug druggy drug drug drug";
Directory dir = newDirectory();
- RandomIndexWriter iw = new RandomIndexWriter(random, dir);
+ RandomIndexWriter iw = new RandomIndexWriter(random(), dir);
Document doc = new Document();
doc.add(newField("lyrics", document, new FieldType(TextField.TYPE_UNSTORED)));
iw.addDocument(doc);
@@ -323,7 +323,7 @@ public class TestSloppyPhraseQuery exten
Directory dir = newDirectory();
- RandomIndexWriter iw = new RandomIndexWriter(random, dir);
+ RandomIndexWriter iw = new RandomIndexWriter(random(), dir);
Document doc = new Document();
doc.add(newField("lyrics", document, new FieldType(TextField.TYPE_UNSTORED)));
iw.addDocument(doc);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery2.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery2.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery2.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery2.java Sun Apr 15 14:41:44 2012
@@ -85,8 +85,8 @@ public class TestSloppyPhraseQuery2 exte
Term t1 = randomTerm();
Term t2 = randomTerm();
Term t3 = randomTerm();
- int pos1 = 1 + random.nextInt(3);
- int pos2 = pos1 + 1 + random.nextInt(3);
+ int pos1 = 1 + random().nextInt(3);
+ int pos2 = pos1 + 1 + random().nextInt(3);
PhraseQuery q1 = new PhraseQuery();
q1.add(t1);
q1.add(t2, pos1);
@@ -155,8 +155,8 @@ public class TestSloppyPhraseQuery2 exte
/** same as the above with posincr */
public void testRepetitiveIncreasingSloppiness3WithHoles() throws Exception {
Term t = randomTerm();
- int pos1 = 1 + random.nextInt(3);
- int pos2 = pos1 + 1 + random.nextInt(3);
+ int pos1 = 1 + random().nextInt(3);
+ int pos2 = pos1 + 1 + random().nextInt(3);
PhraseQuery q1 = new PhraseQuery();
q1.add(t);
q1.add(t, pos1);
@@ -174,7 +174,7 @@ public class TestSloppyPhraseQuery2 exte
/** MultiPhraseQuery~N â MultiPhraseQuery~N+1 */
public void testRandomIncreasingSloppiness() throws Exception {
- long seed = random.nextLong();
+ long seed = random().nextLong();
MultiPhraseQuery q1 = randomPhraseQuery(seed);
MultiPhraseQuery q2 = randomPhraseQuery(seed);
for (int i = 0; i < 10; i++) {
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSort.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSort.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSort.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSort.java Sun Apr 15 14:41:44 2012
@@ -123,20 +123,20 @@ public class TestSort extends LuceneTest
throws IOException {
Directory indexStore = newDirectory();
dirs.add(indexStore);
- RandomIndexWriter writer = new RandomIndexWriter(random, indexStore, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)).setMergePolicy(newLogMergePolicy()));
+ RandomIndexWriter writer = new RandomIndexWriter(random(), indexStore, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())).setMergePolicy(newLogMergePolicy()));
final DocValues.Type stringDVType;
if (dvStringSorted) {
// Index sorted
- stringDVType = random.nextBoolean() ? DocValues.Type.BYTES_VAR_SORTED : DocValues.Type.BYTES_FIXED_SORTED;
+ stringDVType = random().nextBoolean() ? DocValues.Type.BYTES_VAR_SORTED : DocValues.Type.BYTES_FIXED_SORTED;
} else {
// Index non-sorted
- if (random.nextBoolean()) {
+ if (random().nextBoolean()) {
// Fixed
- stringDVType = random.nextBoolean() ? DocValues.Type.BYTES_FIXED_STRAIGHT : DocValues.Type.BYTES_FIXED_DEREF;
+ stringDVType = random().nextBoolean() ? DocValues.Type.BYTES_FIXED_STRAIGHT : DocValues.Type.BYTES_FIXED_DEREF;
} else {
// Var
- stringDVType = random.nextBoolean() ? DocValues.Type.BYTES_VAR_STRAIGHT : DocValues.Type.BYTES_VAR_DEREF;
+ stringDVType = random().nextBoolean() ? DocValues.Type.BYTES_VAR_STRAIGHT : DocValues.Type.BYTES_VAR_DEREF;
}
}
@@ -206,7 +206,7 @@ public class TestSort extends LuceneTest
dirs.add(indexStore);
IndexWriter writer = new IndexWriter(
indexStore,
- newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)).
+ newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())).
setMergePolicy(newLogMergePolicy(97))
);
FieldType onlyStored = new FieldType();
@@ -285,7 +285,7 @@ public class TestSort extends LuceneTest
public int getRandomNumber(final int low, final int high) {
- int randInt = (Math.abs(random.nextInt()) % (high - low)) + low;
+ int randInt = (Math.abs(random().nextInt()) % (high - low)) + low;
return randInt;
}
@@ -313,7 +313,7 @@ public class TestSort extends LuceneTest
public void setUp() throws Exception {
super.setUp();
- dvStringSorted = random.nextBoolean();
+ dvStringSorted = random().nextBoolean();
full = getFullIndex();
searchX = getXIndex();
searchY = getYIndex();
@@ -408,7 +408,7 @@ public class TestSort extends LuceneTest
if (dvStringSorted) {
// If you index as sorted source you can still sort by
// value instead:
- return random.nextBoolean() ? SortField.Type.STRING : SortField.Type.STRING_VAL;
+ return random().nextBoolean() ? SortField.Type.STRING : SortField.Type.STRING_VAL;
} else {
return SortField.Type.STRING_VAL;
}
@@ -511,7 +511,7 @@ public class TestSort extends LuceneTest
private void verifyStringSort(Sort sort) throws Exception {
final IndexSearcher searcher = getFullStrings();
- final ScoreDoc[] result = searcher.search(new MatchAllDocsQuery(), null, _TestUtil.nextInt(random, 500, searcher.getIndexReader().maxDoc()), sort).scoreDocs;
+ final ScoreDoc[] result = searcher.search(new MatchAllDocsQuery(), null, _TestUtil.nextInt(random(), 500, searcher.getIndexReader().maxDoc()), sort).scoreDocs;
StringBuilder buff = new StringBuilder();
int n = result.length;
String last = null;
@@ -801,7 +801,7 @@ public class TestSort extends LuceneTest
assertMatches (full, queryG, sort, "ZYXW");
// Do the same for a ParallelMultiSearcher
- ExecutorService exec = Executors.newFixedThreadPool(_TestUtil.nextInt(random, 2, 8));
+ ExecutorService exec = Executors.newFixedThreadPool(_TestUtil.nextInt(random(), 2, 8));
IndexSearcher parallelSearcher=new IndexSearcher (full.getIndexReader(), exec);
sort.setSort (new SortField ("int", SortField.Type.INT),
@@ -845,7 +845,7 @@ public class TestSort extends LuceneTest
// test a variety of sorts using a parallel multisearcher
public void testParallelMultiSort() throws Exception {
- ExecutorService exec = Executors.newFixedThreadPool(_TestUtil.nextInt(random, 2, 8));
+ ExecutorService exec = Executors.newFixedThreadPool(_TestUtil.nextInt(random(), 2, 8));
IndexSearcher searcher = new IndexSearcher(
new MultiReader(searchX.getIndexReader(),
searchY.getIndexReader()), exec);
@@ -1236,7 +1236,7 @@ public class TestSort extends LuceneTest
public void testEmptyStringVsNullStringSort() 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();
doc.add(newField("f", "", StringField.TYPE_UNSTORED));
doc.add(newField("t", "1", StringField.TYPE_UNSTORED));
@@ -1261,7 +1261,7 @@ public class TestSort extends LuceneTest
public void testLUCENE2142() throws IOException {
Directory indexStore = newDirectory();
IndexWriter writer = new IndexWriter(indexStore, newIndexWriterConfig(
- TEST_VERSION_CURRENT, new MockAnalyzer(random)));
+ TEST_VERSION_CURRENT, new MockAnalyzer(random())));
for (int i=0; i<5; i++) {
Document doc = new Document();
doc.add (new StringField ("string", "a"+i));
@@ -1283,7 +1283,7 @@ public class TestSort extends LuceneTest
public void testCountingCollector() throws Exception {
Directory indexStore = newDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(random, indexStore);
+ RandomIndexWriter writer = new RandomIndexWriter(random(), indexStore);
for (int i=0; i<5; i++) {
Document doc = new Document();
doc.add (new StringField ("string", "a"+i));
@@ -1333,6 +1333,7 @@ public class TestSort extends LuceneTest
}
public void testRandomStringSort() throws Exception {
+ Random random = new Random(random().nextLong());
assumeTrue("cannot work with Lucene3x codec",
defaultCodecSupportsDocValues());
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSubScorerFreqs.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSubScorerFreqs.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSubScorerFreqs.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSubScorerFreqs.java Sun Apr 15 14:41:44 2012
@@ -40,7 +40,7 @@ public class TestSubScorerFreqs extends
public static void makeIndex() throws Exception {
dir = new RAMDirectory();
RandomIndexWriter w = new RandomIndexWriter(
- random, dir, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)).setMergePolicy(newLogMergePolicy()));
+ random(), dir, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())).setMergePolicy(newLogMergePolicy()));
// make sure we have more than one segment occationally
int num = atLeast(31);
for (int i = 0; i < num; i++) {
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTermRangeQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTermRangeQuery.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTermRangeQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTermRangeQuery.java Sun Apr 15 14:41:44 2012
@@ -240,7 +240,7 @@ public class TestTermRangeQuery extends
}
private void initializeIndex(String[] values) throws IOException {
- initializeIndex(values, new MockAnalyzer(random, MockTokenizer.WHITESPACE, false));
+ initializeIndex(values, new MockAnalyzer(random(), MockTokenizer.WHITESPACE, false));
}
private void initializeIndex(String[] values, Analyzer analyzer) throws IOException {
@@ -254,7 +254,7 @@ public class TestTermRangeQuery extends
// shouldnt create an analyzer for every doc?
private void addDoc(String content) throws IOException {
- IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random, MockTokenizer.WHITESPACE, false)).setOpenMode(OpenMode.APPEND));
+ IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random(), MockTokenizer.WHITESPACE, false)).setOpenMode(OpenMode.APPEND));
insertDoc(writer, content);
writer.close();
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTermScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTermScorer.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTermScorer.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTermScorer.java Sun Apr 15 14:41:44 2012
@@ -47,8 +47,8 @@ public class TestTermScorer extends Luce
super.setUp();
directory = newDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(random, directory,
- newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random))
+ RandomIndexWriter writer = new RandomIndexWriter(random(), directory,
+ newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random()))
.setMergePolicy(newLogMergePolicy())
.setSimilarity(new DefaultSimilarity()));
for (int i = 0; i < values.length; i++) {
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTermVectors.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTermVectors.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTermVectors.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTermVectors.java Sun Apr 15 14:41:44 2012
@@ -46,7 +46,7 @@ public class TestTermVectors extends Luc
@BeforeClass
public static void beforeClass() throws Exception {
directory = newDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(random, directory, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random, MockTokenizer.SIMPLE, true)).setMergePolicy(newLogMergePolicy()));
+ RandomIndexWriter writer = new RandomIndexWriter(random(), directory, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random(), MockTokenizer.SIMPLE, true)).setMergePolicy(newLogMergePolicy()));
//writer.setUseCompoundFile(true);
//writer.infoStream = System.out;
for (int i = 0; i < 1000; i++) {
@@ -107,7 +107,7 @@ public class TestTermVectors extends Luc
public void testTermVectorsFieldOrder() throws IOException {
Directory dir = newDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(random, dir, new MockAnalyzer(random, MockTokenizer.SIMPLE, true));
+ RandomIndexWriter writer = new RandomIndexWriter(random(), dir, new MockAnalyzer(random(), MockTokenizer.SIMPLE, true));
Document doc = new Document();
FieldType ft = new FieldType(TextField.TYPE_STORED);
ft.setStoreTermVectors(true);
@@ -238,8 +238,8 @@ public class TestTermVectors extends Luc
Directory dir = newDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(random, dir,
- newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random, MockTokenizer.SIMPLE, true))
+ RandomIndexWriter writer = new RandomIndexWriter(random(), dir,
+ newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random(), MockTokenizer.SIMPLE, true))
.setOpenMode(OpenMode.CREATE)
.setMergePolicy(newLogMergePolicy())
.setSimilarity(new DefaultSimilarity()));
@@ -261,7 +261,7 @@ public class TestTermVectors extends Luc
while (termsEnum.next() != null) {
String text = termsEnum.term().utf8ToString();
- docs = _TestUtil.docs(random, termsEnum, MultiFields.getLiveDocs(knownSearcher.reader), docs, true);
+ docs = _TestUtil.docs(random(), termsEnum, MultiFields.getLiveDocs(knownSearcher.reader), docs, true);
while (docs.nextDoc() != DocIdSetIterator.NO_MORE_DOCS) {
int docId = docs.docID();
@@ -333,8 +333,8 @@ public class TestTermVectors extends Luc
// Test only a few docs having vectors
public void testRareVectors() throws IOException {
- RandomIndexWriter writer = new RandomIndexWriter(random, directory,
- newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random, MockTokenizer.SIMPLE, true))
+ RandomIndexWriter writer = new RandomIndexWriter(random(), directory,
+ newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random(), MockTokenizer.SIMPLE, true))
.setOpenMode(OpenMode.CREATE));
if (VERBOSE) {
System.out.println("TEST: now add non-vectors");
@@ -380,9 +380,9 @@ public class TestTermVectors extends Luc
// In a single doc, for the same field, mix the term
// vectors up
public void testMixedVectrosVectors() throws IOException {
- RandomIndexWriter writer = new RandomIndexWriter(random, directory,
+ RandomIndexWriter writer = new RandomIndexWriter(random(), directory,
newIndexWriterConfig(TEST_VERSION_CURRENT,
- new MockAnalyzer(random, MockTokenizer.SIMPLE, true)).setOpenMode(OpenMode.CREATE));
+ new MockAnalyzer(random(), MockTokenizer.SIMPLE, true)).setOpenMode(OpenMode.CREATE));
Document doc = new Document();
FieldType ft2 = new FieldType(TextField.TYPE_STORED);
@@ -448,7 +448,7 @@ public class TestTermVectors extends Luc
private IndexWriter createWriter(Directory dir) throws IOException {
return new IndexWriter(dir, newIndexWriterConfig(TEST_VERSION_CURRENT,
- new MockAnalyzer(random)).setMaxBufferedDocs(2));
+ new MockAnalyzer(random())).setMaxBufferedDocs(2));
}
private void createDir(Directory dir) throws IOException {
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java Sun Apr 15 14:41:44 2012
@@ -80,7 +80,7 @@ public class TestTimeLimitingCollector e
"blueberry pizza",
};
directory = newDirectory();
- RandomIndexWriter iw = new RandomIndexWriter(random, directory, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)).setMergePolicy(newLogMergePolicy()));
+ RandomIndexWriter iw = new RandomIndexWriter(random(), directory, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())).setMergePolicy(newLogMergePolicy()));
for (int i=0; i<N_DOCS; i++) {
add(docText[i%docText.length], iw);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTopDocsCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTopDocsCollector.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTopDocsCollector.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTopDocsCollector.java Sun Apr 15 14:41:44 2012
@@ -108,7 +108,7 @@ public class TestTopDocsCollector extend
// populate an index with 30 documents, this should be enough for the test.
// The documents have no content - the test uses MatchAllDocsQuery().
dir = newDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(random, dir);
+ RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
for (int i = 0; i < 30; i++) {
writer.addDocument(new Document());
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTopDocsMerge.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTopDocsMerge.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTopDocsMerge.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTopDocsMerge.java Sun Apr 15 14:41:44 2012
@@ -77,7 +77,7 @@ public class TestTopDocsMerge extends Lu
{
dir = newDirectory();
- final RandomIndexWriter w = new RandomIndexWriter(random, dir);
+ final RandomIndexWriter w = new RandomIndexWriter(random(), dir);
// w.setDoRandomForceMerge(false);
// w.w.getConfig().setMaxBufferedDocs(atLeast(100));
@@ -86,25 +86,25 @@ public class TestTopDocsMerge extends Lu
for(int contentIDX=0;contentIDX<content.length;contentIDX++) {
final StringBuilder sb = new StringBuilder();
- final int numTokens = _TestUtil.nextInt(random, 1, 10);
+ final int numTokens = _TestUtil.nextInt(random(), 1, 10);
for(int tokenIDX=0;tokenIDX<numTokens;tokenIDX++) {
- sb.append(tokens[random.nextInt(tokens.length)]).append(' ');
+ sb.append(tokens[random().nextInt(tokens.length)]).append(' ');
}
content[contentIDX] = sb.toString();
}
for(int docIDX=0;docIDX<numDocs;docIDX++) {
final Document doc = new Document();
- doc.add(newField("string", _TestUtil.randomRealisticUnicodeString(random), StringField.TYPE_UNSTORED));
- doc.add(newField("text", content[random.nextInt(content.length)], TextField.TYPE_UNSTORED));
- doc.add(new FloatField("float", random.nextFloat()));
+ doc.add(newField("string", _TestUtil.randomRealisticUnicodeString(random()), StringField.TYPE_UNSTORED));
+ doc.add(newField("text", content[random().nextInt(content.length)], TextField.TYPE_UNSTORED));
+ doc.add(new FloatField("float", random().nextFloat()));
final int intValue;
- if (random.nextInt(100) == 17) {
+ if (random().nextInt(100) == 17) {
intValue = Integer.MIN_VALUE;
- } else if (random.nextInt(100) == 17) {
+ } else if (random().nextInt(100) == 17) {
intValue = Integer.MAX_VALUE;
} else {
- intValue = random.nextInt();
+ intValue = random().nextInt();
}
doc.add(new IntField("int", intValue));
if (VERBOSE) {
@@ -157,21 +157,21 @@ public class TestTopDocsMerge extends Lu
for(int iter=0;iter<1000*RANDOM_MULTIPLIER;iter++) {
// TODO: custom FieldComp...
- final Query query = new TermQuery(new Term("text", tokens[random.nextInt(tokens.length)]));
+ final Query query = new TermQuery(new Term("text", tokens[random().nextInt(tokens.length)]));
final Sort sort;
- if (random.nextInt(10) == 4) {
+ if (random().nextInt(10) == 4) {
// Sort by score
sort = null;
} else {
- final SortField[] randomSortFields = new SortField[_TestUtil.nextInt(random, 1, 3)];
+ final SortField[] randomSortFields = new SortField[_TestUtil.nextInt(random(), 1, 3)];
for(int sortIDX=0;sortIDX<randomSortFields.length;sortIDX++) {
- randomSortFields[sortIDX] = sortFields.get(random.nextInt(sortFields.size()));
+ randomSortFields[sortIDX] = sortFields.get(random().nextInt(sortFields.size()));
}
sort = new Sort(randomSortFields);
}
- final int numHits = _TestUtil.nextInt(random, 1, numDocs+5);
+ final int numHits = _TestUtil.nextInt(random(), 1, numDocs+5);
//final int numHits = 5;
if (VERBOSE) {
@@ -183,7 +183,7 @@ public class TestTopDocsMerge extends Lu
if (sort == null) {
topHits = searcher.search(query, numHits);
} else {
- final TopFieldCollector c = TopFieldCollector.create(sort, numHits, true, true, true, random.nextBoolean());
+ final TopFieldCollector c = TopFieldCollector.create(sort, numHits, true, true, true, random().nextBoolean());
searcher.search(query, c);
topHits = c.topDocs(0, numHits);
}
@@ -208,7 +208,7 @@ public class TestTopDocsMerge extends Lu
if (sort == null) {
subHits = subSearcher.search(w, numHits);
} else {
- final TopFieldCollector c = TopFieldCollector.create(sort, numHits, true, true, true, random.nextBoolean());
+ final TopFieldCollector c = TopFieldCollector.create(sort, numHits, true, true, true, random().nextBoolean());
subSearcher.search(w, c);
subHits = c.topDocs(0, numHits);
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTopScoreDocCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTopScoreDocCollector.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTopScoreDocCollector.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTopScoreDocCollector.java Sun Apr 15 14:41:44 2012
@@ -28,7 +28,7 @@ public class TestTopScoreDocCollector ex
public void testOutOfOrderCollection() throws Exception {
Directory dir = newDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(random, dir);
+ RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
for (int i = 0; i < 10; i++) {
writer.addDocument(new Document());
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestWildcard.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestWildcard.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestWildcard.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestWildcard.java Sun Apr 15 14:41:44 2012
@@ -246,7 +246,7 @@ public class TestWildcard
private Directory getIndexStore(String field, String[] contents)
throws IOException {
Directory indexStore = newDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(random, indexStore);
+ RandomIndexWriter writer = new RandomIndexWriter(random(), indexStore);
for (int i = 0; i < contents.length; ++i) {
Document doc = new Document();
doc.add(newField(field, contents[i], TextField.TYPE_STORED));
@@ -344,8 +344,8 @@ public class TestWildcard
// prepare the index
Directory dir = newDirectory();
- RandomIndexWriter iw = new RandomIndexWriter(random, dir,
- newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random))
+ RandomIndexWriter iw = new RandomIndexWriter(random(), dir,
+ newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random()))
.setMergePolicy(newLogMergePolicy()));
for (int i = 0; i < docs.length; i++) {
Document doc = new Document();
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestWildcardRandom.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestWildcardRandom.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestWildcardRandom.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestWildcardRandom.java Sun Apr 15 14:41:44 2012
@@ -47,9 +47,9 @@ public class TestWildcardRandom extends
public void setUp() throws Exception {
super.setUp();
dir = newDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(random, dir,
- newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random))
- .setMaxBufferedDocs(_TestUtil.nextInt(random, 50, 1000)));
+ RandomIndexWriter writer = new RandomIndexWriter(random(), dir,
+ newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random()))
+ .setMaxBufferedDocs(_TestUtil.nextInt(random(), 50, 1000)));
Document doc = new Document();
Field field = newField("field", "", StringField.TYPE_UNSTORED);
@@ -70,7 +70,7 @@ public class TestWildcardRandom extends
}
private char N() {
- return (char) (0x30 + random.nextInt(10));
+ return (char) (0x30 + random().nextInt(10));
}
private String fillPattern(String wildcardPattern) {
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/payloads/TestPayloadNearQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/payloads/TestPayloadNearQuery.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/payloads/TestPayloadNearQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/payloads/TestPayloadNearQuery.java Sun Apr 15 14:41:44 2012
@@ -109,7 +109,7 @@ public class TestPayloadNearQuery extend
@BeforeClass
public static void beforeClass() throws Exception {
directory = newDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(random, directory,
+ RandomIndexWriter writer = new RandomIndexWriter(random(), directory,
newIndexWriterConfig(TEST_VERSION_CURRENT, new PayloadAnalyzer())
.setSimilarity(similarity));
//writer.infoStream = System.out;
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/payloads/TestPayloadTermQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/payloads/TestPayloadTermQuery.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/payloads/TestPayloadTermQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/payloads/TestPayloadTermQuery.java Sun Apr 15 14:41:44 2012
@@ -118,7 +118,7 @@ public class TestPayloadTermQuery extend
@BeforeClass
public static void beforeClass() throws Exception {
directory = newDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(random, directory,
+ RandomIndexWriter writer = new RandomIndexWriter(random(), directory,
newIndexWriterConfig(TEST_VERSION_CURRENT, new PayloadAnalyzer())
.setSimilarity(similarity).setMergePolicy(newLogMergePolicy()));
//writer.infoStream = System.out;
@@ -291,7 +291,7 @@ public class TestPayloadTermQuery extend
assertTrue("hits Size: " + hits.totalHits + " is not: " + 1, hits.totalHits == 1);
int[] results = new int[1];
results[0] = 0;//hits.scoreDocs[0].doc;
- CheckHits.checkHitCollector(random, query, PayloadHelper.NO_PAYLOAD_FIELD, searcher, results);
+ CheckHits.checkHitCollector(random(), query, PayloadHelper.NO_PAYLOAD_FIELD, searcher, results);
}
static class BoostingSimilarity extends DefaultSimilarity {
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarity2.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarity2.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarity2.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarity2.java Sun Apr 15 14:41:44 2012
@@ -81,7 +81,7 @@ public class TestSimilarity2 extends Luc
*/
public void testEmptyIndex() throws Exception {
Directory dir = newDirectory();
- RandomIndexWriter iw = new RandomIndexWriter(random, dir);
+ RandomIndexWriter iw = new RandomIndexWriter(random(), dir);
IndexReader ir = iw.getReader();
iw.close();
IndexSearcher is = newSearcher(ir);
@@ -97,7 +97,7 @@ public class TestSimilarity2 extends Luc
/** similar to the above, but ORs the query with a real field */
public void testEmptyField() throws Exception {
Directory dir = newDirectory();
- RandomIndexWriter iw = new RandomIndexWriter(random, dir);
+ RandomIndexWriter iw = new RandomIndexWriter(random(), dir);
Document doc = new Document();
doc.add(newField("foo", "bar", TextField.TYPE_UNSTORED));
iw.addDocument(doc);
@@ -119,7 +119,7 @@ public class TestSimilarity2 extends Luc
/** similar to the above, however the field exists, but we query with a term that doesnt exist too */
public void testEmptyTerm() throws Exception {
Directory dir = newDirectory();
- RandomIndexWriter iw = new RandomIndexWriter(random, dir);
+ RandomIndexWriter iw = new RandomIndexWriter(random(), dir);
Document doc = new Document();
doc.add(newField("foo", "bar", TextField.TYPE_UNSTORED));
iw.addDocument(doc);
@@ -141,7 +141,7 @@ public class TestSimilarity2 extends Luc
/** make sure we can retrieve when norms are disabled */
public void testNoNorms() throws Exception {
Directory dir = newDirectory();
- RandomIndexWriter iw = new RandomIndexWriter(random, dir);
+ RandomIndexWriter iw = new RandomIndexWriter(random(), dir);
Document doc = new Document();
FieldType ft = new FieldType(TextField.TYPE_UNSTORED);
ft.setOmitNorms(true);
@@ -165,7 +165,7 @@ public class TestSimilarity2 extends Luc
/** make sure all sims work if TF is omitted */
public void testOmitTF() throws Exception {
Directory dir = newDirectory();
- RandomIndexWriter iw = new RandomIndexWriter(random, dir);
+ RandomIndexWriter iw = new RandomIndexWriter(random(), dir);
Document doc = new Document();
FieldType ft = new FieldType(TextField.TYPE_UNSTORED);
ft.setIndexOptions(IndexOptions.DOCS_ONLY);
@@ -190,7 +190,7 @@ public class TestSimilarity2 extends Luc
/** make sure all sims work if TF and norms is omitted */
public void testOmitTFAndNorms() throws Exception {
Directory dir = newDirectory();
- RandomIndexWriter iw = new RandomIndexWriter(random, dir);
+ RandomIndexWriter iw = new RandomIndexWriter(random(), dir);
Document doc = new Document();
FieldType ft = new FieldType(TextField.TYPE_UNSTORED);
ft.setIndexOptions(IndexOptions.DOCS_ONLY);
@@ -220,7 +220,7 @@ public class TestSimilarity2 extends Luc
// however with spans, there is only one scorer for the whole hierarchy:
// inner queries are not real queries, their boosts are ignored, etc.
Directory dir = newDirectory();
- RandomIndexWriter iw = new RandomIndexWriter(random, dir);
+ RandomIndexWriter iw = new RandomIndexWriter(random(), dir);
Document doc = new Document();
FieldType ft = new FieldType(TextField.TYPE_UNSTORED);
doc.add(newField("foo", "bar", ft));
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarityBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarityBase.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarityBase.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarityBase.java Sun Apr 15 14:41:44 2012
@@ -105,7 +105,7 @@ public class TestSimilarityBase extends
super.setUp();
dir = newDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(random, dir);
+ RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
for (int i = 0; i < docs.length; i++) {
Document d = new Document();
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestBasics.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestBasics.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestBasics.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestBasics.java Sun Apr 15 14:41:44 2012
@@ -109,9 +109,9 @@ public class TestBasics extends LuceneTe
@BeforeClass
public static void beforeClass() throws Exception {
directory = newDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(random, directory,
+ RandomIndexWriter writer = new RandomIndexWriter(random(), directory,
newIndexWriterConfig(TEST_VERSION_CURRENT, simplePayloadAnalyzer)
- .setMaxBufferedDocs(_TestUtil.nextInt(random, 100, 1000)).setMergePolicy(newLogMergePolicy()));
+ .setMaxBufferedDocs(_TestUtil.nextInt(random(), 100, 1000)).setMergePolicy(newLogMergePolicy()));
//writer.infoStream = System.out;
for (int i = 0; i < 2000; i++) {
Document doc = new Document();
@@ -621,6 +621,6 @@ public class TestBasics extends LuceneTe
}
private void checkHits(Query query, int[] results) throws IOException {
- CheckHits.checkHits(random, query, "field", searcher, results);
+ CheckHits.checkHits(random(), query, "field", searcher, results);
}
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestFieldMaskingSpanQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestFieldMaskingSpanQuery.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestFieldMaskingSpanQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestFieldMaskingSpanQuery.java Sun Apr 15 14:41:44 2012
@@ -58,7 +58,7 @@ public class TestFieldMaskingSpanQuery e
@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()));
writer.addDocument(doc(new Field[] { field("id", "0")
,
@@ -128,7 +128,7 @@ public class TestFieldMaskingSpanQuery e
}
protected void check(SpanQuery q, int[] docs) throws Exception {
- CheckHits.checkHitCollector(random, q, null, searcher, docs);
+ CheckHits.checkHitCollector(random(), q, null, searcher, docs);
}
public void testRewrite0() throws Exception {
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java Sun Apr 15 14:41:44 2012
@@ -51,7 +51,7 @@ public class TestNearSpansOrdered extend
public void setUp() throws Exception {
super.setUp();
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));
@@ -85,7 +85,7 @@ public class TestNearSpansOrdered extend
public void testSpanNearQuery() throws Exception {
SpanNearQuery q = makeQuery();
- CheckHits.checkHits(random, q, FIELD, searcher, new int[] {0,1});
+ CheckHits.checkHits(random(), q, FIELD, searcher, new int[] {0,1});
}
public String s(Spans span) {
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java Sun Apr 15 14:41:44 2012
@@ -56,7 +56,7 @@ public class TestPayloadSpans extends Lu
public void setUp() throws Exception {
super.setUp();
PayloadHelper helper = new PayloadHelper();
- searcher = helper.setUp(random, similarity, 1000);
+ searcher = helper.setUp(random(), similarity, 1000);
indexReader = searcher.getIndexReader();
}
@@ -106,7 +106,7 @@ public class TestPayloadSpans extends Lu
Directory directory = newDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(random, directory,
+ RandomIndexWriter writer = new RandomIndexWriter(random(), directory,
newIndexWriterConfig(TEST_VERSION_CURRENT, new PayloadAnalyzer()).setSimilarity(similarity));
Document doc = new Document();
@@ -250,7 +250,7 @@ public class TestPayloadSpans extends Lu
public void testShrinkToAfterShortestMatch() throws CorruptIndexException,
LockObtainFailedException, IOException {
Directory directory = newDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(random, directory,
+ RandomIndexWriter writer = new RandomIndexWriter(random(), directory,
newIndexWriterConfig(TEST_VERSION_CURRENT, new TestPayloadAnalyzer()));
Document doc = new Document();
@@ -288,7 +288,7 @@ public class TestPayloadSpans extends Lu
public void testShrinkToAfterShortestMatch2() throws CorruptIndexException,
LockObtainFailedException, IOException {
Directory directory = newDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(random, directory,
+ RandomIndexWriter writer = new RandomIndexWriter(random(), directory,
newIndexWriterConfig(TEST_VERSION_CURRENT, new TestPayloadAnalyzer()));
Document doc = new Document();
@@ -324,7 +324,7 @@ public class TestPayloadSpans extends Lu
public void testShrinkToAfterShortestMatch3() throws CorruptIndexException,
LockObtainFailedException, IOException {
Directory directory = newDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(random, directory,
+ RandomIndexWriter writer = new RandomIndexWriter(random(), directory,
newIndexWriterConfig(TEST_VERSION_CURRENT, new TestPayloadAnalyzer()));
Document doc = new Document();
@@ -365,7 +365,7 @@ public class TestPayloadSpans extends Lu
public void testPayloadSpanUtil() throws Exception {
Directory directory = newDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(random, directory,
+ RandomIndexWriter writer = new RandomIndexWriter(random(), directory,
newIndexWriterConfig(TEST_VERSION_CURRENT, new PayloadAnalyzer()).setSimilarity(similarity));
Document doc = new Document();
@@ -425,7 +425,7 @@ public class TestPayloadSpans extends Lu
private IndexSearcher getSearcher() throws Exception {
directory = newDirectory();
String[] docs = new String[]{"xx rr yy mm pp","xx yy mm rr pp", "nopayload qq ss pp np", "one two three four five six seven eight nine ten eleven", "nine one two three four five six seven eight eleven ten"};
- RandomIndexWriter writer = new RandomIndexWriter(random, directory,
+ RandomIndexWriter writer = new RandomIndexWriter(random(), directory,
newIndexWriterConfig(TEST_VERSION_CURRENT, new PayloadAnalyzer()).setSimilarity(similarity));
Document doc = null;
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanFirstQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanFirstQuery.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanFirstQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanFirstQuery.java Sun Apr 15 14:41:44 2012
@@ -37,9 +37,9 @@ public class TestSpanFirstQuery extends
// mimic StopAnalyzer
CharacterRunAutomaton stopSet = new CharacterRunAutomaton(new RegExp("the|a|of").toAutomaton());
- Analyzer analyzer = new MockAnalyzer(random, MockTokenizer.SIMPLE, true, stopSet, true);
+ Analyzer analyzer = new MockAnalyzer(random(), MockTokenizer.SIMPLE, true, stopSet, true);
- RandomIndexWriter writer = new RandomIndexWriter(random, dir, analyzer);
+ RandomIndexWriter writer = new RandomIndexWriter(random(), dir, analyzer);
Document doc = new Document();
doc.add(newField("field", "the quick brown fox", TextField.TYPE_UNSTORED));
writer.addDocument(doc);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanMultiTermQueryWrapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanMultiTermQueryWrapper.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanMultiTermQueryWrapper.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanMultiTermQueryWrapper.java Sun Apr 15 14:41:44 2012
@@ -41,7 +41,7 @@ public class TestSpanMultiTermQueryWrapp
public void setUp() throws Exception {
super.setUp();
directory = newDirectory();
- RandomIndexWriter iw = new RandomIndexWriter(random, directory);
+ RandomIndexWriter iw = new RandomIndexWriter(random(), directory);
Document doc = new Document();
Field field = newField("field", "", TextField.TYPE_UNSTORED);
doc.add(field);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestSpans.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestSpans.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestSpans.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestSpans.java Sun Apr 15 14:41:44 2012
@@ -53,7 +53,7 @@ public class TestSpans extends LuceneTes
public void setUp() throws Exception {
super.setUp();
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_STORED));
@@ -91,7 +91,7 @@ public class TestSpans extends LuceneTes
}
private void checkHits(Query query, int[] results) throws IOException {
- CheckHits.checkHits(random, query, field, searcher, results);
+ CheckHits.checkHits(random(), query, field, searcher, results);
}
private void orderedSlopTest3SQ(
@@ -474,7 +474,7 @@ public class TestSpans extends LuceneTes
public void testNPESpanQuery() throws Throwable {
final Directory dir = newDirectory();
final IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(
- TEST_VERSION_CURRENT, new MockAnalyzer(random)));
+ TEST_VERSION_CURRENT, new MockAnalyzer(random())));
// Add documents
addDoc(writer, "1", "the big dogs went running to the market");
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestSpansAdvanced.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestSpansAdvanced.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestSpansAdvanced.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestSpansAdvanced.java Sun Apr 15 14:41:44 2012
@@ -58,9 +58,9 @@ public class TestSpansAdvanced extends L
super.setUp();
// create test index
mDirectory = newDirectory();
- final RandomIndexWriter writer = new RandomIndexWriter(random, mDirectory,
+ final RandomIndexWriter writer = new RandomIndexWriter(random(), mDirectory,
newIndexWriterConfig(TEST_VERSION_CURRENT,
- new MockAnalyzer(random, MockTokenizer.SIMPLE, true, MockTokenFilter.ENGLISH_STOPSET, true))
+ new MockAnalyzer(random(), MockTokenizer.SIMPLE, true, MockTokenFilter.ENGLISH_STOPSET, true))
.setMergePolicy(newLogMergePolicy()).setSimilarity(new DefaultSimilarity()));
addDocument(writer, "1", "I think it should work.");
addDocument(writer, "2", "I think it should work.");
@@ -138,7 +138,7 @@ public class TestSpansAdvanced extends L
protected static void assertHits(IndexSearcher s, Query query,
final String description, final String[] expectedIds,
final float[] expectedScores) throws IOException {
- QueryUtils.check(random, query, s);
+ QueryUtils.check(random(), query, s);
final float tolerance = 1e-5f;
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestSpansAdvanced2.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestSpansAdvanced2.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestSpansAdvanced2.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestSpansAdvanced2.java Sun Apr 15 14:41:44 2012
@@ -46,8 +46,8 @@ public class TestSpansAdvanced2 extends
super.setUp();
// create test index
- final RandomIndexWriter writer = new RandomIndexWriter(random, mDirectory,
- newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random,
+ final RandomIndexWriter writer = new RandomIndexWriter(random(), mDirectory,
+ newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random(),
MockTokenizer.SIMPLE, true, MockTokenFilter.ENGLISH_STOPSET, true))
.setOpenMode(OpenMode.APPEND).setMergePolicy(newLogMergePolicy())
.setSimilarity(new DefaultSimilarity()));
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestBufferedIndexInput.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestBufferedIndexInput.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestBufferedIndexInput.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestBufferedIndexInput.java Sun Apr 15 14:41:44 2012
@@ -79,7 +79,7 @@ public class TestBufferedIndexInput exte
// see MyBufferedIndexInput below.
public void testReadBytes() throws Exception {
MyBufferedIndexInput input = new MyBufferedIndexInput();
- runReadBytes(input, BufferedIndexInput.BUFFER_SIZE, random);
+ runReadBytes(input, BufferedIndexInput.BUFFER_SIZE, random());
// This tests the workaround code for LUCENE-1566 where readBytesInternal
// provides a workaround for a JVM Bug that incorrectly raises a OOM Error
@@ -93,11 +93,11 @@ public class TestBufferedIndexInput exte
// run test with chunk size of 10 bytes
runReadBytesAndClose(new SimpleFSIndexInput("SimpleFSIndexInput(path=\"" + tmpInputFile + "\")", tmpInputFile,
- newIOContext(random), 10), inputBufferSize, random);
+ newIOContext(random()), 10), inputBufferSize, random());
// run test with chunk size of 10 bytes
runReadBytesAndClose(new NIOFSIndexInput(tmpInputFile,
- newIOContext(random), 10), inputBufferSize, random);
+ newIOContext(random()), 10), inputBufferSize, random());
}
private void runReadBytesAndClose(IndexInput input, int bufferSize, Random r)
@@ -242,11 +242,11 @@ public class TestBufferedIndexInput exte
public void testSetBufferSize() throws IOException {
File indexDir = _TestUtil.getTempDir("testSetBufferSize");
- MockFSDirectory dir = new MockFSDirectory(indexDir, random);
+ MockFSDirectory dir = new MockFSDirectory(indexDir, random());
try {
IndexWriter writer = new IndexWriter(
dir,
- new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)).
+ new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())).
setOpenMode(OpenMode.CREATE).
setMergePolicy(newLogMergePolicy(false))
);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestCopyBytes.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestCopyBytes.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestCopyBytes.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestCopyBytes.java Sun Apr 15 14:41:44 2012
@@ -40,9 +40,9 @@ public class TestCopyBytes extends Lucen
}
// make random file
- IndexOutput out = dir.createOutput("test", newIOContext(random));
- byte[] bytes = new byte[_TestUtil.nextInt(random, 1, 77777)];
- final int size = _TestUtil.nextInt(random, 1, 1777777);
+ IndexOutput out = dir.createOutput("test", newIOContext(random()));
+ byte[] bytes = new byte[_TestUtil.nextInt(random(), 1, 77777)];
+ final int size = _TestUtil.nextInt(random(), 1, 1777777);
int upto = 0;
int byteUpto = 0;
while (upto < size) {
@@ -60,18 +60,18 @@ public class TestCopyBytes extends Lucen
assertEquals(size, dir.fileLength("test"));
// copy from test -> test2
- final IndexInput in = dir.openInput("test", newIOContext(random));
+ final IndexInput in = dir.openInput("test", newIOContext(random()));
- out = dir.createOutput("test2", newIOContext(random));
+ out = dir.createOutput("test2", newIOContext(random()));
upto = 0;
while (upto < size) {
- if (random.nextBoolean()) {
+ if (random().nextBoolean()) {
out.writeByte(in.readByte());
upto++;
} else {
final int chunk = Math.min(
- _TestUtil.nextInt(random, 1, bytes.length), size - upto);
+ _TestUtil.nextInt(random(), 1, bytes.length), size - upto);
out.copyBytes(in, chunk);
upto += chunk;
}
@@ -81,16 +81,16 @@ public class TestCopyBytes extends Lucen
in.close();
// verify
- IndexInput in2 = dir.openInput("test2", newIOContext(random));
+ IndexInput in2 = dir.openInput("test2", newIOContext(random()));
upto = 0;
while (upto < size) {
- if (random.nextBoolean()) {
+ if (random().nextBoolean()) {
final byte v = in2.readByte();
assertEquals(value(upto), v);
upto++;
} else {
final int limit = Math.min(
- _TestUtil.nextInt(random, 1, bytes.length), size - upto);
+ _TestUtil.nextInt(random(), 1, bytes.length), size - upto);
in2.readBytes(bytes, 0, limit);
for (int byteIdx = 0; byteIdx < limit; byteIdx++) {
assertEquals(value(upto), bytes[byteIdx]);
@@ -109,9 +109,9 @@ public class TestCopyBytes extends Lucen
// LUCENE-3541
public void testCopyBytesWithThreads() throws Exception {
- int datalen = _TestUtil.nextInt(random, 101, 10000);
+ int datalen = _TestUtil.nextInt(random(), 101, 10000);
byte data[] = new byte[datalen];
- random.nextBytes(data);
+ random().nextBytes(data);
Directory d = newDirectory();
IndexOutput output = d.createOutput("data", IOContext.DEFAULT);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestDirectory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestDirectory.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestDirectory.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestDirectory.java Sun Apr 15 14:41:44 2012
@@ -31,7 +31,7 @@ public class TestDirectory extends Lucen
for (Directory dir : dirs) {
dir.close();
try {
- dir.createOutput("test", newIOContext(random));
+ dir.createOutput("test", newIOContext(random()));
fail("did not hit expected exception");
} catch (AlreadyClosedException ace) {
}
@@ -56,7 +56,7 @@ public class TestDirectory extends Lucen
dir.ensureOpen();
String fname = "foo." + i;
String lockname = "foo" + i + ".lck";
- IndexOutput out = dir.createOutput(fname, newIOContext(random));
+ IndexOutput out = dir.createOutput(fname, newIOContext(random()));
out.writeByte((byte)i);
out.close();
@@ -70,7 +70,7 @@ public class TestDirectory extends Lucen
// closed and will cause a failure to delete the file.
if (d2 instanceof MMapDirectory) continue;
- IndexInput input = d2.openInput(fname, newIOContext(random));
+ IndexInput input = d2.openInput(fname, newIOContext(random()));
assertEquals((byte)i, input.readByte());
input.close();
}
@@ -141,7 +141,7 @@ public class TestDirectory extends Lucen
private void checkDirectoryFilter(Directory dir) throws IOException {
String name = "file";
try {
- dir.createOutput(name, newIOContext(random)).close();
+ dir.createOutput(name, newIOContext(random())).close();
assertTrue(dir.fileExists(name));
assertTrue(Arrays.asList(dir.listAll()).contains(name));
} finally {
@@ -156,7 +156,7 @@ public class TestDirectory extends Lucen
path.mkdirs();
new File(path, "subdir").mkdirs();
Directory fsDir = new SimpleFSDirectory(path, null);
- assertEquals(0, new RAMDirectory(fsDir, newIOContext(random)).listAll().length);
+ assertEquals(0, new RAMDirectory(fsDir, newIOContext(random())).listAll().length);
} finally {
_TestUtil.rmDir(path);
}
@@ -167,7 +167,7 @@ public class TestDirectory extends Lucen
File path = _TestUtil.getTempDir("testnotdir");
Directory fsDir = new SimpleFSDirectory(path, null);
try {
- IndexOutput out = fsDir.createOutput("afile", newIOContext(random));
+ IndexOutput out = fsDir.createOutput("afile", newIOContext(random()));
out.close();
assertTrue(fsDir.fileExists("afile"));
try {