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 [17/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/modules/analysis/common/src/test/org/apache/lucene/analysis/ru/TestRussianAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/ru/TestRussianAnalyzer.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/ru/TestRussianAnalyzer.java (original)
+++ lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/ru/TestRussianAnalyzer.java Sun Apr 15 14:41:44 2012
@@ -67,6 +67,6 @@ public class TestRussianAnalyzer extends
/** blast some random strings through the analyzer */
public void testRandomStrings() throws Exception {
- checkRandomData(random, new RussianAnalyzer(TEST_VERSION_CURRENT), 10000*RANDOM_MULTIPLIER);
+ checkRandomData(random(), new RussianAnalyzer(TEST_VERSION_CURRENT), 10000*RANDOM_MULTIPLIER);
}
}
Modified: lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/ru/TestRussianLightStemFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/ru/TestRussianLightStemFilter.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/ru/TestRussianLightStemFilter.java (original)
+++ lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/ru/TestRussianLightStemFilter.java Sun Apr 15 14:41:44 2012
@@ -48,7 +48,7 @@ public class TestRussianLightStemFilter
/** blast some random strings through the analyzer */
public void testRandomStrings() throws Exception {
- checkRandomData(random, analyzer, 10000*RANDOM_MULTIPLIER);
+ checkRandomData(random(), analyzer, 10000*RANDOM_MULTIPLIER);
}
public void testEmptyTerm() throws IOException {
Modified: lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapperTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapperTest.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapperTest.java (original)
+++ lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapperTest.java Sun Apr 15 14:41:44 2012
@@ -55,7 +55,7 @@ public class ShingleAnalyzerWrapperTest
@Override
public void setUp() throws Exception {
super.setUp();
- analyzer = new ShingleAnalyzerWrapper(new MockAnalyzer(random, MockTokenizer.WHITESPACE, false), 2);
+ analyzer = new ShingleAnalyzerWrapper(new MockAnalyzer(random(), MockTokenizer.WHITESPACE, false), 2);
directory = newDirectory();
IndexWriter writer = new IndexWriter(directory, new IndexWriterConfig(TEST_VERSION_CURRENT, analyzer));
@@ -142,7 +142,7 @@ public class ShingleAnalyzerWrapperTest
}
public void testReusableTokenStream() throws Exception {
- Analyzer a = new ShingleAnalyzerWrapper(new MockAnalyzer(random, MockTokenizer.WHITESPACE, false), 2);
+ Analyzer a = new ShingleAnalyzerWrapper(new MockAnalyzer(random(), MockTokenizer.WHITESPACE, false), 2);
assertAnalyzesToReuse(a, "please divide into shingles",
new String[] { "please", "please divide", "divide", "divide into", "into", "into shingles", "shingles" },
new int[] { 0, 0, 7, 7, 14, 14, 19 },
@@ -157,7 +157,7 @@ public class ShingleAnalyzerWrapperTest
public void testNonDefaultMinShingleSize() throws Exception {
ShingleAnalyzerWrapper analyzer
- = new ShingleAnalyzerWrapper(new MockAnalyzer(random, MockTokenizer.WHITESPACE, false), 3, 4);
+ = new ShingleAnalyzerWrapper(new MockAnalyzer(random(), MockTokenizer.WHITESPACE, false), 3, 4);
assertAnalyzesToReuse(analyzer, "please divide this sentence into shingles",
new String[] { "please", "please divide this", "please divide this sentence",
"divide", "divide this sentence", "divide this sentence into",
@@ -170,7 +170,7 @@ public class ShingleAnalyzerWrapperTest
new int[] { 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 1, 1 });
analyzer = new ShingleAnalyzerWrapper(
- new MockAnalyzer(random, MockTokenizer.WHITESPACE, false), 3, 4, ShingleFilter.TOKEN_SEPARATOR, false, false);
+ new MockAnalyzer(random(), MockTokenizer.WHITESPACE, false), 3, 4, ShingleFilter.TOKEN_SEPARATOR, false, false);
assertAnalyzesToReuse(analyzer, "please divide this sentence into shingles",
new String[] { "please divide this", "please divide this sentence",
"divide this sentence", "divide this sentence into",
@@ -183,7 +183,7 @@ public class ShingleAnalyzerWrapperTest
public void testNonDefaultMinAndSameMaxShingleSize() throws Exception {
ShingleAnalyzerWrapper analyzer
- = new ShingleAnalyzerWrapper(new MockAnalyzer(random, MockTokenizer.WHITESPACE, false), 3, 3);
+ = new ShingleAnalyzerWrapper(new MockAnalyzer(random(), MockTokenizer.WHITESPACE, false), 3, 3);
assertAnalyzesToReuse(analyzer, "please divide this sentence into shingles",
new String[] { "please", "please divide this",
"divide", "divide this sentence",
@@ -196,7 +196,7 @@ public class ShingleAnalyzerWrapperTest
new int[] { 1, 0, 1, 0, 1, 0, 1, 0, 1, 1 });
analyzer = new ShingleAnalyzerWrapper(
- new MockAnalyzer(random, MockTokenizer.WHITESPACE, false), 3, 3, ShingleFilter.TOKEN_SEPARATOR, false, false);
+ new MockAnalyzer(random(), MockTokenizer.WHITESPACE, false), 3, 3, ShingleFilter.TOKEN_SEPARATOR, false, false);
assertAnalyzesToReuse(analyzer, "please divide this sentence into shingles",
new String[] { "please divide this",
"divide this sentence",
@@ -209,7 +209,7 @@ public class ShingleAnalyzerWrapperTest
public void testNoTokenSeparator() throws Exception {
ShingleAnalyzerWrapper analyzer = new ShingleAnalyzerWrapper(
- new MockAnalyzer(random, MockTokenizer.WHITESPACE, false),
+ new MockAnalyzer(random(), MockTokenizer.WHITESPACE, false),
ShingleFilter.DEFAULT_MIN_SHINGLE_SIZE,
ShingleFilter.DEFAULT_MAX_SHINGLE_SIZE,
"", true, false);
@@ -223,7 +223,7 @@ public class ShingleAnalyzerWrapperTest
new int[] { 1, 0, 1, 0, 1, 0, 1 });
analyzer = new ShingleAnalyzerWrapper(
- new MockAnalyzer(random, MockTokenizer.WHITESPACE, false),
+ new MockAnalyzer(random(), MockTokenizer.WHITESPACE, false),
ShingleFilter.DEFAULT_MIN_SHINGLE_SIZE,
ShingleFilter.DEFAULT_MAX_SHINGLE_SIZE,
"", false, false);
@@ -238,7 +238,7 @@ public class ShingleAnalyzerWrapperTest
public void testNullTokenSeparator() throws Exception {
ShingleAnalyzerWrapper analyzer = new ShingleAnalyzerWrapper(
- new MockAnalyzer(random, MockTokenizer.WHITESPACE, false),
+ new MockAnalyzer(random(), MockTokenizer.WHITESPACE, false),
ShingleFilter.DEFAULT_MIN_SHINGLE_SIZE,
ShingleFilter.DEFAULT_MAX_SHINGLE_SIZE,
null, true, false);
@@ -252,7 +252,7 @@ public class ShingleAnalyzerWrapperTest
new int[] { 1, 0, 1, 0, 1, 0, 1 });
analyzer = new ShingleAnalyzerWrapper(
- new MockAnalyzer(random, MockTokenizer.WHITESPACE, false),
+ new MockAnalyzer(random(), MockTokenizer.WHITESPACE, false),
ShingleFilter.DEFAULT_MIN_SHINGLE_SIZE,
ShingleFilter.DEFAULT_MAX_SHINGLE_SIZE,
"", false, false);
@@ -266,7 +266,7 @@ public class ShingleAnalyzerWrapperTest
}
public void testAltTokenSeparator() throws Exception {
ShingleAnalyzerWrapper analyzer = new ShingleAnalyzerWrapper(
- new MockAnalyzer(random, MockTokenizer.WHITESPACE, false),
+ new MockAnalyzer(random(), MockTokenizer.WHITESPACE, false),
ShingleFilter.DEFAULT_MIN_SHINGLE_SIZE,
ShingleFilter.DEFAULT_MAX_SHINGLE_SIZE,
"<SEP>", true, false);
@@ -280,7 +280,7 @@ public class ShingleAnalyzerWrapperTest
new int[] { 1, 0, 1, 0, 1, 0, 1 });
analyzer = new ShingleAnalyzerWrapper(
- new MockAnalyzer(random, MockTokenizer.WHITESPACE, false),
+ new MockAnalyzer(random(), MockTokenizer.WHITESPACE, false),
ShingleFilter.DEFAULT_MIN_SHINGLE_SIZE,
ShingleFilter.DEFAULT_MAX_SHINGLE_SIZE,
"<SEP>", false, false);
@@ -295,7 +295,7 @@ public class ShingleAnalyzerWrapperTest
public void testOutputUnigramsIfNoShinglesSingleToken() throws Exception {
ShingleAnalyzerWrapper analyzer = new ShingleAnalyzerWrapper(
- new MockAnalyzer(random, MockTokenizer.WHITESPACE, false),
+ new MockAnalyzer(random(), MockTokenizer.WHITESPACE, false),
ShingleFilter.DEFAULT_MIN_SHINGLE_SIZE,
ShingleFilter.DEFAULT_MAX_SHINGLE_SIZE,
"", false, true);
Modified: lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/shingle/ShingleFilterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/shingle/ShingleFilterTest.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/shingle/ShingleFilterTest.java (original)
+++ lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/shingle/ShingleFilterTest.java Sun Apr 15 14:41:44 2012
@@ -20,6 +20,7 @@ package org.apache.lucene.analysis.shing
import java.io.IOException;
import java.io.Reader;
import java.io.StringReader;
+import java.util.Random;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.BaseTokenStreamTestCase;
@@ -1143,11 +1144,12 @@ public class ShingleFilterTest extends B
return new TokenStreamComponents(tokenizer, new ShingleFilter(tokenizer));
}
};
- checkRandomData(random, a, 10000*RANDOM_MULTIPLIER);
+ checkRandomData(random(), a, 10000*RANDOM_MULTIPLIER);
}
/** blast some random large strings through the analyzer */
public void testRandomHugeStrings() throws Exception {
+ Random random = random();
Analyzer a = new Analyzer() {
@Override
protected TokenStreamComponents createComponents(String fieldName, Reader reader) {
Modified: lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java (original)
+++ lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java Sun Apr 15 14:41:44 2012
@@ -86,7 +86,7 @@ public class TestTeeSinkTokenFilter exte
// with BaseTokenStreamTestCase now...
public void testEndOffsetPositionWithTeeSinkTokenFilter() throws Exception {
Directory dir = newDirectory();
- Analyzer analyzer = new MockAnalyzer(random, MockTokenizer.WHITESPACE, false);
+ Analyzer analyzer = new MockAnalyzer(random(), MockTokenizer.WHITESPACE, false);
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig(TEST_VERSION_CURRENT, analyzer));
Document doc = new Document();
TokenStream tokenStream = analyzer.tokenStream("field", new StringReader("abcd "));
Modified: lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/sv/TestSwedishAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/sv/TestSwedishAnalyzer.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/sv/TestSwedishAnalyzer.java (original)
+++ lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/sv/TestSwedishAnalyzer.java Sun Apr 15 14:41:44 2012
@@ -51,6 +51,6 @@ public class TestSwedishAnalyzer extends
/** blast some random strings through the analyzer */
public void testRandomStrings() throws Exception {
- checkRandomData(random, new SwedishAnalyzer(TEST_VERSION_CURRENT), 10000*RANDOM_MULTIPLIER);
+ checkRandomData(random(), new SwedishAnalyzer(TEST_VERSION_CURRENT), 10000*RANDOM_MULTIPLIER);
}
}
Modified: lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/sv/TestSwedishLightStemFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/sv/TestSwedishLightStemFilter.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/sv/TestSwedishLightStemFilter.java (original)
+++ lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/sv/TestSwedishLightStemFilter.java Sun Apr 15 14:41:44 2012
@@ -48,7 +48,7 @@ public class TestSwedishLightStemFilter
/** blast some random strings through the analyzer */
public void testRandomStrings() throws Exception {
- checkRandomData(random, analyzer, 10000*RANDOM_MULTIPLIER);
+ checkRandomData(random(), analyzer, 10000*RANDOM_MULTIPLIER);
}
public void testEmptyTerm() throws IOException {
Modified: lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSolrSynonymParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSolrSynonymParser.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSolrSynonymParser.java (original)
+++ lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSolrSynonymParser.java Sun Apr 15 14:41:44 2012
@@ -43,7 +43,7 @@ public class TestSolrSynonymParser exten
"foo => baz\n" +
"this test, that testing";
- SolrSynonymParser parser = new SolrSynonymParser(true, true, new MockAnalyzer(random));
+ SolrSynonymParser parser = new SolrSynonymParser(true, true, new MockAnalyzer(random()));
parser.add(new StringReader(testFile));
final SynonymMap map = parser.build();
@@ -76,7 +76,7 @@ public class TestSolrSynonymParser exten
@Test(expected=ParseException.class)
public void testInvalidDoubleMap() throws Exception {
String testFile = "a => b => c";
- SolrSynonymParser parser = new SolrSynonymParser(true, true, new MockAnalyzer(random));
+ SolrSynonymParser parser = new SolrSynonymParser(true, true, new MockAnalyzer(random()));
parser.add(new StringReader(testFile));
}
@@ -84,7 +84,7 @@ public class TestSolrSynonymParser exten
@Test(expected=ParseException.class)
public void testInvalidAnalyzesToNothingOutput() throws Exception {
String testFile = "a => 1";
- SolrSynonymParser parser = new SolrSynonymParser(true, true, new MockAnalyzer(random, MockTokenizer.SIMPLE, false));
+ SolrSynonymParser parser = new SolrSynonymParser(true, true, new MockAnalyzer(random(), MockTokenizer.SIMPLE, false));
parser.add(new StringReader(testFile));
}
@@ -92,7 +92,7 @@ public class TestSolrSynonymParser exten
@Test(expected=ParseException.class)
public void testInvalidAnalyzesToNothingInput() throws Exception {
String testFile = "1 => a";
- SolrSynonymParser parser = new SolrSynonymParser(true, true, new MockAnalyzer(random, MockTokenizer.SIMPLE, false));
+ SolrSynonymParser parser = new SolrSynonymParser(true, true, new MockAnalyzer(random(), MockTokenizer.SIMPLE, false));
parser.add(new StringReader(testFile));
}
@@ -117,7 +117,7 @@ public class TestSolrSynonymParser exten
String testFile =
"a\\=>a => b\\=>b\n" +
"a\\,a => b\\,b";
- SolrSynonymParser parser = new SolrSynonymParser(true, true, new MockAnalyzer(random, MockTokenizer.KEYWORD, false));
+ SolrSynonymParser parser = new SolrSynonymParser(true, true, new MockAnalyzer(random(), MockTokenizer.KEYWORD, false));
parser.add(new StringReader(testFile));
final SynonymMap map = parser.build();
Analyzer analyzer = new Analyzer() {
Modified: lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymMapFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymMapFilter.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymMapFilter.java (original)
+++ lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymMapFilter.java Sun Apr 15 14:41:44 2012
@@ -26,6 +26,7 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
+import java.util.Random;
import java.util.Set;
import org.apache.lucene.analysis.Analyzer;
@@ -202,7 +203,7 @@ public class TestSynonymMapFilter extend
assert alphabetSize <= 26;
char[] s = new char[2*length];
for(int charIDX=0;charIDX<length;charIDX++) {
- s[2*charIDX] = (char) (start + random.nextInt(alphabetSize));
+ s[2*charIDX] = (char) (start + random().nextInt(alphabetSize));
s[2*charIDX+1] = ' ';
}
return new String(s);
@@ -326,7 +327,7 @@ public class TestSynonymMapFilter extend
public void testRandom() throws Exception {
- final int alphabetSize = _TestUtil.nextInt(random, 2, 7);
+ final int alphabetSize = _TestUtil.nextInt(random(), 2, 7);
final int docLen = atLeast(3000);
//final int docLen = 50;
@@ -342,13 +343,13 @@ public class TestSynonymMapFilter extend
final Map<String,OneSyn> synMap = new HashMap<String,OneSyn>();
final List<OneSyn> syns = new ArrayList<OneSyn>();
- final boolean dedup = random.nextBoolean();
+ final boolean dedup = random().nextBoolean();
if (VERBOSE) {
System.out.println(" dedup=" + dedup);
}
b = new SynonymMap.Builder(dedup);
for(int synIDX=0;synIDX<numSyn;synIDX++) {
- final String synIn = getRandomString('a', alphabetSize, _TestUtil.nextInt(random, 1, 5)).trim();
+ final String synIn = getRandomString('a', alphabetSize, _TestUtil.nextInt(random(), 1, 5)).trim();
OneSyn s = synMap.get(synIn);
if (s == null) {
s = new OneSyn();
@@ -356,9 +357,9 @@ public class TestSynonymMapFilter extend
syns.add(s);
s.out = new ArrayList<String>();
synMap.put(synIn, s);
- s.keepOrig = random.nextBoolean();
+ s.keepOrig = random().nextBoolean();
}
- final String synOut = getRandomString('0', 10, _TestUtil.nextInt(random, 1, 5)).trim();
+ final String synOut = getRandomString('0', 10, _TestUtil.nextInt(random(), 1, 5)).trim();
s.out.add(synOut);
add(synIn, synOut, s.keepOrig);
if (VERBOSE) {
@@ -415,7 +416,7 @@ public class TestSynonymMapFilter extend
private String randomNonEmptyString() {
while(true) {
- final String s = _TestUtil.randomUnicodeString(random).trim();
+ final String s = _TestUtil.randomUnicodeString(random()).trim();
if (s.length() != 0 && s.indexOf('\u0000') == -1) {
return s;
}
@@ -428,13 +429,13 @@ public class TestSynonymMapFilter extend
public void testRandom2() throws Exception {
final int numIters = atLeast(10);
for (int i = 0; i < numIters; i++) {
- b = new SynonymMap.Builder(random.nextBoolean());
+ b = new SynonymMap.Builder(random().nextBoolean());
final int numEntries = atLeast(10);
for (int j = 0; j < numEntries; j++) {
- add(randomNonEmptyString(), randomNonEmptyString(), random.nextBoolean());
+ add(randomNonEmptyString(), randomNonEmptyString(), random().nextBoolean());
}
final SynonymMap map = b.build();
- final boolean ignoreCase = random.nextBoolean();
+ final boolean ignoreCase = random().nextBoolean();
final Analyzer analyzer = new Analyzer() {
@Override
@@ -444,7 +445,7 @@ public class TestSynonymMapFilter extend
}
};
- checkRandomData(random, analyzer, 1000*RANDOM_MULTIPLIER);
+ checkRandomData(random(), analyzer, 1000*RANDOM_MULTIPLIER);
}
}
@@ -455,6 +456,7 @@ public class TestSynonymMapFilter extend
// Adds MockGraphTokenFilter before SynFilter:
public void testRandom2GraphBefore() throws Exception {
final int numIters = atLeast(10);
+ Random random = random();
for (int i = 0; i < numIters; i++) {
b = new SynonymMap.Builder(random.nextBoolean());
final int numEntries = atLeast(10);
@@ -468,7 +470,7 @@ public class TestSynonymMapFilter extend
@Override
protected TokenStreamComponents createComponents(String fieldName, Reader reader) {
Tokenizer tokenizer = new MockTokenizer(reader, MockTokenizer.SIMPLE, true);
- TokenStream graph = new MockGraphTokenFilter(random, tokenizer);
+ TokenStream graph = new MockGraphTokenFilter(random(), tokenizer);
return new TokenStreamComponents(tokenizer, new SynonymFilter(graph, map, ignoreCase));
}
};
@@ -481,6 +483,7 @@ public class TestSynonymMapFilter extend
// Adds MockGraphTokenFilter after SynFilter:
public void testRandom2GraphAfter() throws Exception {
final int numIters = atLeast(10);
+ Random random = random();
for (int i = 0; i < numIters; i++) {
b = new SynonymMap.Builder(random.nextBoolean());
final int numEntries = atLeast(10);
@@ -495,7 +498,7 @@ public class TestSynonymMapFilter extend
protected TokenStreamComponents createComponents(String fieldName, Reader reader) {
Tokenizer tokenizer = new MockTokenizer(reader, MockTokenizer.SIMPLE, true);
TokenStream syns = new SynonymFilter(tokenizer, map, ignoreCase);
- TokenStream graph = new MockGraphTokenFilter(random, syns);
+ TokenStream graph = new MockGraphTokenFilter(random(), syns);
return new TokenStreamComponents(tokenizer, graph);
}
};
@@ -505,6 +508,7 @@ public class TestSynonymMapFilter extend
}
public void testEmptyTerm() throws IOException {
+ Random random = random();
final int numIters = atLeast(10);
for (int i = 0; i < numIters; i++) {
b = new SynonymMap.Builder(random.nextBoolean());
@@ -530,6 +534,7 @@ public class TestSynonymMapFilter extend
/** simple random test like testRandom2, but for large docs
*/
public void testRandomHuge() throws Exception {
+ Random random = random();
final int numIters = atLeast(10);
for (int i = 0; i < numIters; i++) {
b = new SynonymMap.Builder(random.nextBoolean());
@@ -558,7 +563,7 @@ public class TestSynonymMapFilter extend
"aaa => aaaa1 aaaa2 aaaa3\n" +
"bbb => bbbb1 bbbb2\n";
- SolrSynonymParser parser = new SolrSynonymParser(true, true, new MockAnalyzer(random));
+ SolrSynonymParser parser = new SolrSynonymParser(true, true, new MockAnalyzer(random()));
parser.add(new StringReader(testFile));
final SynonymMap map = parser.build();
Modified: lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestWordnetSynonymParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestWordnetSynonymParser.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestWordnetSynonymParser.java (original)
+++ lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestWordnetSynonymParser.java Sun Apr 15 14:41:44 2012
@@ -41,7 +41,7 @@ public class TestWordnetSynonymParser ex
"s(100000004,2,'king''s meany',n,1,1).\n";
public void testSynonyms() throws Exception {
- WordnetSynonymParser parser = new WordnetSynonymParser(true, true, new MockAnalyzer(random));
+ WordnetSynonymParser parser = new WordnetSynonymParser(true, true, new MockAnalyzer(random()));
parser.add(new StringReader(synonymsFile));
final SynonymMap map = parser.build();
Modified: lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/th/TestThaiAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/th/TestThaiAnalyzer.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/th/TestThaiAnalyzer.java (original)
+++ lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/th/TestThaiAnalyzer.java Sun Apr 15 14:41:44 2012
@@ -20,6 +20,7 @@ package org.apache.lucene.analysis.th;
import java.io.IOException;
import java.io.Reader;
import java.io.StringReader;
+import java.util.Random;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.BaseTokenStreamTestCase;
@@ -169,11 +170,12 @@ public class TestThaiAnalyzer extends Ba
/** blast some random strings through the analyzer */
public void testRandomStrings() throws Exception {
- checkRandomData(random, new ThaiAnalyzer(TEST_VERSION_CURRENT), 10000*RANDOM_MULTIPLIER);
+ checkRandomData(random(), new ThaiAnalyzer(TEST_VERSION_CURRENT), 10000*RANDOM_MULTIPLIER);
}
/** blast some random large strings through the analyzer */
public void testRandomHugeStrings() throws Exception {
+ Random random = random();
checkRandomData(random, new ThaiAnalyzer(TEST_VERSION_CURRENT), 200*RANDOM_MULTIPLIER, 8192);
}
Modified: lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/tr/TestTurkishAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/tr/TestTurkishAnalyzer.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/tr/TestTurkishAnalyzer.java (original)
+++ lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/tr/TestTurkishAnalyzer.java Sun Apr 15 14:41:44 2012
@@ -51,6 +51,6 @@ public class TestTurkishAnalyzer extends
/** blast some random strings through the analyzer */
public void testRandomStrings() throws Exception {
- checkRandomData(random, new TurkishAnalyzer(TEST_VERSION_CURRENT), 10000*RANDOM_MULTIPLIER);
+ checkRandomData(random(), new TurkishAnalyzer(TEST_VERSION_CURRENT), 10000*RANDOM_MULTIPLIER);
}
}
Modified: lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharArrayIterator.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharArrayIterator.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharArrayIterator.java (original)
+++ lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharArrayIterator.java Sun Apr 15 14:41:44 2012
@@ -35,7 +35,7 @@ public class TestCharArrayIterator exten
BreakIterator bi = BreakIterator.getWordInstance();
CharArrayIterator ci = CharArrayIterator.newWordInstance();
for (int i = 0; i < 10000; i++) {
- char text[] = _TestUtil.randomUnicodeString(random).toCharArray();
+ char text[] = _TestUtil.randomUnicodeString(random()).toCharArray();
ci.setText(text, 0, text.length);
consume(bi, ci);
}
@@ -63,7 +63,7 @@ public class TestCharArrayIterator exten
BreakIterator bi = BreakIterator.getSentenceInstance();
CharArrayIterator ci = CharArrayIterator.newSentenceInstance();
for (int i = 0; i < 10000; i++) {
- char text[] = _TestUtil.randomUnicodeString(random).toCharArray();
+ char text[] = _TestUtil.randomUnicodeString(random()).toCharArray();
ci.setText(text, 0, text.length);
consume(bi, ci);
}
Modified: lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharArrayMap.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharArrayMap.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharArrayMap.java (original)
+++ lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharArrayMap.java Sun Apr 15 14:41:44 2012
@@ -30,15 +30,15 @@ public class TestCharArrayMap extends Lu
char[] key;
for (int i=0; i<iter; i++) {
- int len = random.nextInt(5);
+ int len = random().nextInt(5);
key = new char[len];
for (int j=0; j<key.length; j++) {
- key[j] = (char)random.nextInt(127);
+ key[j] = (char)random().nextInt(127);
}
String keyStr = new String(key);
String hmapKey = ignoreCase ? keyStr.toLowerCase(Locale.ENGLISH) : keyStr;
- int val = random.nextInt();
+ int val = random().nextInt();
Object o1 = map.put(key, val);
Object o2 = hmap.put(hmapKey,val);
Modified: lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharTokenizers.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharTokenizers.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharTokenizers.java (original)
+++ lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharTokenizers.java Sun Apr 15 14:41:44 2012
@@ -43,7 +43,7 @@ public class TestCharTokenizers extends
public void testReadSupplementaryChars() throws IOException {
StringBuilder builder = new StringBuilder();
// create random input
- int num = 1024 + random.nextInt(1024);
+ int num = 1024 + random().nextInt(1024);
num *= RANDOM_MULTIPLIER;
for (int i = 1; i < num; i++) {
builder.append("\ud801\udc1cabc");
@@ -121,7 +121,7 @@ public class TestCharTokenizers extends
};
int num = 10000 * RANDOM_MULTIPLIER;
for (int i = 0; i < num; i++) {
- String s = _TestUtil.randomUnicodeString(random);
+ String s = _TestUtil.randomUnicodeString(random());
TokenStream ts = analyzer.tokenStream("foo", new StringReader(s));
ts.reset();
OffsetAttribute offsetAtt = ts.addAttribute(OffsetAttribute.class);
@@ -136,7 +136,7 @@ public class TestCharTokenizers extends
ts.close();
}
// just for fun
- checkRandomData(random, analyzer, num);
+ checkRandomData(random(), analyzer, num);
}
// LUCENE-3642: normalize BMP->SMP and check that offsets are correct
@@ -159,7 +159,7 @@ public class TestCharTokenizers extends
};
int num = 10000 * RANDOM_MULTIPLIER;
for (int i = 0; i < num; i++) {
- String s = _TestUtil.randomUnicodeString(random);
+ String s = _TestUtil.randomUnicodeString(random());
TokenStream ts = analyzer.tokenStream("foo", new StringReader(s));
ts.reset();
OffsetAttribute offsetAtt = ts.addAttribute(OffsetAttribute.class);
@@ -174,6 +174,6 @@ public class TestCharTokenizers extends
ts.close();
}
// just for fun
- checkRandomData(random, analyzer, num);
+ checkRandomData(random(), analyzer, num);
}
}
Modified: lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerTest.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerTest.java (original)
+++ lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerTest.java Sun Apr 15 14:41:44 2012
@@ -21,6 +21,7 @@ package org.apache.lucene.analysis.wikip
import java.io.Reader;
import java.io.StringReader;
import java.io.IOException;
+import java.util.Random;
import java.util.Set;
import java.util.HashSet;
@@ -183,11 +184,12 @@ public class WikipediaTokenizerTest exte
return new TokenStreamComponents(tokenizer, tokenizer);
}
};
- checkRandomData(random, a, 10000*RANDOM_MULTIPLIER);
+ checkRandomData(random(), a, 10000*RANDOM_MULTIPLIER);
}
/** blast some random large strings through the analyzer */
public void testRandomHugeStrings() throws Exception {
+ Random random = random();
Analyzer a = new Analyzer() {
@Override
Modified: lucene/dev/trunk/modules/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUFoldingFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUFoldingFilter.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUFoldingFilter.java (original)
+++ lucene/dev/trunk/modules/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUFoldingFilter.java Sun Apr 15 14:41:44 2012
@@ -76,7 +76,7 @@ public class TestICUFoldingFilter extend
/** blast some random strings through the analyzer */
public void testRandomStrings() throws Exception {
- checkRandomData(random, a, 10000*RANDOM_MULTIPLIER);
+ checkRandomData(random(), a, 10000*RANDOM_MULTIPLIER);
}
public void testEmptyTerm() throws IOException {
Modified: lucene/dev/trunk/modules/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUNormalizer2Filter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUNormalizer2Filter.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUNormalizer2Filter.java (original)
+++ lucene/dev/trunk/modules/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUNormalizer2Filter.java Sun Apr 15 14:41:44 2012
@@ -76,7 +76,7 @@ public class TestICUNormalizer2Filter ex
/** blast some random strings through the analyzer */
public void testRandomStrings() throws Exception {
- checkRandomData(random, a, 10000*RANDOM_MULTIPLIER);
+ checkRandomData(random(), a, 10000*RANDOM_MULTIPLIER);
}
public void testEmptyTerm() throws IOException {
Modified: lucene/dev/trunk/modules/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUTransformFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUTransformFilter.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUTransformFilter.java (original)
+++ lucene/dev/trunk/modules/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUTransformFilter.java Sun Apr 15 14:41:44 2012
@@ -98,7 +98,7 @@ public class TestICUTransformFilter exte
return new TokenStreamComponents(tokenizer, new ICUTransformFilter(tokenizer, transform));
}
};
- checkRandomData(random, a, 1000*RANDOM_MULTIPLIER);
+ checkRandomData(random(), a, 1000*RANDOM_MULTIPLIER);
}
public void testEmptyTerm() throws IOException {
Modified: lucene/dev/trunk/modules/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestICUTokenizer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestICUTokenizer.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestICUTokenizer.java (original)
+++ lucene/dev/trunk/modules/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestICUTokenizer.java Sun Apr 15 14:41:44 2012
@@ -27,6 +27,7 @@ import java.io.IOException;
import java.io.Reader;
import java.io.StringReader;
import java.util.Arrays;
+import java.util.Random;
public class TestICUTokenizer extends BaseTokenStreamTestCase {
@@ -234,11 +235,12 @@ public class TestICUTokenizer extends Ba
/** blast some random strings through the analyzer */
public void testRandomStrings() throws Exception {
- checkRandomData(random, a, 10000*RANDOM_MULTIPLIER);
+ checkRandomData(random(), a, 10000*RANDOM_MULTIPLIER);
}
/** blast some random large strings through the analyzer */
public void testRandomHugeStrings() throws Exception {
+ Random random = random();
checkRandomData(random, a, 200*RANDOM_MULTIPLIER, 8192);
}
}
Modified: lucene/dev/trunk/modules/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestExtendedMode.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestExtendedMode.java?rev=1326351&r1=1326350&r2=1326351&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestExtendedMode.java (original)
+++ lucene/dev/trunk/modules/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestExtendedMode.java Sun Apr 15 14:41:44 2012
@@ -20,6 +20,7 @@ package org.apache.lucene.analysis.ja;
import java.io.IOException;
import java.io.Reader;
import java.io.StringReader;
+import java.util.Random;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.BaseTokenStreamTestCase;
@@ -50,7 +51,7 @@ public class TestExtendedMode extends Ba
public void testSurrogates2() throws IOException {
int numIterations = atLeast(10000);
for (int i = 0; i < numIterations; i++) {
- String s = _TestUtil.randomUnicodeString(random, 100);
+ String s = _TestUtil.randomUnicodeString(random(), 100);
TokenStream ts = analyzer.tokenStream("foo", new StringReader(s));
CharTermAttribute termAtt = ts.addAttribute(CharTermAttribute.class);
ts.reset();
@@ -62,11 +63,13 @@ public class TestExtendedMode extends Ba
/** blast some random strings through the analyzer */
public void testRandomStrings() throws Exception {
+ Random random = random();
checkRandomData(random, analyzer, 10000*RANDOM_MULTIPLIER);
}
/** blast some random large strings through the analyzer */
public void testRandomHugeStrings() throws Exception {
+ Random random = random();
checkRandomData(random, analyzer, 200*RANDOM_MULTIPLIER, 8192);
}
}