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 [10/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/TestFieldCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFieldCache.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFieldCache.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFieldCache.java Sun Apr 15 14:41:44 2012
@@ -53,7 +53,7 @@ public class TestFieldCache extends Luce
NUM_DOCS = atLeast(500);
NUM_ORDS = atLeast(2);
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()));
long theLong = Long.MAX_VALUE;
double theDouble = Double.MAX_VALUE;
byte theByte = Byte.MAX_VALUE;
@@ -82,13 +82,13 @@ public class TestFieldCache extends Luce
}
// sometimes skip the field:
- if (random.nextInt(40) != 17) {
+ if (random().nextInt(40) != 17) {
unicodeStrings[i] = generateString(i);
doc.add(newField("theRandomUnicodeString", unicodeStrings[i], StringField.TYPE_STORED));
}
// sometimes skip the field:
- if (random.nextInt(10) != 8) {
+ if (random().nextInt(10) != 8) {
for (int j = 0; j < NUM_ORDS; j++) {
String newValue = generateString(i);
multiValued[i][j] = new BytesRef(newValue);
@@ -128,54 +128,54 @@ public class TestFieldCache extends Luce
public void test() throws IOException {
FieldCache cache = FieldCache.DEFAULT;
- double [] doubles = cache.getDoubles(reader, "theDouble", random.nextBoolean());
- assertSame("Second request to cache return same array", doubles, cache.getDoubles(reader, "theDouble", random.nextBoolean()));
- assertSame("Second request with explicit parser return same array", doubles, cache.getDoubles(reader, "theDouble", FieldCache.DEFAULT_DOUBLE_PARSER, random.nextBoolean()));
+ double [] doubles = cache.getDoubles(reader, "theDouble", random().nextBoolean());
+ assertSame("Second request to cache return same array", doubles, cache.getDoubles(reader, "theDouble", random().nextBoolean()));
+ assertSame("Second request with explicit parser return same array", doubles, cache.getDoubles(reader, "theDouble", FieldCache.DEFAULT_DOUBLE_PARSER, random().nextBoolean()));
assertTrue("doubles Size: " + doubles.length + " is not: " + NUM_DOCS, doubles.length == NUM_DOCS);
for (int i = 0; i < doubles.length; i++) {
assertTrue(doubles[i] + " does not equal: " + (Double.MAX_VALUE - i), doubles[i] == (Double.MAX_VALUE - i));
}
- long [] longs = cache.getLongs(reader, "theLong", random.nextBoolean());
- assertSame("Second request to cache return same array", longs, cache.getLongs(reader, "theLong", random.nextBoolean()));
- assertSame("Second request with explicit parser return same array", longs, cache.getLongs(reader, "theLong", FieldCache.DEFAULT_LONG_PARSER, random.nextBoolean()));
+ long [] longs = cache.getLongs(reader, "theLong", random().nextBoolean());
+ assertSame("Second request to cache return same array", longs, cache.getLongs(reader, "theLong", random().nextBoolean()));
+ assertSame("Second request with explicit parser return same array", longs, cache.getLongs(reader, "theLong", FieldCache.DEFAULT_LONG_PARSER, random().nextBoolean()));
assertTrue("longs Size: " + longs.length + " is not: " + NUM_DOCS, longs.length == NUM_DOCS);
for (int i = 0; i < longs.length; i++) {
assertTrue(longs[i] + " does not equal: " + (Long.MAX_VALUE - i) + " i=" + i, longs[i] == (Long.MAX_VALUE - i));
}
- byte [] bytes = cache.getBytes(reader, "theByte", random.nextBoolean());
- assertSame("Second request to cache return same array", bytes, cache.getBytes(reader, "theByte", random.nextBoolean()));
- assertSame("Second request with explicit parser return same array", bytes, cache.getBytes(reader, "theByte", FieldCache.DEFAULT_BYTE_PARSER, random.nextBoolean()));
+ byte [] bytes = cache.getBytes(reader, "theByte", random().nextBoolean());
+ assertSame("Second request to cache return same array", bytes, cache.getBytes(reader, "theByte", random().nextBoolean()));
+ assertSame("Second request with explicit parser return same array", bytes, cache.getBytes(reader, "theByte", FieldCache.DEFAULT_BYTE_PARSER, random().nextBoolean()));
assertTrue("bytes Size: " + bytes.length + " is not: " + NUM_DOCS, bytes.length == NUM_DOCS);
for (int i = 0; i < bytes.length; i++) {
assertTrue(bytes[i] + " does not equal: " + (Byte.MAX_VALUE - i), bytes[i] == (byte) (Byte.MAX_VALUE - i));
}
- short [] shorts = cache.getShorts(reader, "theShort", random.nextBoolean());
- assertSame("Second request to cache return same array", shorts, cache.getShorts(reader, "theShort", random.nextBoolean()));
- assertSame("Second request with explicit parser return same array", shorts, cache.getShorts(reader, "theShort", FieldCache.DEFAULT_SHORT_PARSER, random.nextBoolean()));
+ short [] shorts = cache.getShorts(reader, "theShort", random().nextBoolean());
+ assertSame("Second request to cache return same array", shorts, cache.getShorts(reader, "theShort", random().nextBoolean()));
+ assertSame("Second request with explicit parser return same array", shorts, cache.getShorts(reader, "theShort", FieldCache.DEFAULT_SHORT_PARSER, random().nextBoolean()));
assertTrue("shorts Size: " + shorts.length + " is not: " + NUM_DOCS, shorts.length == NUM_DOCS);
for (int i = 0; i < shorts.length; i++) {
assertTrue(shorts[i] + " does not equal: " + (Short.MAX_VALUE - i), shorts[i] == (short) (Short.MAX_VALUE - i));
}
- int [] ints = cache.getInts(reader, "theInt", random.nextBoolean());
- assertSame("Second request to cache return same array", ints, cache.getInts(reader, "theInt", random.nextBoolean()));
- assertSame("Second request with explicit parser return same array", ints, cache.getInts(reader, "theInt", FieldCache.DEFAULT_INT_PARSER, random.nextBoolean()));
+ int [] ints = cache.getInts(reader, "theInt", random().nextBoolean());
+ assertSame("Second request to cache return same array", ints, cache.getInts(reader, "theInt", random().nextBoolean()));
+ assertSame("Second request with explicit parser return same array", ints, cache.getInts(reader, "theInt", FieldCache.DEFAULT_INT_PARSER, random().nextBoolean()));
assertTrue("ints Size: " + ints.length + " is not: " + NUM_DOCS, ints.length == NUM_DOCS);
for (int i = 0; i < ints.length; i++) {
assertTrue(ints[i] + " does not equal: " + (Integer.MAX_VALUE - i), ints[i] == (Integer.MAX_VALUE - i));
}
- float [] floats = cache.getFloats(reader, "theFloat", random.nextBoolean());
- assertSame("Second request to cache return same array", floats, cache.getFloats(reader, "theFloat", random.nextBoolean()));
- assertSame("Second request with explicit parser return same array", floats, cache.getFloats(reader, "theFloat", FieldCache.DEFAULT_FLOAT_PARSER, random.nextBoolean()));
+ float [] floats = cache.getFloats(reader, "theFloat", random().nextBoolean());
+ assertSame("Second request to cache return same array", floats, cache.getFloats(reader, "theFloat", random().nextBoolean()));
+ assertSame("Second request with explicit parser return same array", floats, cache.getFloats(reader, "theFloat", FieldCache.DEFAULT_FLOAT_PARSER, random().nextBoolean()));
assertTrue("floats Size: " + floats.length + " is not: " + NUM_DOCS, floats.length == NUM_DOCS);
for (int i = 0; i < floats.length; i++) {
assertTrue(floats[i] + " does not equal: " + (Float.MAX_VALUE - i), floats[i] == (Float.MAX_VALUE - i));
@@ -224,7 +224,7 @@ public class TestFieldCache extends Luce
// seek the enum around (note this isn't a great test here)
int num = atLeast(100);
for (int i = 0; i < num; i++) {
- int k = _TestUtil.nextInt(random, 1, nTerms-1);
+ int k = _TestUtil.nextInt(random(), 1, nTerms-1);
BytesRef val1 = termsIndex.lookup(k, val);
assertEquals(TermsEnum.SeekStatus.FOUND, tenum.seekCeil(val1));
assertEquals(val1, tenum.term());
@@ -292,7 +292,7 @@ public class TestFieldCache extends Luce
public void testEmptyIndex() throws Exception {
Directory dir = newDirectory();
- IndexWriter writer= new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random)).setMaxBufferedDocs(500));
+ IndexWriter writer= new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random())).setMaxBufferedDocs(500));
writer.close();
IndexReader r = DirectoryReader.open(dir);
AtomicReader reader = SlowCompositeReaderWrapper.wrap(r);
@@ -305,16 +305,16 @@ public class TestFieldCache extends Luce
private static String generateString(int i) {
String s = null;
- if (i > 0 && random.nextInt(3) == 1) {
+ if (i > 0 && random().nextInt(3) == 1) {
// reuse past string -- try to find one that's not null
for(int iter = 0; iter < 10 && s == null;iter++) {
- s = unicodeStrings[random.nextInt(i)];
+ s = unicodeStrings[random().nextInt(i)];
}
if (s == null) {
- s = _TestUtil.randomUnicodeString(random);
+ s = _TestUtil.randomUnicodeString(random());
}
} else {
- s = _TestUtil.randomUnicodeString(random);
+ s = _TestUtil.randomUnicodeString(random());
}
return s;
}
@@ -348,7 +348,7 @@ public class TestFieldCache extends Luce
}
}
- int[] numInts = cache.getInts(reader, "numInt", random.nextBoolean());
+ int[] numInts = cache.getInts(reader, "numInt", random().nextBoolean());
docsWithField = cache.getDocsWithField(reader, "numInt");
for (int i = 0; i < docsWithField.length(); i++) {
if (i%2 == 0) {
@@ -384,7 +384,7 @@ public class TestFieldCache extends Luce
try {
while(!failed.get()) {
- final int op = random.nextInt(3);
+ final int op = random().nextInt(3);
if (op == 0) {
// Purge all caches & resume, once all
// threads get here:
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFieldCacheRangeFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFieldCacheRangeFilter.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFieldCacheRangeFilter.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFieldCacheRangeFilter.java Sun Apr 15 14:41:44 2012
@@ -524,7 +524,7 @@ public class TestFieldCacheRangeFilter e
@Test
public void testSparseIndex() throws IOException {
Directory dir = newDirectory();
- 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 d = -20; d <= 20; d++) {
Document doc = new Document();
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFieldCacheTermsFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFieldCacheTermsFilter.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFieldCacheTermsFilter.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFieldCacheTermsFilter.java Sun Apr 15 14:41:44 2012
@@ -37,7 +37,7 @@ public class TestFieldCacheTermsFilter e
public void testMissingTerms() throws Exception {
String fieldName = "field1";
Directory rd = newDirectory();
- RandomIndexWriter w = new RandomIndexWriter(random, rd);
+ RandomIndexWriter w = new RandomIndexWriter(random(), rd);
for (int i = 0; i < 100; i++) {
Document doc = new Document();
int term = i * 10; //terms are units of 10;
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFieldValueFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFieldValueFilter.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFieldValueFilter.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFieldValueFilter.java Sun Apr 15 14:41:44 2012
@@ -35,8 +35,8 @@ public class TestFieldValueFilter extend
public void testFieldValueFilterNoValue() throws IOException {
Directory 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())));
int docs = atLeast(10);
int[] docStates = buildIndex(writer, docs);
int numDocsNoValue = 0;
@@ -63,8 +63,8 @@ public class TestFieldValueFilter extend
public void testFieldValueFilter() throws IOException {
Directory 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())));
int docs = atLeast(10);
int[] docStates = buildIndex(writer, docs);
int numDocsWithValue = 0;
@@ -93,7 +93,7 @@ public class TestFieldValueFilter extend
int[] docStates = new int[docs];
for (int i = 0; i < docs; i++) {
Document doc = new Document();
- if (random.nextBoolean()) {
+ if (random().nextBoolean()) {
docStates[i] = 1;
doc.add(newField("some", "value", TextField.TYPE_STORED));
}
@@ -102,9 +102,9 @@ public class TestFieldValueFilter extend
writer.addDocument(doc);
}
writer.commit();
- int numDeletes = random.nextInt(docs);
+ int numDeletes = random().nextInt(docs);
for (int i = 0; i < numDeletes; i++) {
- int docID = random.nextInt(docs);
+ int docID = random().nextInt(docs);
writer.deleteDocuments(new Term("id", "" + docID));
docStates[docID] = 2;
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFilteredQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFilteredQuery.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFilteredQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFilteredQuery.java Sun Apr 15 14:41:44 2012
@@ -52,7 +52,7 @@ public class TestFilteredQuery extends L
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()));
Document doc = new Document();
doc.add (newField("field", "one two three four five", TextField.TYPE_STORED));
@@ -121,7 +121,7 @@ public class TestFilteredQuery extends L
ScoreDoc[] hits = searcher.search (filteredquery, null, 1000).scoreDocs;
assertEquals (1, hits.length);
assertEquals (1, hits[0].doc);
- QueryUtils.check(random, filteredquery,searcher);
+ QueryUtils.check(random(), filteredquery,searcher);
hits = searcher.search (filteredquery, null, 1000, new Sort(new SortField("sorter", SortField.Type.STRING))).scoreDocs;
assertEquals (1, hits.length);
@@ -130,23 +130,23 @@ public class TestFilteredQuery extends L
filteredquery = new FilteredQueryRA(new TermQuery (new Term ("field", "one")), filter, useRandomAccess);
hits = searcher.search (filteredquery, null, 1000).scoreDocs;
assertEquals (2, hits.length);
- QueryUtils.check(random, filteredquery,searcher);
+ QueryUtils.check(random(), filteredquery,searcher);
filteredquery = new FilteredQueryRA(new MatchAllDocsQuery(), filter, useRandomAccess);
hits = searcher.search (filteredquery, null, 1000).scoreDocs;
assertEquals (2, hits.length);
- QueryUtils.check(random, filteredquery,searcher);
+ QueryUtils.check(random(), filteredquery,searcher);
filteredquery = new FilteredQueryRA(new TermQuery (new Term ("field", "x")), filter, useRandomAccess);
hits = searcher.search (filteredquery, null, 1000).scoreDocs;
assertEquals (1, hits.length);
assertEquals (3, hits[0].doc);
- QueryUtils.check(random, filteredquery,searcher);
+ QueryUtils.check(random(), filteredquery,searcher);
filteredquery = new FilteredQueryRA(new TermQuery (new Term ("field", "y")), filter, useRandomAccess);
hits = searcher.search (filteredquery, null, 1000).scoreDocs;
assertEquals (0, hits.length);
- QueryUtils.check(random, filteredquery,searcher);
+ QueryUtils.check(random(), filteredquery,searcher);
// test boost
Filter f = newStaticFilterA();
@@ -213,7 +213,7 @@ public class TestFilteredQuery extends L
Query filteredquery = new FilteredQueryRA(rq, filter, useRandomAccess);
ScoreDoc[] hits = searcher.search(filteredquery, null, 1000).scoreDocs;
assertEquals(2, hits.length);
- QueryUtils.check(random, filteredquery,searcher);
+ QueryUtils.check(random(), filteredquery,searcher);
}
public void testBooleanMUST() throws Exception {
@@ -231,7 +231,7 @@ public class TestFilteredQuery extends L
bq.add(query, BooleanClause.Occur.MUST);
ScoreDoc[] hits = searcher.search(bq, null, 1000).scoreDocs;
assertEquals(0, hits.length);
- QueryUtils.check(random, query,searcher);
+ QueryUtils.check(random(), query,searcher);
}
public void testBooleanSHOULD() throws Exception {
@@ -249,7 +249,7 @@ public class TestFilteredQuery extends L
bq.add(query, BooleanClause.Occur.SHOULD);
ScoreDoc[] hits = searcher.search(bq, null, 1000).scoreDocs;
assertEquals(2, hits.length);
- QueryUtils.check(random, query,searcher);
+ QueryUtils.check(random(), query,searcher);
}
// Make sure BooleanQuery, which does out-of-order
@@ -268,7 +268,7 @@ public class TestFilteredQuery extends L
bq.add(new TermQuery(new Term("field", "two")), BooleanClause.Occur.SHOULD);
ScoreDoc[] hits = searcher.search(query, 1000).scoreDocs;
assertEquals(1, hits.length);
- QueryUtils.check(random, query, searcher);
+ QueryUtils.check(random(), query, searcher);
}
public void testChainedFilters() throws Exception {
@@ -284,14 +284,14 @@ public class TestFilteredQuery extends L
new CachingWrapperFilter(new QueryWrapperFilter(new TermQuery(new Term("field", "four")))), useRandomAccess);
ScoreDoc[] hits = searcher.search(query, 10).scoreDocs;
assertEquals(2, hits.length);
- QueryUtils.check(random, query, searcher);
+ QueryUtils.check(random(), query, searcher);
// one more:
query = new TestFilteredQuery.FilteredQueryRA(query,
new CachingWrapperFilter(new QueryWrapperFilter(new TermQuery(new Term("field", "five")))), useRandomAccess);
hits = searcher.search(query, 10).scoreDocs;
assertEquals(1, hits.length);
- QueryUtils.check(random, query, searcher);
+ QueryUtils.check(random(), query, searcher);
}
public void testEqualsHashcode() throws Exception {
@@ -337,11 +337,11 @@ public class TestFilteredQuery extends L
private void assertRewrite(FilteredQuery fq, Class<? extends Query> clazz) throws Exception {
// assign crazy boost to FQ
- final float boost = random.nextFloat() * 100.f;
+ final float boost = random().nextFloat() * 100.f;
fq.setBoost(boost);
// assign crazy boost to inner
- final float innerBoost = random.nextFloat() * 100.f;
+ final float innerBoost = random().nextFloat() * 100.f;
fq.getQuery().setBoost(innerBoost);
// check the class and boosts of rewritten query
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFilteredSearch.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFilteredSearch.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFilteredSearch.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFilteredSearch.java Sun Apr 15 14:41:44 2012
@@ -48,14 +48,14 @@ public class TestFilteredSearch extends
Directory directory = newDirectory();
int[] filterBits = {1, 36};
SimpleDocIdSetFilter filter = new SimpleDocIdSetFilter(filterBits);
- IndexWriter writer = new IndexWriter(directory, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random)).setMergePolicy(newLogMergePolicy()));
+ IndexWriter writer = new IndexWriter(directory, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random())).setMergePolicy(newLogMergePolicy()));
searchFiltered(writer, directory, filter, enforceSingleSegment);
// run the test on more than one segment
enforceSingleSegment = false;
// reset - it is stateful
filter.reset();
writer.close();
- writer = new IndexWriter(directory, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random)).setOpenMode(OpenMode.CREATE).setMaxBufferedDocs(10).setMergePolicy(newLogMergePolicy()));
+ writer = new IndexWriter(directory, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random())).setOpenMode(OpenMode.CREATE).setMaxBufferedDocs(10).setMergePolicy(newLogMergePolicy()));
// we index 60 docs - this will create 6 segments
searchFiltered(writer, directory, filter, enforceSingleSegment);
writer.close();
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFuzzyQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFuzzyQuery.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFuzzyQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFuzzyQuery.java Sun Apr 15 14:41:44 2012
@@ -39,7 +39,7 @@ public class TestFuzzyQuery extends Luce
public void testFuzziness() throws Exception {
Directory directory = newDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(random, directory);
+ RandomIndexWriter writer = new RandomIndexWriter(random(), directory);
addDoc("aaaaa", writer);
addDoc("aaaab", writer);
addDoc("aaabb", writer);
@@ -191,7 +191,7 @@ public class TestFuzzyQuery extends Luce
public void testFuzzinessLong() throws Exception {
Directory directory = newDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(random, directory);
+ RandomIndexWriter writer = new RandomIndexWriter(random(), directory);
addDoc("aaaaaaa", writer);
addDoc("segment", writer);
@@ -287,14 +287,14 @@ public class TestFuzzyQuery extends Luce
*/
public void testTieBreaker() throws Exception {
Directory directory = newDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(random, directory);
+ RandomIndexWriter writer = new RandomIndexWriter(random(), directory);
addDoc("a123456", writer);
addDoc("c123456", writer);
addDoc("d123456", writer);
addDoc("e123456", writer);
Directory directory2 = newDirectory();
- RandomIndexWriter writer2 = new RandomIndexWriter(random, directory2);
+ RandomIndexWriter writer2 = new RandomIndexWriter(random(), directory2);
addDoc("a123456", writer2);
addDoc("b123456", writer2);
addDoc("b123456", writer2);
@@ -321,7 +321,7 @@ public class TestFuzzyQuery extends Luce
public void testTokenLengthOpt() throws IOException {
Directory directory = newDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(random, directory);
+ RandomIndexWriter writer = new RandomIndexWriter(random(), directory);
addDoc("12345678911", writer);
addDoc("segment", writer);
@@ -357,7 +357,7 @@ public class TestFuzzyQuery extends Luce
/** Test the TopTermsBoostOnlyBooleanQueryRewrite rewrite method. */
public void testBoostOnlyRewrite() throws Exception {
Directory directory = newDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(random, directory);
+ RandomIndexWriter writer = new RandomIndexWriter(random(), directory);
addDoc("Lucene", writer);
addDoc("Lucene", writer);
addDoc("Lucenne", writer);
@@ -380,9 +380,9 @@ public class TestFuzzyQuery extends Luce
public void testGiga() throws Exception {
- MockAnalyzer analyzer = new MockAnalyzer(random);
+ MockAnalyzer analyzer = new MockAnalyzer(random());
Directory index = newDirectory();
- RandomIndexWriter w = new RandomIndexWriter(random, index);
+ RandomIndexWriter w = new RandomIndexWriter(random(), index);
addDoc("Lucene in Action", w);
addDoc("Lucene for Dummies", w);
@@ -417,7 +417,7 @@ public class TestFuzzyQuery extends Luce
public void testDistanceAsEditsSearching() throws Exception {
Directory index = newDirectory();
- RandomIndexWriter w = new RandomIndexWriter(random, index);
+ RandomIndexWriter w = new RandomIndexWriter(random(), index);
addDoc("foobar", w);
addDoc("test", w);
addDoc("working", w);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFuzzyQuery2.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFuzzyQuery2.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFuzzyQuery2.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFuzzyQuery2.java Sun Apr 15 14:41:44 2012
@@ -73,7 +73,7 @@ public class TestFuzzyQuery2 extends Luc
};
public void testFromTestData() throws Exception {
// TODO: randomize!
- assertFromTestData(mappings[random.nextInt(mappings.length)]);
+ assertFromTestData(mappings[random().nextInt(mappings.length)]);
}
public void assertFromTestData(int codePointTable[]) throws Exception {
@@ -87,7 +87,7 @@ public class TestFuzzyQuery2 extends Luc
int terms = (int) Math.pow(2, bits);
Directory dir = newDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(random, dir, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random, MockTokenizer.KEYWORD, false)).setMergePolicy(newLogMergePolicy()));
+ RandomIndexWriter writer = new RandomIndexWriter(random(), dir, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random(), MockTokenizer.KEYWORD, false)).setMergePolicy(newLogMergePolicy()));
Document doc = new Document();
Field field = newField("field", "", TextField.TYPE_UNSTORED);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMatchAllDocsQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMatchAllDocsQuery.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMatchAllDocsQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMatchAllDocsQuery.java Sun Apr 15 14:41:44 2012
@@ -35,8 +35,14 @@ import org.apache.lucene.util.LuceneTest
*
*/
public class TestMatchAllDocsQuery extends LuceneTestCase {
- private Analyzer analyzer = new MockAnalyzer(random);
+ private Analyzer analyzer;
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
+ analyzer = new MockAnalyzer(random());
+ }
+
public void testQuery() throws Exception {
Directory dir = newDirectory();
IndexWriter iw = new IndexWriter(dir, newIndexWriterConfig(
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java Sun Apr 15 14:41:44 2012
@@ -49,7 +49,7 @@ public class TestMultiPhraseQuery extend
public void testPhrasePrefix() throws IOException {
Directory indexStore = newDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(random, indexStore);
+ RandomIndexWriter writer = new RandomIndexWriter(random(), indexStore);
add("blueberry pie", writer);
add("blueberry strudel", writer);
add("blueberry pizza", writer);
@@ -141,7 +141,7 @@ public class TestMultiPhraseQuery extend
// LUCENE-2580
public void testTall() throws IOException {
Directory indexStore = newDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(random, indexStore);
+ RandomIndexWriter writer = new RandomIndexWriter(random(), indexStore);
add("blueberry chocolate pie", writer);
add("blueberry chocolate tart", writer);
IndexReader r = writer.getReader();
@@ -160,7 +160,7 @@ public class TestMultiPhraseQuery extend
@Ignore //LUCENE-3821 fixes sloppy phrase scoring, except for this known problem
public void testMultiSloppyWithRepeats() throws IOException {
Directory indexStore = newDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(random, indexStore);
+ RandomIndexWriter writer = new RandomIndexWriter(random(), indexStore);
add("a b c d e f g h i k", writer);
IndexReader r = writer.getReader();
writer.close();
@@ -180,7 +180,7 @@ public class TestMultiPhraseQuery extend
public void testMultiExactWithRepeats() throws IOException {
Directory indexStore = newDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(random, indexStore);
+ RandomIndexWriter writer = new RandomIndexWriter(random(), indexStore);
add("a b c d e f g h i k", writer);
IndexReader r = writer.getReader();
writer.close();
@@ -207,7 +207,7 @@ public class TestMultiPhraseQuery extend
// and all terms required.
// The contained PhraseMultiQuery must contain exactly one term array.
Directory indexStore = newDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(random, indexStore);
+ RandomIndexWriter writer = new RandomIndexWriter(random(), indexStore);
add("blueberry pie", writer);
add("blueberry chewing gum", writer);
add("blue raspberry pie", writer);
@@ -238,7 +238,7 @@ public class TestMultiPhraseQuery extend
public void testPhrasePrefixWithBooleanQuery() throws IOException {
Directory indexStore = newDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(random, indexStore);
+ RandomIndexWriter writer = new RandomIndexWriter(random(), indexStore);
add("This is a test", "object", writer);
add("a note", "note", writer);
@@ -265,7 +265,7 @@ public class TestMultiPhraseQuery extend
public void testNoDocs() throws Exception {
Directory indexStore = newDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(random, indexStore);
+ RandomIndexWriter writer = new RandomIndexWriter(random(), indexStore);
add("a note", "note", writer);
IndexReader reader = writer.getReader();
@@ -328,7 +328,7 @@ public class TestMultiPhraseQuery extend
public void testCustomIDF() throws Exception {
Directory indexStore = newDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(random, indexStore);
+ RandomIndexWriter writer = new RandomIndexWriter(random(), indexStore);
add("This is a test", "object", writer);
add("a note", "note", writer);
@@ -365,7 +365,7 @@ public class TestMultiPhraseQuery extend
tokens[2].append("c");
tokens[2].setPositionIncrement(0);
- RandomIndexWriter writer = new RandomIndexWriter(random, dir);
+ RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
Document doc = new Document();
doc.add(new TextField("field", new CannedTokenStream(tokens)));
writer.addDocument(doc);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java Sun Apr 15 14:41:44 2012
@@ -56,9 +56,9 @@ public class TestMultiTermConstantScore
"X 4 5 6" };
small = newDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(random, small,
+ RandomIndexWriter writer = new RandomIndexWriter(random(), small,
newIndexWriterConfig(TEST_VERSION_CURRENT,
- new MockAnalyzer(random, MockTokenizer.WHITESPACE, false)).setMergePolicy(newLogMergePolicy()));
+ new MockAnalyzer(random(), MockTokenizer.WHITESPACE, false)).setMergePolicy(newLogMergePolicy()));
FieldType customType = new FieldType(TextField.TYPE_STORED);
customType.setTokenized(false);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMultiTermQueryRewrites.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMultiTermQueryRewrites.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMultiTermQueryRewrites.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMultiTermQueryRewrites.java Sun Apr 15 14:41:44 2012
@@ -46,9 +46,9 @@ public class TestMultiTermQueryRewrites
dir = newDirectory();
sdir1 = newDirectory();
sdir2 = newDirectory();
- final RandomIndexWriter writer = new RandomIndexWriter(random, dir, new MockAnalyzer(random));
- final RandomIndexWriter swriter1 = new RandomIndexWriter(random, sdir1, new MockAnalyzer(random));
- final RandomIndexWriter swriter2 = new RandomIndexWriter(random, sdir2, new MockAnalyzer(random));
+ final RandomIndexWriter writer = new RandomIndexWriter(random(), dir, new MockAnalyzer(random()));
+ final RandomIndexWriter swriter1 = new RandomIndexWriter(random(), sdir1, new MockAnalyzer(random()));
+ final RandomIndexWriter swriter2 = new RandomIndexWriter(random(), sdir2, new MockAnalyzer(random()));
for (int i = 0; i < 10; i++) {
Document doc = new Document();
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java Sun Apr 15 14:41:44 2012
@@ -40,7 +40,7 @@ public class TestMultiThreadTermVectors
public void setUp() throws Exception {
super.setUp();
directory = newDirectory();
- IndexWriter writer = new IndexWriter(directory, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random)).setMergePolicy(newLogMergePolicy()));
+ IndexWriter writer = new IndexWriter(directory, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random())).setMergePolicy(newLogMergePolicy()));
//writer.setUseCompoundFile(false);
//writer.infoStream = System.out;
FieldType customType = new FieldType(TextField.TYPE_STORED);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMultiValuedNumericRangeQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMultiValuedNumericRangeQuery.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMultiValuedNumericRangeQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMultiValuedNumericRangeQuery.java Sun Apr 15 14:41:44 2012
@@ -40,17 +40,17 @@ public class TestMultiValuedNumericRange
*/
public void testMultiValuedNRQ() throws Exception {
Directory directory = newDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(random, directory,
- newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random))
- .setMaxBufferedDocs(_TestUtil.nextInt(random, 50, 1000)));
+ RandomIndexWriter writer = new RandomIndexWriter(random(), directory,
+ newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random()))
+ .setMaxBufferedDocs(_TestUtil.nextInt(random(), 50, 1000)));
DecimalFormat format = new DecimalFormat("00000000000", new DecimalFormatSymbols(Locale.US));
int num = atLeast(500);
for (int l = 0; l < num; l++) {
Document doc = new Document();
- for (int m=0, c=random.nextInt(10); m<=c; m++) {
- int value = random.nextInt(Integer.MAX_VALUE);
+ for (int m=0, c=random().nextInt(10); m<=c; m++) {
+ int value = random().nextInt(Integer.MAX_VALUE);
doc.add(newField("asc", format.format(value), StringField.TYPE_UNSTORED));
doc.add(new IntField("trie", value));
}
@@ -62,8 +62,8 @@ public class TestMultiValuedNumericRange
IndexSearcher searcher=newSearcher(reader);
num = atLeast(50);
for (int i = 0; i < num; i++) {
- int lower=random.nextInt(Integer.MAX_VALUE);
- int upper=random.nextInt(Integer.MAX_VALUE);
+ int lower=random().nextInt(Integer.MAX_VALUE);
+ int upper=random().nextInt(Integer.MAX_VALUE);
if (lower>upper) {
int a=lower; lower=upper; upper=a;
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestNGramPhraseQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestNGramPhraseQuery.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestNGramPhraseQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestNGramPhraseQuery.java Sun Apr 15 14:41:44 2012
@@ -33,7 +33,7 @@ public class TestNGramPhraseQuery extend
@BeforeClass
public static void beforeClass() throws Exception {
directory = newDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(random, directory);
+ RandomIndexWriter writer = new RandomIndexWriter(random(), directory);
writer.close();
reader = IndexReader.open(directory);
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestNRTManager.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestNRTManager.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestNRTManager.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestNRTManager.java Sun Apr 15 14:41:44 2012
@@ -65,7 +65,7 @@ public class TestNRTManager extends Thre
@Override
protected Directory getDirectory(Directory in) {
// Randomly swap in NRTCachingDir
- if (random.nextBoolean()) {
+ if (random().nextBoolean()) {
if (VERBOSE) {
System.out.println("TEST: wrap NRTCachingDir");
}
@@ -81,7 +81,7 @@ public class TestNRTManager extends Thre
final long gen = genWriter.updateDocuments(id, docs);
// Randomly verify the update "took":
- if (random.nextInt(20) == 2) {
+ if (random().nextInt(20) == 2) {
if (VERBOSE) {
System.out.println(Thread.currentThread().getName() + ": nrt: verify " + id);
}
@@ -104,7 +104,7 @@ public class TestNRTManager extends Thre
protected void addDocuments(Term id, List<? extends Iterable<? extends IndexableField>> docs) throws Exception {
final long gen = genWriter.addDocuments(docs);
// Randomly verify the add "took":
- if (random.nextInt(20) == 2) {
+ if (random().nextInt(20) == 2) {
if (VERBOSE) {
System.out.println(Thread.currentThread().getName() + ": nrt: verify " + id);
}
@@ -127,7 +127,7 @@ public class TestNRTManager extends Thre
final long gen = genWriter.addDocument(doc);
// Randomly verify the add "took":
- if (random.nextInt(20) == 2) {
+ if (random().nextInt(20) == 2) {
if (VERBOSE) {
System.out.println(Thread.currentThread().getName() + ": nrt: verify " + id);
}
@@ -149,7 +149,7 @@ public class TestNRTManager extends Thre
protected void updateDocument(Term id, Iterable<? extends IndexableField> doc) throws Exception {
final long gen = genWriter.updateDocument(id, doc);
// Randomly verify the udpate "took":
- if (random.nextInt(20) == 2) {
+ if (random().nextInt(20) == 2) {
if (VERBOSE) {
System.out.println(Thread.currentThread().getName() + ": nrt: verify " + id);
}
@@ -171,7 +171,7 @@ public class TestNRTManager extends Thre
protected void deleteDocuments(Term id) throws Exception {
final long gen = genWriter.deleteDocuments(id);
// randomly verify the delete "took":
- if (random.nextInt(20) == 7) {
+ if (random().nextInt(20) == 7) {
if (VERBOSE) {
System.out.println(Thread.currentThread().getName() + ": nrt: verify del " + id);
}
@@ -202,8 +202,8 @@ public class TestNRTManager extends Thre
@Override
protected void doAfterWriter(final ExecutorService es) throws Exception {
- final double minReopenSec = 0.01 + 0.05 * random.nextDouble();
- final double maxReopenSec = minReopenSec * (1.0 + 10 * random.nextDouble());
+ final double minReopenSec = 0.01 + 0.05 * random().nextDouble();
+ final double maxReopenSec = minReopenSec * (1.0 + 10 * random().nextDouble());
if (VERBOSE) {
System.out.println("TEST: make NRTManager maxReopenSec=" + maxReopenSec + " minReopenSec=" + minReopenSec);
@@ -261,7 +261,7 @@ public class TestNRTManager extends Thre
// Test doesn't assert deletions until the end, so we
// can randomize whether dels must be applied
final NRTManager nrt;
- if (random.nextBoolean()) {
+ if (random().nextBoolean()) {
nrt = nrtDeletes;
} else {
nrt = nrtNoDeletes;
@@ -295,7 +295,7 @@ public class TestNRTManager extends Thre
* LUCENE-3528 - NRTManager hangs in certain situations
*/
public void testThreadStarvationNoDeleteNRTReader() throws IOException, InterruptedException {
- IndexWriterConfig conf = newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random));
+ IndexWriterConfig conf = newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random()));
Directory d = newDirectory();
final CountDownLatch latch = new CountDownLatch(1);
final CountDownLatch signal = new CountDownLatch(1);
@@ -391,7 +391,7 @@ public class TestNRTManager extends Thre
public void testEvilSearcherFactory() throws Exception {
final Directory dir = newDirectory();
- final RandomIndexWriter w = new RandomIndexWriter(random, dir);
+ final RandomIndexWriter w = new RandomIndexWriter(random(), dir);
w.commit();
final IndexReader other = DirectoryReader.open(dir);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestNot.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestNot.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestNot.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestNot.java Sun Apr 15 14:41:44 2012
@@ -34,7 +34,7 @@ public class TestNot extends LuceneTestC
public void testNot() throws Exception {
Directory store = newDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(random, store);
+ RandomIndexWriter writer = new RandomIndexWriter(random(), store);
Document d1 = new Document();
d1.add(newField("field", "a b", TextField.TYPE_STORED));
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java Sun Apr 15 14:41:44 2012
@@ -56,9 +56,9 @@ public class TestNumericRangeQuery32 ext
noDocs = atLeast(4096);
distance = (1 << 30) / noDocs;
directory = newDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(random, directory,
- newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random))
- .setMaxBufferedDocs(_TestUtil.nextInt(random, 100, 1000))
+ RandomIndexWriter writer = new RandomIndexWriter(random(), directory,
+ newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random()))
+ .setMaxBufferedDocs(_TestUtil.nextInt(random(), 100, 1000))
.setMergePolicy(newLogMergePolicy()));
final FieldType storedInt = new FieldType(IntField.TYPE);
@@ -299,8 +299,8 @@ public class TestNumericRangeQuery32 ext
@Test
public void testInfiniteValues() throws Exception {
Directory dir = newDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(random, dir,
- newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random)));
+ RandomIndexWriter writer = new RandomIndexWriter(random(), dir,
+ newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random())));
Document doc = new Document();
doc.add(new FloatField("float", Float.NEGATIVE_INFINITY));
doc.add(new IntField("int", Integer.MIN_VALUE));
@@ -370,10 +370,10 @@ public class TestNumericRangeQuery32 ext
private void testRandomTrieAndClassicRangeQuery(int precisionStep) throws Exception {
String field="field"+precisionStep;
int totalTermCountT=0,totalTermCountC=0,termCountT,termCountC;
- int num = _TestUtil.nextInt(random, 10, 20);
+ int num = _TestUtil.nextInt(random(), 10, 20);
for (int i = 0; i < num; i++) {
- int lower=(int)(random.nextDouble()*noDocs*distance)+startOffset;
- int upper=(int)(random.nextDouble()*noDocs*distance)+startOffset;
+ int lower=(int)(random().nextDouble()*noDocs*distance)+startOffset;
+ int upper=(int)(random().nextDouble()*noDocs*distance)+startOffset;
if (lower>upper) {
int a=lower; lower=upper; upper=a;
}
@@ -493,10 +493,10 @@ public class TestNumericRangeQuery32 ext
private void testRangeSplit(int precisionStep) throws Exception {
String field="ascfield"+precisionStep;
// 10 random tests
- int num = _TestUtil.nextInt(random, 10, 20);
+ int num = _TestUtil.nextInt(random(), 10, 20);
for (int i =0; i< num; i++) {
- int lower=(int)(random.nextDouble()*noDocs - noDocs/2);
- int upper=(int)(random.nextDouble()*noDocs - noDocs/2);
+ int lower=(int)(random().nextDouble()*noDocs - noDocs/2);
+ int upper=(int)(random().nextDouble()*noDocs - noDocs/2);
if (lower>upper) {
int a=lower; lower=upper; upper=a;
}
@@ -569,10 +569,10 @@ public class TestNumericRangeQuery32 ext
String field="field"+precisionStep;
// 10 random tests, the index order is ascending,
// so using a reverse sort field should retun descending documents
- int num = _TestUtil.nextInt(random, 10, 20);
+ int num = _TestUtil.nextInt(random(), 10, 20);
for (int i = 0; i < num; i++) {
- int lower=(int)(random.nextDouble()*noDocs*distance)+startOffset;
- int upper=(int)(random.nextDouble()*noDocs*distance)+startOffset;
+ int lower=(int)(random().nextDouble()*noDocs*distance)+startOffset;
+ int upper=(int)(random().nextDouble()*noDocs*distance)+startOffset;
if (lower>upper) {
int a=lower; lower=upper; upper=a;
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java Sun Apr 15 14:41:44 2012
@@ -56,9 +56,9 @@ public class TestNumericRangeQuery64 ext
noDocs = atLeast(4096);
distance = (1L << 60) / noDocs;
directory = newDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(random, directory,
- newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random))
- .setMaxBufferedDocs(_TestUtil.nextInt(random, 100, 1000))
+ RandomIndexWriter writer = new RandomIndexWriter(random(), directory,
+ newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random()))
+ .setMaxBufferedDocs(_TestUtil.nextInt(random(), 100, 1000))
.setMergePolicy(newLogMergePolicy()));
final FieldType storedLong = new FieldType(LongField.TYPE);
@@ -324,8 +324,8 @@ public class TestNumericRangeQuery64 ext
@Test
public void testInfiniteValues() throws Exception {
Directory dir = newDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(random, dir,
- newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)));
+ RandomIndexWriter writer = new RandomIndexWriter(random(), dir,
+ newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())));
Document doc = new Document();
doc.add(new DoubleField("double", Double.NEGATIVE_INFINITY));
doc.add(new LongField("long", Long.MIN_VALUE));
@@ -395,10 +395,10 @@ public class TestNumericRangeQuery64 ext
private void testRandomTrieAndClassicRangeQuery(int precisionStep) throws Exception {
String field="field"+precisionStep;
int totalTermCountT=0,totalTermCountC=0,termCountT,termCountC;
- int num = _TestUtil.nextInt(random, 10, 20);
+ int num = _TestUtil.nextInt(random(), 10, 20);
for (int i = 0; i < num; i++) {
- long lower=(long)(random.nextDouble()*noDocs*distance)+startOffset;
- long upper=(long)(random.nextDouble()*noDocs*distance)+startOffset;
+ long lower=(long)(random().nextDouble()*noDocs*distance)+startOffset;
+ long upper=(long)(random().nextDouble()*noDocs*distance)+startOffset;
if (lower>upper) {
long a=lower; lower=upper; upper=a;
}
@@ -523,10 +523,10 @@ public class TestNumericRangeQuery64 ext
private void testRangeSplit(int precisionStep) throws Exception {
String field="ascfield"+precisionStep;
// 10 random tests
- int num = _TestUtil.nextInt(random, 10, 20);
+ int num = _TestUtil.nextInt(random(), 10, 20);
for (int i = 0; i < num; i++) {
- long lower=(long)(random.nextDouble()*noDocs - noDocs/2);
- long upper=(long)(random.nextDouble()*noDocs - noDocs/2);
+ long lower=(long)(random().nextDouble()*noDocs - noDocs/2);
+ long upper=(long)(random().nextDouble()*noDocs - noDocs/2);
if (lower>upper) {
long a=lower; lower=upper; upper=a;
}
@@ -609,10 +609,10 @@ public class TestNumericRangeQuery64 ext
String field="field"+precisionStep;
// 10 random tests, the index order is ascending,
// so using a reverse sort field should retun descending documents
- int num = _TestUtil.nextInt(random, 10, 20);
+ int num = _TestUtil.nextInt(random(), 10, 20);
for (int i = 0; i < num; i++) {
- long lower=(long)(random.nextDouble()*noDocs*distance)+startOffset;
- long upper=(long)(random.nextDouble()*noDocs*distance)+startOffset;
+ long lower=(long)(random().nextDouble()*noDocs*distance)+startOffset;
+ long upper=(long)(random().nextDouble()*noDocs*distance)+startOffset;
if (lower>upper) {
long a=lower; lower=upper; upper=a;
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPhrasePrefixQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPhrasePrefixQuery.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPhrasePrefixQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPhrasePrefixQuery.java Sun Apr 15 14:41:44 2012
@@ -41,7 +41,7 @@ public class TestPhrasePrefixQuery exten
*/
public void testPhrasePrefix() throws IOException {
Directory indexStore = newDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(random, indexStore);
+ RandomIndexWriter writer = new RandomIndexWriter(random(), indexStore);
Document doc1 = new Document();
Document doc2 = new Document();
Document doc3 = new Document();
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPhraseQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPhraseQuery.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPhraseQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPhraseQuery.java Sun Apr 15 14:41:44 2012
@@ -17,31 +17,34 @@ package org.apache.lucene.search;
* limitations under the License.
*/
-import org.apache.lucene.util.LuceneTestCase;
+import java.io.*;
+import java.util.*;
+
import org.apache.lucene.analysis.*;
-import org.apache.lucene.analysis.tokenattributes.*;
+import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.lucene.document.*;
import org.apache.lucene.index.*;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.search.similarities.DefaultSimilarity;
-import org.apache.lucene.store.*;
-import org.apache.lucene.util.Version;
-import org.apache.lucene.util._TestUtil;
+import org.apache.lucene.store.Directory;
+import org.apache.lucene.util.*;
import org.junit.AfterClass;
import org.junit.BeforeClass;
-import java.io.IOException;
-import java.io.Reader;
-import java.io.StringReader;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Random;
+import com.carrotsearch.randomizedtesting.annotations.Seed;
/**
* Tests {@link PhraseQuery}.
*
* @see TestPositionIncrement
+ */
+/*
+ * Remove ThreadLeaks and run with (Eclipse or command line):
+ * -ea -Drt.seed=AFD1E7E84B35D2B1
+ * to get leaked thread errors.
*/
+// @ThreadLeaks(linger = 1000, leakedThreadsBelongToSuite = true)
+@Seed("AFD1E7E84B35D2B1")
public class TestPhraseQuery extends LuceneTestCase {
/** threshold for comparing floats */
@@ -66,7 +69,7 @@ public class TestPhraseQuery extends Luc
return 100;
}
};
- RandomIndexWriter writer = new RandomIndexWriter(random, directory, analyzer);
+ RandomIndexWriter writer = new RandomIndexWriter(random(), directory, analyzer);
Document doc = new Document();
doc.add(newField("field", "one two three four five", TextField.TYPE_STORED));
@@ -111,7 +114,7 @@ public class TestPhraseQuery extends Luc
query.add(new Term("field", "five"));
ScoreDoc[] hits = searcher.search(query, null, 1000).scoreDocs;
assertEquals(0, hits.length);
- QueryUtils.check(random, query,searcher);
+ QueryUtils.check(random(), query,searcher);
}
public void testBarelyCloseEnough() throws Exception {
@@ -120,7 +123,7 @@ public class TestPhraseQuery extends Luc
query.add(new Term("field", "five"));
ScoreDoc[] hits = searcher.search(query, null, 1000).scoreDocs;
assertEquals(1, hits.length);
- QueryUtils.check(random, query,searcher);
+ QueryUtils.check(random(), query,searcher);
}
/**
@@ -132,7 +135,7 @@ public class TestPhraseQuery extends Luc
query.add(new Term("field", "five"));
ScoreDoc[] hits = searcher.search(query, null, 1000).scoreDocs;
assertEquals("exact match", 1, hits.length);
- QueryUtils.check(random, query,searcher);
+ QueryUtils.check(random(), query,searcher);
query = new PhraseQuery();
@@ -140,7 +143,7 @@ public class TestPhraseQuery extends Luc
query.add(new Term("field", "one"));
hits = searcher.search(query, null, 1000).scoreDocs;
assertEquals("reverse not exact", 0, hits.length);
- QueryUtils.check(random, query,searcher);
+ QueryUtils.check(random(), query,searcher);
}
public void testSlop1() throws Exception {
@@ -150,7 +153,7 @@ public class TestPhraseQuery extends Luc
query.add(new Term("field", "two"));
ScoreDoc[] hits = searcher.search(query, null, 1000).scoreDocs;
assertEquals("in order", 1, hits.length);
- QueryUtils.check(random, query,searcher);
+ QueryUtils.check(random(), query,searcher);
// Ensures slop of 1 does not work for phrases out of order;
@@ -161,7 +164,7 @@ public class TestPhraseQuery extends Luc
query.add(new Term("field", "one"));
hits = searcher.search(query, null, 1000).scoreDocs;
assertEquals("reversed, slop not 2 or more", 0, hits.length);
- QueryUtils.check(random, query,searcher);
+ QueryUtils.check(random(), query,searcher);
}
/**
@@ -173,7 +176,7 @@ public class TestPhraseQuery extends Luc
query.add(new Term("field", "one"));
ScoreDoc[] hits = searcher.search(query, null, 1000).scoreDocs;
assertEquals("just sloppy enough", 1, hits.length);
- QueryUtils.check(random, query,searcher);
+ QueryUtils.check(random(), query,searcher);
query = new PhraseQuery();
@@ -182,7 +185,7 @@ public class TestPhraseQuery extends Luc
query.add(new Term("field", "one"));
hits = searcher.search(query, null, 1000).scoreDocs;
assertEquals("not sloppy enough", 0, hits.length);
- QueryUtils.check(random, query,searcher);
+ QueryUtils.check(random(), query,searcher);
}
@@ -197,7 +200,7 @@ public class TestPhraseQuery extends Luc
query.add(new Term("field", "five"));
ScoreDoc[] hits = searcher.search(query, null, 1000).scoreDocs;
assertEquals("two total moves", 1, hits.length);
- QueryUtils.check(random, query,searcher);
+ QueryUtils.check(random(), query,searcher);
query = new PhraseQuery();
@@ -207,20 +210,20 @@ public class TestPhraseQuery extends Luc
query.add(new Term("field", "one"));
hits = searcher.search(query, null, 1000).scoreDocs;
assertEquals("slop of 5 not close enough", 0, hits.length);
- QueryUtils.check(random, query,searcher);
+ QueryUtils.check(random(), query,searcher);
query.setSlop(6);
hits = searcher.search(query, null, 1000).scoreDocs;
assertEquals("slop of 6 just right", 1, hits.length);
- QueryUtils.check(random, query,searcher);
+ QueryUtils.check(random(), query,searcher);
}
public void testPhraseQueryWithStopAnalyzer() throws Exception {
Directory directory = newDirectory();
- Analyzer stopAnalyzer = new MockAnalyzer(random, MockTokenizer.SIMPLE, true, MockTokenFilter.ENGLISH_STOPSET, false);
- RandomIndexWriter writer = new RandomIndexWriter(random, directory,
+ Analyzer stopAnalyzer = new MockAnalyzer(random(), MockTokenizer.SIMPLE, true, MockTokenFilter.ENGLISH_STOPSET, false);
+ RandomIndexWriter writer = new RandomIndexWriter(random(), directory,
newIndexWriterConfig( Version.LUCENE_40, stopAnalyzer));
Document doc = new Document();
doc.add(newField("field", "the stop words are here", TextField.TYPE_STORED));
@@ -236,7 +239,7 @@ public class TestPhraseQuery extends Luc
query.add(new Term("field","words"));
ScoreDoc[] hits = searcher.search(query, null, 1000).scoreDocs;
assertEquals(1, hits.length);
- QueryUtils.check(random, query,searcher);
+ QueryUtils.check(random(), query,searcher);
// StopAnalyzer as of 2.4 does not leave "holes", so this matches.
@@ -245,7 +248,7 @@ public class TestPhraseQuery extends Luc
query.add(new Term("field", "here"));
hits = searcher.search(query, null, 1000).scoreDocs;
assertEquals(1, hits.length);
- QueryUtils.check(random, query,searcher);
+ QueryUtils.check(random(), query,searcher);
reader.close();
@@ -254,7 +257,7 @@ public class TestPhraseQuery extends Luc
public void testPhraseQueryInConjunctionScorer() throws Exception {
Directory directory = newDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(random, directory);
+ RandomIndexWriter writer = new RandomIndexWriter(random(), directory);
Document doc = new Document();
doc.add(newField("source", "marketing info", TextField.TYPE_STORED));
@@ -275,7 +278,7 @@ public class TestPhraseQuery extends Luc
phraseQuery.add(new Term("source", "info"));
ScoreDoc[] hits = searcher.search(phraseQuery, null, 1000).scoreDocs;
assertEquals(2, hits.length);
- QueryUtils.check(random, phraseQuery,searcher);
+ QueryUtils.check(random(), phraseQuery,searcher);
TermQuery termQuery = new TermQuery(new Term("contents","foobar"));
@@ -284,13 +287,13 @@ public class TestPhraseQuery extends Luc
booleanQuery.add(phraseQuery, BooleanClause.Occur.MUST);
hits = searcher.search(booleanQuery, null, 1000).scoreDocs;
assertEquals(1, hits.length);
- QueryUtils.check(random, termQuery,searcher);
+ QueryUtils.check(random(), termQuery,searcher);
reader.close();
- writer = new RandomIndexWriter(random, directory,
- newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random)).setOpenMode(OpenMode.CREATE));
+ writer = new RandomIndexWriter(random(), directory,
+ newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random())).setOpenMode(OpenMode.CREATE));
doc = new Document();
doc.add(newField("contents", "map entry woo", TextField.TYPE_STORED));
writer.addDocument(doc);
@@ -330,7 +333,7 @@ public class TestPhraseQuery extends Luc
booleanQuery.add(termQuery, BooleanClause.Occur.MUST);
hits = searcher.search(booleanQuery, null, 1000).scoreDocs;
assertEquals(2, hits.length);
- QueryUtils.check(random, booleanQuery,searcher);
+ QueryUtils.check(random(), booleanQuery,searcher);
reader.close();
@@ -339,8 +342,8 @@ public class TestPhraseQuery extends Luc
public void testSlopScoring() throws IOException {
Directory 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()));
@@ -375,7 +378,7 @@ public class TestPhraseQuery extends Luc
assertEquals(1, hits[1].doc);
assertEquals(0.31, hits[2].score, 0.01);
assertEquals(2, hits[2].doc);
- QueryUtils.check(random, query,searcher);
+ QueryUtils.check(random(), query,searcher);
reader.close();
directory.close();
}
@@ -399,13 +402,13 @@ public class TestPhraseQuery extends Luc
ScoreDoc[] hits = searcher.search(query, null, 1000).scoreDocs;
assertEquals("slop of 100 just right", 1, hits.length);
- QueryUtils.check(random, query,searcher);
+ QueryUtils.check(random(), query,searcher);
query.setSlop(99);
hits = searcher.search(query, null, 1000).scoreDocs;
assertEquals("slop of 99 not enough", 0, hits.length);
- QueryUtils.check(random, query,searcher);
+ QueryUtils.check(random(), query,searcher);
}
// work on two docs like this: "phrase exist notexist exist found"
@@ -418,7 +421,7 @@ public class TestPhraseQuery extends Luc
ScoreDoc[] hits = searcher.search(query, null, 1000).scoreDocs;
assertEquals("phrase without repetitions exists in 2 docs", 2, hits.length);
- QueryUtils.check(random, query,searcher);
+ QueryUtils.check(random(), query,searcher);
// phrase with repetitions that exists in 2 docs
query = new PhraseQuery();
@@ -429,7 +432,7 @@ public class TestPhraseQuery extends Luc
hits = searcher.search(query, null, 1000).scoreDocs;
assertEquals("phrase with repetitions exists in two docs", 2, hits.length);
- QueryUtils.check(random, query,searcher);
+ QueryUtils.check(random(), query,searcher);
// phrase I with repetitions that does not exist in any doc
query = new PhraseQuery();
@@ -440,7 +443,7 @@ public class TestPhraseQuery extends Luc
hits = searcher.search(query, null, 1000).scoreDocs;
assertEquals("nonexisting phrase with repetitions does not exist in any doc", 0, hits.length);
- QueryUtils.check(random, query,searcher);
+ QueryUtils.check(random(), query,searcher);
// phrase II with repetitions that does not exist in any doc
query = new PhraseQuery();
@@ -452,7 +455,7 @@ public class TestPhraseQuery extends Luc
hits = searcher.search(query, null, 1000).scoreDocs;
assertEquals("nonexisting phrase with repetitions does not exist in any doc", 0, hits.length);
- QueryUtils.check(random, query,searcher);
+ QueryUtils.check(random(), query,searcher);
}
@@ -475,7 +478,7 @@ public class TestPhraseQuery extends Luc
assertEquals("phrase found with exact phrase scorer", 1, hits.length);
float score0 = hits[0].score;
//System.out.println("(exact) field: two three: "+score0);
- QueryUtils.check(random, query,searcher);
+ QueryUtils.check(random(), query,searcher);
// search on non palyndrome, find phrase with slop 2, though no slop required here.
query.setSlop(2); // to use sloppy scorer
@@ -484,7 +487,7 @@ public class TestPhraseQuery extends Luc
float score1 = hits[0].score;
//System.out.println("(sloppy) field: two three: "+score1);
assertEquals("exact scorer and sloppy scorer score the same when slop does not matter",score0, score1, SCORE_COMP_THRESH);
- QueryUtils.check(random, query,searcher);
+ QueryUtils.check(random(), query,searcher);
// search ordered in palyndrome, find it twice
query = new PhraseQuery();
@@ -495,7 +498,7 @@ public class TestPhraseQuery extends Luc
assertEquals("just sloppy enough", 1, hits.length);
//float score2 = hits[0].score;
//System.out.println("palindrome: two three: "+score2);
- QueryUtils.check(random, query,searcher);
+ QueryUtils.check(random(), query,searcher);
//commented out for sloppy-phrase efficiency (issue 736) - see SloppyPhraseScorer.phraseFreq().
//assertTrue("ordered scores higher in palindrome",score1+SCORE_COMP_THRESH<score2);
@@ -509,7 +512,7 @@ public class TestPhraseQuery extends Luc
assertEquals("just sloppy enough", 1, hits.length);
//float score3 = hits[0].score;
//System.out.println("palindrome: three two: "+score3);
- QueryUtils.check(random, query,searcher);
+ QueryUtils.check(random(), query,searcher);
//commented out for sloppy-phrase efficiency (issue 736) - see SloppyPhraseScorer.phraseFreq().
//assertTrue("reversed scores higher in palindrome",score1+SCORE_COMP_THRESH<score3);
@@ -536,7 +539,7 @@ public class TestPhraseQuery extends Luc
assertEquals("phrase found with exact phrase scorer", 1, hits.length);
float score0 = hits[0].score;
//System.out.println("(exact) field: one two three: "+score0);
- QueryUtils.check(random, query,searcher);
+ QueryUtils.check(random(), query,searcher);
// just make sure no exc:
searcher.explain(query, 0);
@@ -548,7 +551,7 @@ public class TestPhraseQuery extends Luc
float score1 = hits[0].score;
//System.out.println("(sloppy) field: one two three: "+score1);
assertEquals("exact scorer and sloppy scorer score the same when slop does not matter",score0, score1, SCORE_COMP_THRESH);
- QueryUtils.check(random, query,searcher);
+ QueryUtils.check(random(), query,searcher);
// search ordered in palyndrome, find it twice
query = new PhraseQuery();
@@ -564,7 +567,7 @@ public class TestPhraseQuery extends Luc
assertEquals("just sloppy enough", 1, hits.length);
//float score2 = hits[0].score;
//System.out.println("palindrome: one two three: "+score2);
- QueryUtils.check(random, query,searcher);
+ QueryUtils.check(random(), query,searcher);
//commented out for sloppy-phrase efficiency (issue 736) - see SloppyPhraseScorer.phraseFreq().
//assertTrue("ordered scores higher in palindrome",score1+SCORE_COMP_THRESH<score2);
@@ -579,7 +582,7 @@ public class TestPhraseQuery extends Luc
assertEquals("just sloppy enough", 1, hits.length);
//float score3 = hits[0].score;
//System.out.println("palindrome: three two one: "+score3);
- QueryUtils.check(random, query,searcher);
+ QueryUtils.check(random(), query,searcher);
//commented out for sloppy-phrase efficiency (issue 736) - see SloppyPhraseScorer.phraseFreq().
//assertTrue("reversed scores higher in palindrome",score1+SCORE_COMP_THRESH<score3);
@@ -603,20 +606,20 @@ public class TestPhraseQuery extends Luc
public void testRandomPhrases() throws Exception {
Directory dir = newDirectory();
- Analyzer analyzer = new MockAnalyzer(random);
+ Analyzer analyzer = new MockAnalyzer(random());
- RandomIndexWriter w = new RandomIndexWriter(random, dir, newIndexWriterConfig(TEST_VERSION_CURRENT, analyzer).setMergePolicy(newLogMergePolicy()));
+ RandomIndexWriter w = new RandomIndexWriter(random(), dir, newIndexWriterConfig(TEST_VERSION_CURRENT, analyzer).setMergePolicy(newLogMergePolicy()));
List<List<String>> docs = new ArrayList<List<String>>();
Document d = new Document();
Field f = newField("f", "", TextField.TYPE_UNSTORED);
d.add(f);
- Random r = random;
+ Random r = random();
int NUM_DOCS = atLeast(10);
for (int i = 0; i < NUM_DOCS; i++) {
// must be > 4096 so it spans multiple chunks
- int termCount = _TestUtil.nextInt(random, 4097, 8200);
+ int termCount = _TestUtil.nextInt(random(), 4097, 8200);
List<String> doc = new ArrayList<String>();
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPositionIncrement.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPositionIncrement.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPositionIncrement.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPositionIncrement.java Sun Apr 15 14:41:44 2012
@@ -89,7 +89,7 @@ public class TestPositionIncrement exten
}
};
Directory store = newDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(random, store, analyzer);
+ RandomIndexWriter writer = new RandomIndexWriter(random(), store, analyzer);
Document d = new Document();
d.add(newField("field", "bogus", TextField.TYPE_STORED));
writer.addDocument(d);
@@ -204,7 +204,7 @@ public class TestPositionIncrement exten
public void testPayloadsPos0() throws Exception {
Directory dir = newDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(random, dir, new MockPayloadAnalyzer());
+ RandomIndexWriter writer = new RandomIndexWriter(random(), dir, new MockPayloadAnalyzer());
Document doc = new Document();
doc.add(new TextField("content", new StringReader(
"a a b c d e a f g h i j a b k k")));
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPositiveScoresOnlyCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPositiveScoresOnlyCollector.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPositiveScoresOnlyCollector.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPositiveScoresOnlyCollector.java Sun Apr 15 14:41:44 2012
@@ -70,7 +70,7 @@ public class TestPositiveScoresOnlyColle
}
Directory directory = newDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(random, directory);
+ RandomIndexWriter writer = new RandomIndexWriter(random(), directory);
writer.commit();
IndexReader ir = writer.getReader();
writer.close();
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPrefixFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPrefixFilter.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPrefixFilter.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPrefixFilter.java Sun Apr 15 14:41:44 2012
@@ -37,7 +37,7 @@ public class TestPrefixFilter extends Lu
"/Computers/Mac/One",
"/Computers/Mac/Two",
"/Computers/Windows"};
- RandomIndexWriter writer = new RandomIndexWriter(random, directory);
+ RandomIndexWriter writer = new RandomIndexWriter(random(), directory);
for (int i = 0; i < categories.length; i++) {
Document doc = new Document();
doc.add(newField("category", categories[i], StringField.TYPE_STORED));
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPrefixInBooleanQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPrefixInBooleanQuery.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPrefixInBooleanQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPrefixInBooleanQuery.java Sun Apr 15 14:41:44 2012
@@ -48,7 +48,7 @@ public class TestPrefixInBooleanQuery ex
@BeforeClass
public static void beforeClass() throws Exception {
directory = newDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(random, directory);
+ RandomIndexWriter writer = new RandomIndexWriter(random(), directory);
Document doc = new Document();
Field field = newField(FIELD, "meaninglessnames", StringField.TYPE_UNSTORED);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPrefixQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPrefixQuery.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPrefixQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPrefixQuery.java Sun Apr 15 14:41:44 2012
@@ -38,7 +38,7 @@ public class TestPrefixQuery extends Luc
String[] categories = new String[] {"/Computers",
"/Computers/Mac",
"/Computers/Windows"};
- RandomIndexWriter writer = new RandomIndexWriter(random, directory);
+ RandomIndexWriter writer = new RandomIndexWriter(random(), directory);
for (int i = 0; i < categories.length; i++) {
Document doc = new Document();
doc.add(newField("category", categories[i], StringField.TYPE_STORED));
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPrefixRandom.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPrefixRandom.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPrefixRandom.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPrefixRandom.java Sun Apr 15 14:41:44 2012
@@ -51,9 +51,9 @@ public class TestPrefixRandom extends Lu
public void setUp() throws Exception {
super.setUp();
dir = newDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(random, dir,
- newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random, MockTokenizer.KEYWORD, false))
- .setMaxBufferedDocs(_TestUtil.nextInt(random, 50, 1000)));
+ RandomIndexWriter writer = new RandomIndexWriter(random(), dir,
+ newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random(), MockTokenizer.KEYWORD, false))
+ .setMaxBufferedDocs(_TestUtil.nextInt(random(), 50, 1000)));
Document doc = new Document();
Field field = newField("field", "", StringField.TYPE_UNSTORED);
@@ -64,7 +64,7 @@ public class TestPrefixRandom extends Lu
final String codec = Codec.getDefault().getName();
int num = codec.equals("Lucene3x") ? 200 * RANDOM_MULTIPLIER : atLeast(1000);
for (int i = 0; i < num; i++) {
- field.setStringValue(_TestUtil.randomUnicodeString(random, 10));
+ field.setStringValue(_TestUtil.randomUnicodeString(random(), 10));
writer.addDocument(doc);
}
reader = writer.getReader();
@@ -118,7 +118,7 @@ public class TestPrefixRandom extends Lu
public void testPrefixes() throws Exception {
int num = atLeast(100);
for (int i = 0; i < num; i++)
- assertSame(_TestUtil.randomUnicodeString(random, 5));
+ assertSame(_TestUtil.randomUnicodeString(random(), 5));
}
/** check that the # of hits is the same as from a very
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestQueryWrapperFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestQueryWrapperFilter.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestQueryWrapperFilter.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestQueryWrapperFilter.java Sun Apr 15 14:41:44 2012
@@ -35,7 +35,7 @@ public class TestQueryWrapperFilter exte
public void testBasic() throws Exception {
Directory dir = newDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(random, dir);
+ RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
Document doc = new Document();
doc.add(newField("field", "value", TextField.TYPE_UNSTORED));
writer.addDocument(doc);
@@ -87,14 +87,14 @@ public class TestQueryWrapperFilter exte
public void testRandom() throws Exception {
final Directory d = newDirectory();
- final RandomIndexWriter w = new RandomIndexWriter(random, d);
+ final RandomIndexWriter w = new RandomIndexWriter(random(), d);
w.w.getConfig().setMaxBufferedDocs(17);
final int numDocs = atLeast(100);
final Set<String> aDocs = new HashSet<String>();
for(int i=0;i<numDocs;i++) {
final Document doc = new Document();
final String v;
- if (random.nextInt(5) == 4) {
+ if (random().nextInt(5) == 4) {
v = "a";
aDocs.add(""+i);
} else {
@@ -108,7 +108,7 @@ public class TestQueryWrapperFilter exte
final int numDelDocs = atLeast(10);
for(int i=0;i<numDelDocs;i++) {
- final String delID = ""+random.nextInt(numDocs);
+ final String delID = ""+random().nextInt(numDocs);
w.deleteDocuments(new Term("id", delID));
aDocs.remove(delID);
}
@@ -128,7 +128,7 @@ public class TestQueryWrapperFilter exte
public void testThousandDocuments() throws Exception {
Directory dir = newDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(random, dir);
+ RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
for (int i = 0; i < 1000; i++) {
Document doc = new Document();
doc.add(newField("field", English.intToEnglish(i), StringField.TYPE_UNSTORED));
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestRegexpQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestRegexpQuery.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestRegexpQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestRegexpQuery.java Sun Apr 15 14:41:44 2012
@@ -46,7 +46,7 @@ public class TestRegexpQuery extends Luc
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();
doc.add(newField(FN,
"the quick brown fox jumps over the lazy ??? dog 493432 49344",
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom.java Sun Apr 15 14:41:44 2012
@@ -48,9 +48,9 @@ public class TestRegexpRandom extends Lu
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();
FieldType customType = new FieldType(TextField.TYPE_STORED);
@@ -70,7 +70,7 @@ public class TestRegexpRandom extends Lu
}
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/TestRegexpRandom2.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom2.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom2.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom2.java Sun Apr 15 14:41:44 2012
@@ -61,17 +61,17 @@ public class TestRegexpRandom2 extends L
public void setUp() throws Exception {
super.setUp();
dir = newDirectory();
- fieldName = random.nextBoolean() ? "field" : ""; // sometimes use an empty string as field name
- RandomIndexWriter writer = new RandomIndexWriter(random, dir,
- newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random, MockTokenizer.KEYWORD, false))
- .setMaxBufferedDocs(_TestUtil.nextInt(random, 50, 1000)));
+ fieldName = random().nextBoolean() ? "field" : ""; // sometimes use an empty string as field name
+ RandomIndexWriter writer = new RandomIndexWriter(random(), dir,
+ newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random(), MockTokenizer.KEYWORD, false))
+ .setMaxBufferedDocs(_TestUtil.nextInt(random(), 50, 1000)));
Document doc = new Document();
Field field = newField(fieldName, "", StringField.TYPE_UNSTORED);
doc.add(field);
List<String> terms = new ArrayList<String>();
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(s);
writer.addDocument(doc);
@@ -143,7 +143,7 @@ public class TestRegexpRandom2 extends L
// but for preflex codec, the test can be very slow, so use less iterations.
int num = Codec.getDefault().getName().equals("Lucene3x") ? 100 * RANDOM_MULTIPLIER : atLeast(1000);
for (int i = 0; i < num; i++) {
- String reg = AutomatonTestUtil.randomRegexp(random);
+ String reg = AutomatonTestUtil.randomRegexp(random());
if (VERBOSE) {
System.out.println("TEST: regexp=" + reg);
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestScoreCachingWrappingScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestScoreCachingWrappingScorer.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestScoreCachingWrappingScorer.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestScoreCachingWrappingScorer.java Sun Apr 15 14:41:44 2012
@@ -100,7 +100,7 @@ public class TestScoreCachingWrappingSco
public void testGetScores() throws Exception {
Directory directory = newDirectory();
- RandomIndexWriter writer = new RandomIndexWriter(random, directory);
+ RandomIndexWriter writer = new RandomIndexWriter(random(), directory);
writer.commit();
IndexReader ir = writer.getReader();
writer.close();