You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rj...@apache.org on 2014/08/09 00:42:54 UTC
svn commit: r1616901 [6/11] - in /lucene/dev/trunk: lucene/
lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/
lucene/analysis/common/src/java/org/apache/lucene/analysis/bg/
lucene/analysis/common/src/java/org/apache/lucene/analysis/br/ luc...
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestBugInSomething.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestBugInSomething.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestBugInSomething.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestBugInSomething.java Fri Aug 8 22:42:48 2014
@@ -47,7 +47,7 @@ import org.apache.lucene.util.LuceneTest
@SuppressCodecs("Direct")
public class TestBugInSomething extends BaseTokenStreamTestCase {
public void test() throws Exception {
- final CharArraySet cas = new CharArraySet(TEST_VERSION_CURRENT, 3, false);
+ final CharArraySet cas = new CharArraySet(3, false);
cas.add("jjp");
cas.add("wlmwoknt");
cas.add("tcgyreo");
@@ -62,7 +62,7 @@ public class TestBugInSomething extends
@Override
protected TokenStreamComponents createComponents(String fieldName) {
Tokenizer t = new MockTokenizer(MockTokenFilter.ENGLISH_STOPSET, false, -65);
- TokenFilter f = new CommonGramsFilter(TEST_VERSION_CURRENT, t, cas);
+ TokenFilter f = new CommonGramsFilter(t, cas);
return new TokenStreamComponents(t, f);
}
@@ -250,11 +250,11 @@ public class TestBugInSomething extends
Analyzer analyzer = new Analyzer() {
@Override
protected TokenStreamComponents createComponents(String fieldName) {
- Tokenizer tokenizer = new EdgeNGramTokenizer(TEST_VERSION_CURRENT, 2, 94);
+ Tokenizer tokenizer = new EdgeNGramTokenizer(2, 94);
//TokenStream stream = new SopTokenFilter(tokenizer);
TokenStream stream = new ShingleFilter(tokenizer, 5);
//stream = new SopTokenFilter(stream);
- stream = new NGramTokenFilter(TEST_VERSION_CURRENT, stream, 55, 83);
+ stream = new NGramTokenFilter(stream, 55, 83);
//stream = new SopTokenFilter(stream);
return new TokenStreamComponents(tokenizer, stream);
}
@@ -263,7 +263,7 @@ public class TestBugInSomething extends
}
public void testCuriousWikipediaString() throws Exception {
- final CharArraySet protWords = new CharArraySet(TEST_VERSION_CURRENT, new HashSet<>(
+ final CharArraySet protWords = new CharArraySet(new HashSet<>(
Arrays.asList("rrdpafa", "pupmmlu", "xlq", "dyy", "zqrxrrck", "o", "hsrlfvcha")), false);
final byte table[] = new byte[] {
-57, 26, 1, 48, 63, -23, 55, -84, 18, 120, -97, 103, 58, 13, 84, 89, 57, -13, -63,
@@ -278,7 +278,7 @@ public class TestBugInSomething extends
protected TokenStreamComponents createComponents(String fieldName) {
Tokenizer tokenizer = new WikipediaTokenizer();
TokenStream stream = new SopTokenFilter(tokenizer);
- stream = new WordDelimiterFilter(TEST_VERSION_CURRENT, stream, table, -50, protWords);
+ stream = new WordDelimiterFilter(stream, table, -50, protWords);
stream = new SopTokenFilter(stream);
return new TokenStreamComponents(tokenizer, stream);
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestClassicAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestClassicAnalyzer.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestClassicAnalyzer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestClassicAnalyzer.java Fri Aug 8 22:42:48 2014
@@ -40,16 +40,16 @@ import java.util.Random;
public class TestClassicAnalyzer extends BaseTokenStreamTestCase {
- private Analyzer a = new ClassicAnalyzer(TEST_VERSION_CURRENT);
+ private Analyzer a = new ClassicAnalyzer();
public void testMaxTermLength() throws Exception {
- ClassicAnalyzer sa = new ClassicAnalyzer(TEST_VERSION_CURRENT);
+ ClassicAnalyzer sa = new ClassicAnalyzer();
sa.setMaxTokenLength(5);
assertAnalyzesTo(sa, "ab cd toolong xy z", new String[]{"ab", "cd", "xy", "z"});
}
public void testMaxTermLength2() throws Exception {
- ClassicAnalyzer sa = new ClassicAnalyzer(TEST_VERSION_CURRENT);
+ ClassicAnalyzer sa = new ClassicAnalyzer();
assertAnalyzesTo(sa, "ab cd toolong xy z", new String[]{"ab", "cd", "toolong", "xy", "z"});
sa.setMaxTokenLength(5);
@@ -113,7 +113,7 @@ public class TestClassicAnalyzer extends
public void testLucene1140() throws Exception {
try {
- ClassicAnalyzer analyzer = new ClassicAnalyzer(TEST_VERSION_CURRENT);
+ ClassicAnalyzer analyzer = new ClassicAnalyzer();
assertAnalyzesTo(analyzer, "www.nutch.org.", new String[]{ "www.nutch.org" }, new String[] { "<HOST>" });
} catch (NullPointerException e) {
fail("Should not throw an NPE and it did");
@@ -123,7 +123,7 @@ public class TestClassicAnalyzer extends
public void testDomainNames() throws Exception {
// Current lucene should not show the bug
- ClassicAnalyzer a2 = new ClassicAnalyzer(TEST_VERSION_CURRENT);
+ ClassicAnalyzer a2 = new ClassicAnalyzer();
// domain names
assertAnalyzesTo(a2, "www.nutch.org", new String[]{"www.nutch.org"});
@@ -137,7 +137,7 @@ public class TestClassicAnalyzer extends
// 2.4 should not show the bug. But, alas, it's also obsolete,
// so we check latest released (Robert's gonna break this on 4.0 soon :) )
- a2 = new ClassicAnalyzer(TEST_VERSION_CURRENT);
+ a2 = new ClassicAnalyzer();
assertAnalyzesTo(a2, "www.nutch.org.", new String[]{ "www.nutch.org" }, new String[] { "<HOST>" });
}
@@ -244,7 +244,7 @@ public class TestClassicAnalyzer extends
}
public void testJava14BWCompatibility() throws Exception {
- ClassicAnalyzer sa = new ClassicAnalyzer(TEST_VERSION_CURRENT);
+ ClassicAnalyzer sa = new ClassicAnalyzer();
assertAnalyzesTo(sa, "test\u02C6test", new String[] { "test", "test" });
}
@@ -253,8 +253,7 @@ public class TestClassicAnalyzer extends
*/
public void testWickedLongTerm() throws IOException {
RAMDirectory dir = new RAMDirectory();
- IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(
- TEST_VERSION_CURRENT, new ClassicAnalyzer(TEST_VERSION_CURRENT)));
+ IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new ClassicAnalyzer()));
char[] chars = new char[IndexWriter.MAX_TERM_LENGTH];
Arrays.fill(chars, 'x');
@@ -300,7 +299,7 @@ public class TestClassicAnalyzer extends
// maximum length term, and search on that term:
doc = new Document();
doc.add(new TextField("content", bigTerm, Field.Store.NO));
- ClassicAnalyzer sa = new ClassicAnalyzer(TEST_VERSION_CURRENT);
+ ClassicAnalyzer sa = new ClassicAnalyzer();
sa.setMaxTokenLength(100000);
writer = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, sa));
writer.addDocument(doc);
@@ -314,12 +313,12 @@ public class TestClassicAnalyzer extends
/** blast some random strings through the analyzer */
public void testRandomStrings() throws Exception {
- checkRandomData(random(), new ClassicAnalyzer(TEST_VERSION_CURRENT), 1000*RANDOM_MULTIPLIER);
+ checkRandomData(random(), new ClassicAnalyzer(), 1000*RANDOM_MULTIPLIER);
}
/** blast some random large strings through the analyzer */
public void testRandomHugeStrings() throws Exception {
Random random = random();
- checkRandomData(random, new ClassicAnalyzer(TEST_VERSION_CURRENT), 100*RANDOM_MULTIPLIER, 8192);
+ checkRandomData(random, new ClassicAnalyzer(), 100*RANDOM_MULTIPLIER, 8192);
}
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestDuelingAnalyzers.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestDuelingAnalyzers.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestDuelingAnalyzers.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestDuelingAnalyzers.java Fri Aug 8 22:42:48 2014
@@ -69,7 +69,7 @@ public class TestDuelingAnalyzers extend
Analyzer right = new Analyzer() {
@Override
protected TokenStreamComponents createComponents(String fieldName) {
- Tokenizer tokenizer = new LetterTokenizer(TEST_VERSION_CURRENT, newAttributeFactory());
+ Tokenizer tokenizer = new LetterTokenizer(newAttributeFactory());
return new TokenStreamComponents(tokenizer, tokenizer);
}
};
@@ -89,7 +89,7 @@ public class TestDuelingAnalyzers extend
Analyzer right = new Analyzer() {
@Override
protected TokenStreamComponents createComponents(String fieldName) {
- Tokenizer tokenizer = new LetterTokenizer(TEST_VERSION_CURRENT, newAttributeFactory());
+ Tokenizer tokenizer = new LetterTokenizer(newAttributeFactory());
return new TokenStreamComponents(tokenizer, tokenizer);
}
};
@@ -107,7 +107,7 @@ public class TestDuelingAnalyzers extend
Analyzer right = new Analyzer() {
@Override
protected TokenStreamComponents createComponents(String fieldName) {
- Tokenizer tokenizer = new LetterTokenizer(TEST_VERSION_CURRENT, newAttributeFactory());
+ Tokenizer tokenizer = new LetterTokenizer(newAttributeFactory());
return new TokenStreamComponents(tokenizer, tokenizer);
}
};
@@ -126,7 +126,7 @@ public class TestDuelingAnalyzers extend
Analyzer right = new Analyzer() {
@Override
protected TokenStreamComponents createComponents(String fieldName) {
- Tokenizer tokenizer = new LetterTokenizer(TEST_VERSION_CURRENT, newAttributeFactory());
+ Tokenizer tokenizer = new LetterTokenizer(newAttributeFactory());
return new TokenStreamComponents(tokenizer, tokenizer);
}
};
@@ -144,7 +144,7 @@ public class TestDuelingAnalyzers extend
Analyzer right = new Analyzer() {
@Override
protected TokenStreamComponents createComponents(String fieldName) {
- Tokenizer tokenizer = new LetterTokenizer(TEST_VERSION_CURRENT, newAttributeFactory());
+ Tokenizer tokenizer = new LetterTokenizer(newAttributeFactory());
return new TokenStreamComponents(tokenizer, tokenizer);
}
};
@@ -163,7 +163,7 @@ public class TestDuelingAnalyzers extend
Analyzer right = new Analyzer() {
@Override
protected TokenStreamComponents createComponents(String fieldName) {
- Tokenizer tokenizer = new LetterTokenizer(TEST_VERSION_CURRENT, newAttributeFactory());
+ Tokenizer tokenizer = new LetterTokenizer(newAttributeFactory());
return new TokenStreamComponents(tokenizer, tokenizer);
}
};
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordAnalyzer.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordAnalyzer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordAnalyzer.java Fri Aug 8 22:42:48 2014
@@ -49,8 +49,7 @@ public class TestKeywordAnalyzer extends
public void setUp() throws Exception {
super.setUp();
directory = newDirectory();
- IndexWriter writer = new IndexWriter(directory, new IndexWriterConfig(
- TEST_VERSION_CURRENT, new SimpleAnalyzer(TEST_VERSION_CURRENT)));
+ IndexWriter writer = new IndexWriter(directory, new IndexWriterConfig(TEST_VERSION_CURRENT, new SimpleAnalyzer()));
Document doc = new Document();
doc.add(new StringField("partnum", "Q36", Field.Store.YES));
@@ -72,7 +71,7 @@ public class TestKeywordAnalyzer extends
/*
public void testPerFieldAnalyzer() throws Exception {
- PerFieldAnalyzerWrapper analyzer = new PerFieldAnalyzerWrapper(new SimpleAnalyzer(TEST_VERSION_CURRENT));
+ PerFieldAnalyzerWrapper analyzer = new PerFieldAnalyzerWrapper(new SimpleAnalyzer());
analyzer.addAnalyzer("partnum", new KeywordAnalyzer());
QueryParser queryParser = new QueryParser(TEST_VERSION_CURRENT, "description", analyzer);
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java Fri Aug 8 22:42:48 2014
@@ -60,7 +60,7 @@ import org.apache.lucene.analysis.charfi
import org.apache.lucene.analysis.cjk.CJKBigramFilter;
import org.apache.lucene.analysis.commongrams.CommonGramsFilter;
import org.apache.lucene.analysis.commongrams.CommonGramsQueryFilter;
-import org.apache.lucene.analysis.compound.HyphenationCompoundWordTokenFilter;
+import org.apache.lucene.analysis.compound.Lucene43HyphenationCompoundWordTokenFilter;
import org.apache.lucene.analysis.compound.TestCompoundWordTokenFilter;
import org.apache.lucene.analysis.compound.hyphenation.HyphenationTree;
import org.apache.lucene.analysis.hunspell.Dictionary;
@@ -385,7 +385,7 @@ public class TestRandomChains extends Ba
put(CharArraySet.class, new ArgProducer() {
@Override public Object create(Random random) {
int num = random.nextInt(10);
- CharArraySet set = new CharArraySet(TEST_VERSION_CURRENT, num, random.nextBoolean());
+ CharArraySet set = new CharArraySet(num, random.nextBoolean());
for (int i = 0; i < num; i++) {
// TODO: make nastier
set.add(TestUtil.randomSimpleString(random));
@@ -429,7 +429,7 @@ public class TestRandomChains extends Ba
// TODO: make nastier
try {
InputSource is = new InputSource(TestCompoundWordTokenFilter.class.getResource("da_UTF8.xml").toExternalForm());
- HyphenationTree hyphenator = HyphenationCompoundWordTokenFilter.getHyphenationTree(is);
+ HyphenationTree hyphenator = Lucene43HyphenationCompoundWordTokenFilter.getHyphenationTree(is);
return hyphenator;
} catch (Exception ex) {
Rethrow.rethrow(ex);
@@ -494,7 +494,7 @@ public class TestRandomChains extends Ba
put(CharArrayMap.class, new ArgProducer() {
@Override public Object create(Random random) {
int num = random.nextInt(10);
- CharArrayMap<String> map = new CharArrayMap<>(TEST_VERSION_CURRENT, num, random.nextBoolean());
+ CharArrayMap<String> map = new CharArrayMap<>(num, random.nextBoolean());
for (int i = 0; i < num; i++) {
// TODO: make nastier
map.put(TestUtil.randomSimpleString(random), TestUtil.randomSimpleString(random));
@@ -619,7 +619,7 @@ public class TestRandomChains extends Ba
args[i] = stream;
} else if (paramType == CommonGramsFilter.class) {
// TODO: fix this one, thats broken: CommonGramsQueryFilter takes this one explicitly
- args[i] = new CommonGramsFilter(TEST_VERSION_CURRENT, stream, newRandomArg(random, CharArraySet.class));
+ args[i] = new CommonGramsFilter(stream, newRandomArg(random, CharArraySet.class));
} else {
args[i] = newRandomArg(random, paramType);
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStandardAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStandardAnalyzer.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStandardAnalyzer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStandardAnalyzer.java Fri Aug 8 22:42:48 2014
@@ -18,7 +18,6 @@ package org.apache.lucene.analysis.core;
*/
import java.io.IOException;
-import java.io.Reader;
import java.io.StringReader;
import java.util.Arrays;
import java.util.Random;
@@ -30,7 +29,6 @@ import org.apache.lucene.analysis.TokenS
import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.analysis.standard.StandardTokenizer;
-import org.apache.lucene.util.Version;
public class TestStandardAnalyzer extends BaseTokenStreamTestCase {
@@ -41,7 +39,7 @@ public class TestStandardAnalyzer extend
sb.append(whitespace);
sb.append("testing 1234");
String input = sb.toString();
- StandardTokenizer tokenizer = new StandardTokenizer(TEST_VERSION_CURRENT);
+ StandardTokenizer tokenizer = new StandardTokenizer();
tokenizer.setReader(new StringReader(input));
BaseTokenStreamTestCase.assertTokenStreamContents(tokenizer, new String[] { "testing", "1234" });
}
@@ -50,7 +48,7 @@ public class TestStandardAnalyzer extend
@Override
protected TokenStreamComponents createComponents(String fieldName) {
- Tokenizer tokenizer = new StandardTokenizer(TEST_VERSION_CURRENT, newAttributeFactory());
+ Tokenizer tokenizer = new StandardTokenizer(newAttributeFactory());
return new TokenStreamComponents(tokenizer);
}
};
@@ -282,13 +280,13 @@ public class TestStandardAnalyzer extend
/** blast some random strings through the analyzer */
public void testRandomStrings() throws Exception {
- checkRandomData(random(), new StandardAnalyzer(TEST_VERSION_CURRENT), 1000*RANDOM_MULTIPLIER);
+ checkRandomData(random(), new StandardAnalyzer(), 1000*RANDOM_MULTIPLIER);
}
/** blast some random large strings through the analyzer */
public void testRandomHugeStrings() throws Exception {
Random random = random();
- checkRandomData(random, new StandardAnalyzer(TEST_VERSION_CURRENT), 100*RANDOM_MULTIPLIER, 8192);
+ checkRandomData(random, new StandardAnalyzer(), 100*RANDOM_MULTIPLIER, 8192);
}
// Adds random graph after:
@@ -298,7 +296,7 @@ public class TestStandardAnalyzer extend
new Analyzer() {
@Override
protected TokenStreamComponents createComponents(String fieldName) {
- Tokenizer tokenizer = new StandardTokenizer(TEST_VERSION_CURRENT, newAttributeFactory());
+ Tokenizer tokenizer = new StandardTokenizer(newAttributeFactory());
TokenStream tokenStream = new MockGraphTokenFilter(random(), tokenizer);
return new TokenStreamComponents(tokenizer, tokenStream);
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStopAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStopAnalyzer.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStopAnalyzer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStopAnalyzer.java Fri Aug 8 22:42:48 2014
@@ -22,7 +22,6 @@ import org.apache.lucene.analysis.TokenS
import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.lucene.analysis.util.CharArraySet;
-import org.apache.lucene.util.Version;
import java.io.IOException;
import java.util.Iterator;
@@ -31,7 +30,7 @@ import java.util.HashSet;
public class TestStopAnalyzer extends BaseTokenStreamTestCase {
- private StopAnalyzer stop = new StopAnalyzer(TEST_VERSION_CURRENT);
+ private StopAnalyzer stop = new StopAnalyzer();
private Set<Object> inValidTokens = new HashSet<>();
@Override
@@ -59,8 +58,8 @@ public class TestStopAnalyzer extends Ba
}
public void testStopList() throws IOException {
- CharArraySet stopWordsSet = new CharArraySet(TEST_VERSION_CURRENT, asSet("good", "test", "analyzer"), false);
- StopAnalyzer newStop = new StopAnalyzer(TEST_VERSION_CURRENT, stopWordsSet);
+ CharArraySet stopWordsSet = new CharArraySet(asSet("good", "test", "analyzer"), false);
+ StopAnalyzer newStop = new StopAnalyzer(stopWordsSet);
try (TokenStream stream = newStop.tokenStream("test", "This is a good test of the english stop analyzer")) {
assertNotNull(stream);
CharTermAttribute termAtt = stream.getAttribute(CharTermAttribute.class);
@@ -75,8 +74,8 @@ public class TestStopAnalyzer extends Ba
}
public void testStopListPositions() throws IOException {
- CharArraySet stopWordsSet = new CharArraySet(TEST_VERSION_CURRENT, asSet("good", "test", "analyzer"), false);
- StopAnalyzer newStop = new StopAnalyzer(TEST_VERSION_CURRENT, stopWordsSet);
+ CharArraySet stopWordsSet = new CharArraySet(asSet("good", "test", "analyzer"), false);
+ StopAnalyzer newStop = new StopAnalyzer(stopWordsSet);
String s = "This is a good test of the english stop analyzer with positions";
int expectedIncr[] = { 1, 1, 1, 3, 1, 1, 1, 2, 1};
try (TokenStream stream = newStop.tokenStream("test", s)) {
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStopFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStopFilter.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStopFilter.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStopFilter.java Fri Aug 8 22:42:48 2014
@@ -28,7 +28,6 @@ import org.apache.lucene.analysis.tokena
import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute;
import org.apache.lucene.analysis.util.CharArraySet;
import org.apache.lucene.util.English;
-import org.apache.lucene.util.Version;
public class TestStopFilter extends BaseTokenStreamTestCase {
@@ -37,20 +36,20 @@ public class TestStopFilter extends Base
public void testExactCase() throws IOException {
StringReader reader = new StringReader("Now is The Time");
- CharArraySet stopWords = new CharArraySet(TEST_VERSION_CURRENT, asSet("is", "the", "Time"), false);
+ CharArraySet stopWords = new CharArraySet(asSet("is", "the", "Time"), false);
final MockTokenizer in = new MockTokenizer(MockTokenizer.WHITESPACE, false);
in.setReader(reader);
- TokenStream stream = new StopFilter(TEST_VERSION_CURRENT, in, stopWords);
+ TokenStream stream = new StopFilter(in, stopWords);
assertTokenStreamContents(stream, new String[] { "Now", "The" });
}
public void testStopFilt() throws IOException {
StringReader reader = new StringReader("Now is The Time");
String[] stopWords = new String[] { "is", "the", "Time" };
- CharArraySet stopSet = StopFilter.makeStopSet(TEST_VERSION_CURRENT, stopWords);
+ CharArraySet stopSet = StopFilter.makeStopSet(stopWords);
final MockTokenizer in = new MockTokenizer(MockTokenizer.WHITESPACE, false);
in.setReader(reader);
- TokenStream stream = new StopFilter(TEST_VERSION_CURRENT, in, stopSet);
+ TokenStream stream = new StopFilter(in, stopSet);
assertTokenStreamContents(stream, new String[] { "Now", "The" });
}
@@ -68,12 +67,12 @@ public class TestStopFilter extends Base
log(sb.toString());
String stopWords[] = a.toArray(new String[0]);
for (int i=0; i<a.size(); i++) log("Stop: "+stopWords[i]);
- CharArraySet stopSet = StopFilter.makeStopSet(TEST_VERSION_CURRENT, stopWords);
+ CharArraySet stopSet = StopFilter.makeStopSet(stopWords);
// with increments
StringReader reader = new StringReader(sb.toString());
final MockTokenizer in = new MockTokenizer(MockTokenizer.WHITESPACE, false);
in.setReader(reader);
- StopFilter stpf = new StopFilter(Version.LUCENE_4_0, in, stopSet);
+ StopFilter stpf = new StopFilter(in, stopSet);
doTestStopPositons(stpf);
// with increments, concatenating two stop filters
ArrayList<String> a0 = new ArrayList<>();
@@ -89,22 +88,22 @@ public class TestStopFilter extends Base
for (int i=0; i<a0.size(); i++) log("Stop0: "+stopWords0[i]);
String stopWords1[] = a1.toArray(new String[0]);
for (int i=0; i<a1.size(); i++) log("Stop1: "+stopWords1[i]);
- CharArraySet stopSet0 = StopFilter.makeStopSet(TEST_VERSION_CURRENT, stopWords0);
- CharArraySet stopSet1 = StopFilter.makeStopSet(TEST_VERSION_CURRENT, stopWords1);
+ CharArraySet stopSet0 = StopFilter.makeStopSet(stopWords0);
+ CharArraySet stopSet1 = StopFilter.makeStopSet(stopWords1);
reader = new StringReader(sb.toString());
final MockTokenizer in1 = new MockTokenizer(MockTokenizer.WHITESPACE, false);
in1.setReader(reader);
- StopFilter stpf0 = new StopFilter(TEST_VERSION_CURRENT, in1, stopSet0); // first part of the set
- StopFilter stpf01 = new StopFilter(TEST_VERSION_CURRENT, stpf0, stopSet1); // two stop filters concatenated!
+ StopFilter stpf0 = new StopFilter(in1, stopSet0); // first part of the set
+ StopFilter stpf01 = new StopFilter(stpf0, stopSet1); // two stop filters concatenated!
doTestStopPositons(stpf01);
}
// LUCENE-3849: make sure after .end() we see the "ending" posInc
public void testEndStopword() throws Exception {
- CharArraySet stopSet = StopFilter.makeStopSet(TEST_VERSION_CURRENT, "of");
+ CharArraySet stopSet = StopFilter.makeStopSet("of");
final MockTokenizer in = new MockTokenizer(MockTokenizer.WHITESPACE, false);
in.setReader(new StringReader("test of"));
- StopFilter stpf = new StopFilter(TEST_VERSION_CURRENT, in, stopSet);
+ StopFilter stpf = new StopFilter(in, stopSet);
assertTokenStreamContents(stpf, new String[] { "test" },
new int[] {0},
new int[] {4},
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestTypeTokenFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestTypeTokenFilter.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestTypeTokenFilter.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestTypeTokenFilter.java Fri Aug 8 22:42:48 2014
@@ -36,9 +36,9 @@ public class TestTypeTokenFilter extends
public void testTypeFilter() throws IOException {
StringReader reader = new StringReader("121 is palindrome, while 123 is not");
Set<String> stopTypes = asSet("<NUM>");
- final StandardTokenizer input = new StandardTokenizer(TEST_VERSION_CURRENT, newAttributeFactory());
+ final StandardTokenizer input = new StandardTokenizer(newAttributeFactory());
input.setReader(reader);
- TokenStream stream = new TypeTokenFilter(TEST_VERSION_CURRENT, input, stopTypes);
+ TokenStream stream = new TypeTokenFilter(input, stopTypes);
assertTokenStreamContents(stream, new String[]{"is", "palindrome", "while", "is", "not"});
}
@@ -61,9 +61,9 @@ public class TestTypeTokenFilter extends
// with increments
StringReader reader = new StringReader(sb.toString());
- final StandardTokenizer input = new StandardTokenizer(TEST_VERSION_CURRENT);
+ final StandardTokenizer input = new StandardTokenizer();
input.setReader(reader);
- TypeTokenFilter typeTokenFilter = new TypeTokenFilter(TEST_VERSION_CURRENT, input, stopSet);
+ TypeTokenFilter typeTokenFilter = new TypeTokenFilter(input, stopSet);
testPositons(typeTokenFilter);
}
@@ -85,9 +85,9 @@ public class TestTypeTokenFilter extends
public void testTypeFilterWhitelist() throws IOException {
StringReader reader = new StringReader("121 is palindrome, while 123 is not");
Set<String> stopTypes = Collections.singleton("<NUM>");
- final StandardTokenizer input = new StandardTokenizer(TEST_VERSION_CURRENT, newAttributeFactory());
+ final StandardTokenizer input = new StandardTokenizer(newAttributeFactory());
input.setReader(reader);
- TokenStream stream = new TypeTokenFilter(TEST_VERSION_CURRENT, input, stopTypes, true);
+ TokenStream stream = new TypeTokenFilter(input, stopTypes, true);
assertTokenStreamContents(stream, new String[]{"121", "123"});
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestUAX29URLEmailAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestUAX29URLEmailAnalyzer.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestUAX29URLEmailAnalyzer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestUAX29URLEmailAnalyzer.java Fri Aug 8 22:42:48 2014
@@ -20,14 +20,13 @@ package org.apache.lucene.analysis.core;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.BaseTokenStreamTestCase;
import org.apache.lucene.analysis.standard.UAX29URLEmailAnalyzer;
-import org.apache.lucene.util.Version;
import java.io.IOException;
import java.util.Arrays;
public class TestUAX29URLEmailAnalyzer extends BaseTokenStreamTestCase {
- private Analyzer a = new UAX29URLEmailAnalyzer(TEST_VERSION_CURRENT);
+ private Analyzer a = new UAX29URLEmailAnalyzer();
public void testHugeDoc() throws IOException {
StringBuilder sb = new StringBuilder();
@@ -344,6 +343,6 @@ public class TestUAX29URLEmailAnalyzer e
/** blast some random strings through the analyzer */
public void testRandomStrings() throws Exception {
- checkRandomData(random(), new UAX29URLEmailAnalyzer(TEST_VERSION_CURRENT), 1000*RANDOM_MULTIPLIER);
+ checkRandomData(random(), new UAX29URLEmailAnalyzer(), 1000*RANDOM_MULTIPLIER);
}
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestUAX29URLEmailTokenizer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestUAX29URLEmailTokenizer.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestUAX29URLEmailTokenizer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestUAX29URLEmailTokenizer.java Fri Aug 8 22:42:48 2014
@@ -5,10 +5,8 @@ import org.apache.lucene.analysis.BaseTo
import org.apache.lucene.analysis.TokenFilter;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.Tokenizer;
-import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.analysis.standard.UAX29URLEmailTokenizer;
import org.apache.lucene.analysis.tokenattributes.TypeAttribute;
-import org.apache.lucene.util.Version;
import java.io.BufferedReader;
import java.io.IOException;
@@ -47,7 +45,7 @@ public class TestUAX29URLEmailTokenizer
sb.append(whitespace);
sb.append("testing 1234");
String input = sb.toString();
- UAX29URLEmailTokenizer tokenizer = new UAX29URLEmailTokenizer(TEST_VERSION_CURRENT, newAttributeFactory());
+ UAX29URLEmailTokenizer tokenizer = new UAX29URLEmailTokenizer(newAttributeFactory());
tokenizer.setReader(new StringReader(input));
BaseTokenStreamTestCase.assertTokenStreamContents(tokenizer, new String[] { "testing", "1234" });
}
@@ -56,7 +54,7 @@ public class TestUAX29URLEmailTokenizer
@Override
protected TokenStreamComponents createComponents(String fieldName) {
- Tokenizer tokenizer = new UAX29URLEmailTokenizer(TEST_VERSION_CURRENT, newAttributeFactory());
+ Tokenizer tokenizer = new UAX29URLEmailTokenizer(newAttributeFactory());
return new TokenStreamComponents(tokenizer);
}
};
@@ -103,7 +101,7 @@ public class TestUAX29URLEmailTokenizer
private Analyzer urlAnalyzer = new Analyzer() {
@Override
protected TokenStreamComponents createComponents(String fieldName) {
- UAX29URLEmailTokenizer tokenizer = new UAX29URLEmailTokenizer(TEST_VERSION_CURRENT, newAttributeFactory());
+ UAX29URLEmailTokenizer tokenizer = new UAX29URLEmailTokenizer(newAttributeFactory());
tokenizer.setMaxTokenLength(Integer.MAX_VALUE); // Tokenize arbitrary length URLs
TokenFilter filter = new URLFilter(tokenizer);
return new TokenStreamComponents(tokenizer, filter);
@@ -113,7 +111,7 @@ public class TestUAX29URLEmailTokenizer
private Analyzer emailAnalyzer = new Analyzer() {
@Override
protected TokenStreamComponents createComponents(String fieldName) {
- UAX29URLEmailTokenizer tokenizer = new UAX29URLEmailTokenizer(TEST_VERSION_CURRENT, newAttributeFactory());
+ UAX29URLEmailTokenizer tokenizer = new UAX29URLEmailTokenizer(newAttributeFactory());
TokenFilter filter = new EmailFilter(tokenizer);
return new TokenStreamComponents(tokenizer, filter);
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechAnalyzer.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechAnalyzer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechAnalyzer.java Fri Aug 8 22:42:48 2014
@@ -21,7 +21,6 @@ import java.io.IOException;
import org.apache.lucene.analysis.BaseTokenStreamTestCase;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.util.CharArraySet;
-import org.apache.lucene.util.Version;
/**
* Test the CzechAnalyzer
@@ -33,25 +32,25 @@ import org.apache.lucene.util.Version;
public class TestCzechAnalyzer extends BaseTokenStreamTestCase {
public void testStopWord() throws Exception {
- assertAnalyzesTo(new CzechAnalyzer(TEST_VERSION_CURRENT), "Pokud mluvime o volnem",
+ assertAnalyzesTo(new CzechAnalyzer(), "Pokud mluvime o volnem",
new String[] { "mluvim", "voln" });
}
public void testReusableTokenStream() throws Exception {
- Analyzer analyzer = new CzechAnalyzer(TEST_VERSION_CURRENT);
+ Analyzer analyzer = new CzechAnalyzer();
assertAnalyzesTo(analyzer, "Pokud mluvime o volnem", new String[] { "mluvim", "voln" });
assertAnalyzesTo(analyzer, "Äeská Republika", new String[] { "Äesk", "republik" });
}
public void testWithStemExclusionSet() throws IOException{
- CharArraySet set = new CharArraySet(TEST_VERSION_CURRENT, 1, true);
+ CharArraySet set = new CharArraySet(1, true);
set.add("hole");
- CzechAnalyzer cz = new CzechAnalyzer(TEST_VERSION_CURRENT, CharArraySet.EMPTY_SET, set);
+ CzechAnalyzer cz = new CzechAnalyzer(CharArraySet.EMPTY_SET, set);
assertAnalyzesTo(cz, "hole desek", new String[] {"hole", "desk"});
}
/** blast some random strings through the analyzer */
public void testRandomStrings() throws Exception {
- checkRandomData(random(), new CzechAnalyzer(TEST_VERSION_CURRENT), 1000*RANDOM_MULTIPLIER);
+ checkRandomData(random(), new CzechAnalyzer(), 1000*RANDOM_MULTIPLIER);
}
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechStemmer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechStemmer.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechStemmer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechStemmer.java Fri Aug 8 22:42:48 2014
@@ -41,7 +41,7 @@ public class TestCzechStemmer extends Ba
* Test showing how masculine noun forms conflate
*/
public void testMasculineNouns() throws IOException {
- CzechAnalyzer cz = new CzechAnalyzer(TEST_VERSION_CURRENT);
+ CzechAnalyzer cz = new CzechAnalyzer();
/* animate ending with a hard consonant */
assertAnalyzesTo(cz, "pán", new String[] { "pán" });
@@ -109,7 +109,7 @@ public class TestCzechStemmer extends Ba
* Test showing how feminine noun forms conflate
*/
public void testFeminineNouns() throws IOException {
- CzechAnalyzer cz = new CzechAnalyzer(TEST_VERSION_CURRENT);
+ CzechAnalyzer cz = new CzechAnalyzer();
/* ending with hard consonant */
assertAnalyzesTo(cz, "kost", new String[] { "kost" });
@@ -153,7 +153,7 @@ public class TestCzechStemmer extends Ba
* Test showing how neuter noun forms conflate
*/
public void testNeuterNouns() throws IOException {
- CzechAnalyzer cz = new CzechAnalyzer(TEST_VERSION_CURRENT);
+ CzechAnalyzer cz = new CzechAnalyzer();
/* ending with o */
assertAnalyzesTo(cz, "mÄsto", new String[] { "mÄst" });
@@ -196,7 +196,7 @@ public class TestCzechStemmer extends Ba
* Test showing how adjectival forms conflate
*/
public void testAdjectives() throws IOException {
- CzechAnalyzer cz = new CzechAnalyzer(TEST_VERSION_CURRENT);
+ CzechAnalyzer cz = new CzechAnalyzer();
/* ending with ý/á/é */
assertAnalyzesTo(cz, "mladý", new String[] { "mlad" });
@@ -224,7 +224,7 @@ public class TestCzechStemmer extends Ba
* Test some possessive suffixes
*/
public void testPossessive() throws IOException {
- CzechAnalyzer cz = new CzechAnalyzer(TEST_VERSION_CURRENT);
+ CzechAnalyzer cz = new CzechAnalyzer();
assertAnalyzesTo(cz, "Karlův", new String[] { "karl" });
assertAnalyzesTo(cz, "jazykový", new String[] { "jazyk" });
}
@@ -233,7 +233,7 @@ public class TestCzechStemmer extends Ba
* Test some exceptional rules, implemented as rewrites.
*/
public void testExceptions() throws IOException {
- CzechAnalyzer cz = new CzechAnalyzer(TEST_VERSION_CURRENT);
+ CzechAnalyzer cz = new CzechAnalyzer();
/* rewrite of Å¡t -> sk */
assertAnalyzesTo(cz, "Äeský", new String[] { "Äesk" });
@@ -273,13 +273,13 @@ public class TestCzechStemmer extends Ba
* Test that very short words are not stemmed.
*/
public void testDontStem() throws IOException {
- CzechAnalyzer cz = new CzechAnalyzer(TEST_VERSION_CURRENT);
+ CzechAnalyzer cz = new CzechAnalyzer();
assertAnalyzesTo(cz, "e", new String[] { "e" });
assertAnalyzesTo(cz, "zi", new String[] { "zi" });
}
public void testWithKeywordAttribute() throws IOException {
- CharArraySet set = new CharArraySet(TEST_VERSION_CURRENT, 1, true);
+ CharArraySet set = new CharArraySet(1, true);
set.add("hole");
final MockTokenizer in = new MockTokenizer(MockTokenizer.WHITESPACE, false);
in.setReader(new StringReader("hole desek"));
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/da/TestDanishAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/da/TestDanishAnalyzer.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/da/TestDanishAnalyzer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/da/TestDanishAnalyzer.java Fri Aug 8 22:42:48 2014
@@ -27,12 +27,12 @@ public class TestDanishAnalyzer extends
/** This test fails with NPE when the
* stopwords file is missing in classpath */
public void testResourcesAvailable() {
- new DanishAnalyzer(TEST_VERSION_CURRENT);
+ new DanishAnalyzer();
}
/** test stopwords and stemming */
public void testBasics() throws IOException {
- Analyzer a = new DanishAnalyzer(TEST_VERSION_CURRENT);
+ Analyzer a = new DanishAnalyzer();
// stemming
checkOneTerm(a, "undersøg", "undersøg");
checkOneTerm(a, "undersøgelse", "undersøg");
@@ -42,8 +42,8 @@ public class TestDanishAnalyzer extends
/** test use of exclusion set */
public void testExclude() throws IOException {
- CharArraySet exclusionSet = new CharArraySet(TEST_VERSION_CURRENT, asSet("undersøgelse"), false);
- Analyzer a = new DanishAnalyzer(TEST_VERSION_CURRENT,
+ CharArraySet exclusionSet = new CharArraySet( asSet("undersøgelse"), false);
+ Analyzer a = new DanishAnalyzer(
DanishAnalyzer.getDefaultStopSet(), exclusionSet);
checkOneTerm(a, "undersøgelse", "undersøgelse");
checkOneTerm(a, "undersøg", "undersøg");
@@ -51,6 +51,6 @@ public class TestDanishAnalyzer extends
/** blast some random strings through the analyzer */
public void testRandomStrings() throws Exception {
- checkRandomData(random(), new DanishAnalyzer(TEST_VERSION_CURRENT), 1000*RANDOM_MULTIPLIER);
+ checkRandomData(random(), new DanishAnalyzer(), 1000*RANDOM_MULTIPLIER);
}
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanAnalyzer.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanAnalyzer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanAnalyzer.java Fri Aug 8 22:42:48 2014
@@ -28,16 +28,16 @@ import org.apache.lucene.analysis.util.C
public class TestGermanAnalyzer extends BaseTokenStreamTestCase {
public void testReusableTokenStream() throws Exception {
- Analyzer a = new GermanAnalyzer(TEST_VERSION_CURRENT);
+ Analyzer a = new GermanAnalyzer();
checkOneTerm(a, "Tisch", "tisch");
checkOneTerm(a, "Tische", "tisch");
checkOneTerm(a, "Tischen", "tisch");
}
public void testWithKeywordAttribute() throws IOException {
- CharArraySet set = new CharArraySet(TEST_VERSION_CURRENT, 1, true);
+ CharArraySet set = new CharArraySet( 1, true);
set.add("fischen");
- final LowerCaseTokenizer in = new LowerCaseTokenizer(TEST_VERSION_CURRENT);
+ final LowerCaseTokenizer in = new LowerCaseTokenizer();
in.setReader(new StringReader("Fischen Trinken"));
GermanStemFilter filter = new GermanStemFilter(
new SetKeywordMarkerFilter(in, set));
@@ -45,8 +45,8 @@ public class TestGermanAnalyzer extends
}
public void testStemExclusionTable() throws Exception {
- GermanAnalyzer a = new GermanAnalyzer(TEST_VERSION_CURRENT, CharArraySet.EMPTY_SET,
- new CharArraySet(TEST_VERSION_CURRENT, asSet("tischen"), false));
+ GermanAnalyzer a = new GermanAnalyzer( CharArraySet.EMPTY_SET,
+ new CharArraySet( asSet("tischen"), false));
checkOneTerm(a, "tischen", "tischen");
}
@@ -54,7 +54,7 @@ public class TestGermanAnalyzer extends
* these only pass with LUCENE_CURRENT, not if you use o.a.l.a.de.GermanStemmer
*/
public void testGermanSpecials() throws Exception {
- GermanAnalyzer a = new GermanAnalyzer(TEST_VERSION_CURRENT);
+ GermanAnalyzer a = new GermanAnalyzer();
// a/o/u + e is equivalent to the umlaut form
checkOneTerm(a, "Schaltflächen", "schaltflach");
checkOneTerm(a, "Schaltflaechen", "schaltflach");
@@ -62,6 +62,6 @@ public class TestGermanAnalyzer extends
/** blast some random strings through the analyzer */
public void testRandomStrings() throws Exception {
- checkRandomData(random(), new GermanAnalyzer(TEST_VERSION_CURRENT), 1000*RANDOM_MULTIPLIER);
+ checkRandomData(random(), new GermanAnalyzer(), 1000*RANDOM_MULTIPLIER);
}
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanLightStemFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanLightStemFilter.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanLightStemFilter.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanLightStemFilter.java Fri Aug 8 22:42:48 2014
@@ -49,7 +49,7 @@ public class TestGermanLightStemFilter e
}
public void testKeyword() throws IOException {
- final CharArraySet exclusionSet = new CharArraySet(TEST_VERSION_CURRENT, asSet("sängerinnen"), false);
+ final CharArraySet exclusionSet = new CharArraySet( asSet("sängerinnen"), false);
Analyzer a = new Analyzer() {
@Override
protected TokenStreamComponents createComponents(String fieldName) {
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanMinimalStemFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanMinimalStemFilter.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanMinimalStemFilter.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanMinimalStemFilter.java Fri Aug 8 22:42:48 2014
@@ -56,7 +56,7 @@ public class TestGermanMinimalStemFilter
}
public void testKeyword() throws IOException {
- final CharArraySet exclusionSet = new CharArraySet(TEST_VERSION_CURRENT, asSet("sängerinnen"), false);
+ final CharArraySet exclusionSet = new CharArraySet( asSet("sängerinnen"), false);
Analyzer a = new Analyzer() {
@Override
protected TokenStreamComponents createComponents(String fieldName) {
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanStemFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanStemFilter.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanStemFilter.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanStemFilter.java Fri Aug 8 22:42:48 2014
@@ -44,7 +44,7 @@ public class TestGermanStemFilter extend
protected TokenStreamComponents createComponents(String fieldName) {
Tokenizer t = new MockTokenizer(MockTokenizer.KEYWORD, false);
return new TokenStreamComponents(t,
- new GermanStemFilter(new LowerCaseFilter(TEST_VERSION_CURRENT, t)));
+ new GermanStemFilter(new LowerCaseFilter(t)));
}
};
@@ -55,7 +55,7 @@ public class TestGermanStemFilter extend
}
public void testKeyword() throws IOException {
- final CharArraySet exclusionSet = new CharArraySet(TEST_VERSION_CURRENT, asSet("sängerinnen"), false);
+ final CharArraySet exclusionSet = new CharArraySet( asSet("sängerinnen"), false);
Analyzer a = new Analyzer() {
@Override
protected TokenStreamComponents createComponents(String fieldName) {
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/GreekAnalyzerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/GreekAnalyzerTest.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/GreekAnalyzerTest.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/GreekAnalyzerTest.java Fri Aug 8 22:42:48 2014
@@ -31,7 +31,7 @@ public class GreekAnalyzerTest extends B
* @throws Exception in case an error occurs
*/
public void testAnalyzer() throws Exception {
- Analyzer a = new GreekAnalyzer(TEST_VERSION_CURRENT);
+ Analyzer a = new GreekAnalyzer();
// Verify the correct analysis of capitals and small accented letters, and
// stemming
assertAnalyzesTo(a, "Îία εξαιÏεÏικά καλή και ÏλοÏÏια ÏειÏά ÏαÏακÏήÏÏν ÏÎ·Ï ÎÎ»Î»Î·Î½Î¹ÎºÎ®Ï Î³Î»ÏÏÏαÏ",
@@ -48,7 +48,7 @@ public class GreekAnalyzerTest extends B
}
public void testReusableTokenStream() throws Exception {
- Analyzer a = new GreekAnalyzer(TEST_VERSION_CURRENT);
+ Analyzer a = new GreekAnalyzer();
// Verify the correct analysis of capitals and small accented letters, and
// stemming
assertAnalyzesTo(a, "Îία εξαιÏεÏικά καλή και ÏλοÏÏια ÏειÏά ÏαÏακÏήÏÏν ÏÎ·Ï ÎÎ»Î»Î·Î½Î¹ÎºÎ®Ï Î³Î»ÏÏÏαÏ",
@@ -66,6 +66,6 @@ public class GreekAnalyzerTest extends B
/** blast some random strings through the analyzer */
public void testRandomStrings() throws Exception {
- checkRandomData(random(), new GreekAnalyzer(TEST_VERSION_CURRENT), 1000*RANDOM_MULTIPLIER);
+ checkRandomData(random(), new GreekAnalyzer(), 1000*RANDOM_MULTIPLIER);
}
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/TestGreekStemmer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/TestGreekStemmer.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/TestGreekStemmer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/TestGreekStemmer.java Fri Aug 8 22:42:48 2014
@@ -26,7 +26,7 @@ import org.apache.lucene.analysis.Tokeni
import org.apache.lucene.analysis.core.KeywordTokenizer;
public class TestGreekStemmer extends BaseTokenStreamTestCase {
- Analyzer a = new GreekAnalyzer(TEST_VERSION_CURRENT);
+ Analyzer a = new GreekAnalyzer();
public void testMasculineNouns() throws Exception {
// -οÏ
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestEnglishAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestEnglishAnalyzer.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestEnglishAnalyzer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestEnglishAnalyzer.java Fri Aug 8 22:42:48 2014
@@ -27,12 +27,12 @@ public class TestEnglishAnalyzer extends
/** This test fails with NPE when the
* stopwords file is missing in classpath */
public void testResourcesAvailable() {
- new EnglishAnalyzer(TEST_VERSION_CURRENT);
+ new EnglishAnalyzer();
}
/** test stopwords and stemming */
public void testBasics() throws IOException {
- Analyzer a = new EnglishAnalyzer(TEST_VERSION_CURRENT);
+ Analyzer a = new EnglishAnalyzer();
// stemming
checkOneTerm(a, "books", "book");
checkOneTerm(a, "book", "book");
@@ -46,8 +46,8 @@ public class TestEnglishAnalyzer extends
/** test use of exclusion set */
public void testExclude() throws IOException {
- CharArraySet exclusionSet = new CharArraySet(TEST_VERSION_CURRENT, asSet("books"), false);
- Analyzer a = new EnglishAnalyzer(TEST_VERSION_CURRENT,
+ CharArraySet exclusionSet = new CharArraySet( asSet("books"), false);
+ Analyzer a = new EnglishAnalyzer(
EnglishAnalyzer.getDefaultStopSet(), exclusionSet);
checkOneTerm(a, "books", "books");
checkOneTerm(a, "book", "book");
@@ -55,6 +55,6 @@ public class TestEnglishAnalyzer extends
/** blast some random strings through the analyzer */
public void testRandomStrings() throws Exception {
- checkRandomData(random(), new EnglishAnalyzer(TEST_VERSION_CURRENT), 1000*RANDOM_MULTIPLIER);
+ checkRandomData(random(), new EnglishAnalyzer(), 1000*RANDOM_MULTIPLIER);
}
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestPorterStemFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestPorterStemFilter.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestPorterStemFilter.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestPorterStemFilter.java Fri Aug 8 22:42:48 2014
@@ -53,7 +53,7 @@ public class TestPorterStemFilter extend
}
public void testWithKeywordAttribute() throws IOException {
- CharArraySet set = new CharArraySet(TEST_VERSION_CURRENT, 1, true);
+ CharArraySet set = new CharArraySet( 1, true);
set.add("yourselves");
Tokenizer tokenizer = new MockTokenizer(MockTokenizer.WHITESPACE, false);
tokenizer.setReader(new StringReader("yourselves yours"));
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishAnalyzer.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishAnalyzer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishAnalyzer.java Fri Aug 8 22:42:48 2014
@@ -27,12 +27,12 @@ public class TestSpanishAnalyzer extends
/** This test fails with NPE when the
* stopwords file is missing in classpath */
public void testResourcesAvailable() {
- new SpanishAnalyzer(TEST_VERSION_CURRENT);
+ new SpanishAnalyzer();
}
/** test stopwords and stemming */
public void testBasics() throws IOException {
- Analyzer a = new SpanishAnalyzer(TEST_VERSION_CURRENT);
+ Analyzer a = new SpanishAnalyzer();
// stemming
checkOneTerm(a, "chicana", "chican");
checkOneTerm(a, "chicano", "chican");
@@ -42,8 +42,8 @@ public class TestSpanishAnalyzer extends
/** test use of exclusion set */
public void testExclude() throws IOException {
- CharArraySet exclusionSet = new CharArraySet(TEST_VERSION_CURRENT, asSet("chicano"), false);
- Analyzer a = new SpanishAnalyzer(TEST_VERSION_CURRENT,
+ CharArraySet exclusionSet = new CharArraySet( asSet("chicano"), false);
+ Analyzer a = new SpanishAnalyzer(
SpanishAnalyzer.getDefaultStopSet(), exclusionSet);
checkOneTerm(a, "chicana", "chican");
checkOneTerm(a, "chicano", "chicano");
@@ -51,6 +51,6 @@ public class TestSpanishAnalyzer extends
/** blast some random strings through the analyzer */
public void testRandomStrings() throws Exception {
- checkRandomData(random(), new SpanishAnalyzer(TEST_VERSION_CURRENT), 1000*RANDOM_MULTIPLIER);
+ checkRandomData(random(), new SpanishAnalyzer(), 1000*RANDOM_MULTIPLIER);
}
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/eu/TestBasqueAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/eu/TestBasqueAnalyzer.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/eu/TestBasqueAnalyzer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/eu/TestBasqueAnalyzer.java Fri Aug 8 22:42:48 2014
@@ -27,12 +27,12 @@ public class TestBasqueAnalyzer extends
/** This test fails with NPE when the
* stopwords file is missing in classpath */
public void testResourcesAvailable() {
- new BasqueAnalyzer(TEST_VERSION_CURRENT);
+ new BasqueAnalyzer();
}
/** test stopwords and stemming */
public void testBasics() throws IOException {
- Analyzer a = new BasqueAnalyzer(TEST_VERSION_CURRENT);
+ Analyzer a = new BasqueAnalyzer();
// stemming
checkOneTerm(a, "zaldi", "zaldi");
checkOneTerm(a, "zaldiak", "zaldi");
@@ -42,8 +42,8 @@ public class TestBasqueAnalyzer extends
/** test use of exclusion set */
public void testExclude() throws IOException {
- CharArraySet exclusionSet = new CharArraySet(TEST_VERSION_CURRENT, asSet("zaldiak"), false);
- Analyzer a = new BasqueAnalyzer(TEST_VERSION_CURRENT,
+ CharArraySet exclusionSet = new CharArraySet( asSet("zaldiak"), false);
+ Analyzer a = new BasqueAnalyzer(
BasqueAnalyzer.getDefaultStopSet(), exclusionSet);
checkOneTerm(a, "zaldiak", "zaldiak");
checkOneTerm(a, "mendiari", "mendi");
@@ -51,6 +51,6 @@ public class TestBasqueAnalyzer extends
/** blast some random strings through the analyzer */
public void testRandomStrings() throws Exception {
- checkRandomData(random(), new BasqueAnalyzer(TEST_VERSION_CURRENT), 1000*RANDOM_MULTIPLIER);
+ checkRandomData(random(), new BasqueAnalyzer(), 1000*RANDOM_MULTIPLIER);
}
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianAnalyzer.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianAnalyzer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianAnalyzer.java Fri Aug 8 22:42:48 2014
@@ -31,7 +31,7 @@ public class TestPersianAnalyzer extends
* This test fails with NPE when the stopwords file is missing in classpath
*/
public void testResourcesAvailable() {
- new PersianAnalyzer(TEST_VERSION_CURRENT);
+ new PersianAnalyzer();
}
/**
@@ -42,7 +42,7 @@ public class TestPersianAnalyzer extends
* These verb forms are from http://en.wikipedia.org/wiki/Persian_grammar
*/
public void testBehaviorVerbs() throws Exception {
- Analyzer a = new PersianAnalyzer(TEST_VERSION_CURRENT);
+ Analyzer a = new PersianAnalyzer();
// active present indicative
assertAnalyzesTo(a, "Ù
ÛâØ®Ùرد", new String[] { "Ø®Ùرد" });
// active preterite indicative
@@ -118,7 +118,7 @@ public class TestPersianAnalyzer extends
* These verb forms are from http://en.wikipedia.org/wiki/Persian_grammar
*/
public void testBehaviorVerbsDefective() throws Exception {
- Analyzer a = new PersianAnalyzer(TEST_VERSION_CURRENT);
+ Analyzer a = new PersianAnalyzer();
// active present indicative
assertAnalyzesTo(a, "Ù
Ù Ø®Ùرد", new String[] { "Ø®Ùرد" });
// active preterite indicative
@@ -189,7 +189,7 @@ public class TestPersianAnalyzer extends
* nouns, removing the plural -ha.
*/
public void testBehaviorNouns() throws Exception {
- Analyzer a = new PersianAnalyzer(TEST_VERSION_CURRENT);
+ Analyzer a = new PersianAnalyzer();
assertAnalyzesTo(a, "برگ Ùا", new String[] { "برگ" });
assertAnalyzesTo(a, "برگâÙا", new String[] { "برگ" });
}
@@ -199,7 +199,7 @@ public class TestPersianAnalyzer extends
* (lowercased, etc)
*/
public void testBehaviorNonPersian() throws Exception {
- Analyzer a = new PersianAnalyzer(TEST_VERSION_CURRENT);
+ Analyzer a = new PersianAnalyzer();
assertAnalyzesTo(a, "English test.", new String[] { "english", "test" });
}
@@ -207,7 +207,7 @@ public class TestPersianAnalyzer extends
* Basic test ensuring that tokenStream works correctly.
*/
public void testReusableTokenStream() throws Exception {
- Analyzer a = new PersianAnalyzer(TEST_VERSION_CURRENT);
+ Analyzer a = new PersianAnalyzer();
assertAnalyzesTo(a, "Ø®Ùرد٠Ù
٠شد٠بÙد٠باشد", new String[] { "Ø®ÙردÙ" });
assertAnalyzesTo(a, "برگâÙا", new String[] { "برگ" });
}
@@ -216,14 +216,14 @@ public class TestPersianAnalyzer extends
* Test that custom stopwords work, and are not case-sensitive.
*/
public void testCustomStopwords() throws Exception {
- PersianAnalyzer a = new PersianAnalyzer(TEST_VERSION_CURRENT,
- new CharArraySet(TEST_VERSION_CURRENT, asSet("the", "and", "a"), false));
+ PersianAnalyzer a = new PersianAnalyzer(
+ new CharArraySet( asSet("the", "and", "a"), false));
assertAnalyzesTo(a, "The quick brown fox.", new String[] { "quick",
"brown", "fox" });
}
/** blast some random strings through the analyzer */
public void testRandomStrings() throws Exception {
- checkRandomData(random(), new PersianAnalyzer(TEST_VERSION_CURRENT), 1000*RANDOM_MULTIPLIER);
+ checkRandomData(random(), new PersianAnalyzer(), 1000*RANDOM_MULTIPLIER);
}
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/fi/TestFinnishAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/fi/TestFinnishAnalyzer.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/fi/TestFinnishAnalyzer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/fi/TestFinnishAnalyzer.java Fri Aug 8 22:42:48 2014
@@ -27,12 +27,12 @@ public class TestFinnishAnalyzer extends
/** This test fails with NPE when the
* stopwords file is missing in classpath */
public void testResourcesAvailable() {
- new FinnishAnalyzer(TEST_VERSION_CURRENT);
+ new FinnishAnalyzer();
}
/** test stopwords and stemming */
public void testBasics() throws IOException {
- Analyzer a = new FinnishAnalyzer(TEST_VERSION_CURRENT);
+ Analyzer a = new FinnishAnalyzer();
// stemming
checkOneTerm(a, "edeltäjiinsä", "edeltäj");
checkOneTerm(a, "edeltäjistään", "edeltäj");
@@ -42,8 +42,8 @@ public class TestFinnishAnalyzer extends
/** test use of exclusion set */
public void testExclude() throws IOException {
- CharArraySet exclusionSet = new CharArraySet(TEST_VERSION_CURRENT, asSet("edeltäjistään"), false);
- Analyzer a = new FinnishAnalyzer(TEST_VERSION_CURRENT,
+ CharArraySet exclusionSet = new CharArraySet( asSet("edeltäjistään"), false);
+ Analyzer a = new FinnishAnalyzer(
FinnishAnalyzer.getDefaultStopSet(), exclusionSet);
checkOneTerm(a, "edeltäjiinsä", "edeltäj");
checkOneTerm(a, "edeltäjistään", "edeltäjistään");
@@ -51,6 +51,6 @@ public class TestFinnishAnalyzer extends
/** blast some random strings through the analyzer */
public void testRandomStrings() throws Exception {
- checkRandomData(random(), new FinnishAnalyzer(TEST_VERSION_CURRENT), 1000*RANDOM_MULTIPLIER);
+ checkRandomData(random(), new FinnishAnalyzer(), 1000*RANDOM_MULTIPLIER);
}
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/fi/TestFinnishLightStemFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/fi/TestFinnishLightStemFilter.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/fi/TestFinnishLightStemFilter.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/fi/TestFinnishLightStemFilter.java Fri Aug 8 22:42:48 2014
@@ -48,7 +48,7 @@ public class TestFinnishLightStemFilter
}
public void testKeyword() throws IOException {
- final CharArraySet exclusionSet = new CharArraySet(TEST_VERSION_CURRENT, asSet("edeltäjistään"), false);
+ final CharArraySet exclusionSet = new CharArraySet( asSet("edeltäjistään"), false);
Analyzer a = new Analyzer() {
@Override
protected TokenStreamComponents createComponents(String fieldName) {
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchAnalyzer.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchAnalyzer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchAnalyzer.java Fri Aug 8 22:42:48 2014
@@ -22,7 +22,6 @@ import java.io.IOException;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.BaseTokenStreamTestCase;
import org.apache.lucene.analysis.util.CharArraySet;
-import org.apache.lucene.util.Version;
/**
* Test case for FrenchAnalyzer.
@@ -32,7 +31,7 @@ import org.apache.lucene.util.Version;
public class TestFrenchAnalyzer extends BaseTokenStreamTestCase {
public void testAnalyzer() throws Exception {
- FrenchAnalyzer fa = new FrenchAnalyzer(TEST_VERSION_CURRENT);
+ FrenchAnalyzer fa = new FrenchAnalyzer();
assertAnalyzesTo(fa, "", new String[] {
});
@@ -115,7 +114,7 @@ public class TestFrenchAnalyzer extends
}
public void testReusableTokenStream() throws Exception {
- FrenchAnalyzer fa = new FrenchAnalyzer(TEST_VERSION_CURRENT);
+ FrenchAnalyzer fa = new FrenchAnalyzer();
// stopwords
assertAnalyzesTo(
fa,
@@ -136,20 +135,20 @@ public class TestFrenchAnalyzer extends
}
public void testExclusionTableViaCtor() throws Exception {
- CharArraySet set = new CharArraySet(TEST_VERSION_CURRENT, 1, true);
+ CharArraySet set = new CharArraySet( 1, true);
set.add("habitable");
- FrenchAnalyzer fa = new FrenchAnalyzer(TEST_VERSION_CURRENT,
+ FrenchAnalyzer fa = new FrenchAnalyzer(
CharArraySet.EMPTY_SET, set);
assertAnalyzesTo(fa, "habitable chiste", new String[] { "habitable",
"chist" });
- fa = new FrenchAnalyzer(TEST_VERSION_CURRENT, CharArraySet.EMPTY_SET, set);
+ fa = new FrenchAnalyzer( CharArraySet.EMPTY_SET, set);
assertAnalyzesTo(fa, "habitable chiste", new String[] { "habitable",
"chist" });
}
public void testElision() throws Exception {
- FrenchAnalyzer fa = new FrenchAnalyzer(TEST_VERSION_CURRENT);
+ FrenchAnalyzer fa = new FrenchAnalyzer();
assertAnalyzesTo(fa, "voir l'embrouille", new String[] { "voir", "embrouil" });
}
@@ -157,18 +156,18 @@ public class TestFrenchAnalyzer extends
* Test that stopwords are not case sensitive
*/
public void testStopwordsCasing() throws IOException {
- FrenchAnalyzer a = new FrenchAnalyzer(TEST_VERSION_CURRENT);
+ FrenchAnalyzer a = new FrenchAnalyzer();
assertAnalyzesTo(a, "Votre", new String[] { });
}
/** blast some random strings through the analyzer */
public void testRandomStrings() throws Exception {
- checkRandomData(random(), new FrenchAnalyzer(TEST_VERSION_CURRENT), 1000*RANDOM_MULTIPLIER);
+ checkRandomData(random(), new FrenchAnalyzer(), 1000*RANDOM_MULTIPLIER);
}
/** test accent-insensitive */
public void testAccentInsensitive() throws Exception {
- Analyzer a = new FrenchAnalyzer(TEST_VERSION_CURRENT);
+ Analyzer a = new FrenchAnalyzer();
checkOneTerm(a, "sécuritaires", "securitair");
checkOneTerm(a, "securitaires", "securitair");
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchLightStemFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchLightStemFilter.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchLightStemFilter.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchLightStemFilter.java Fri Aug 8 22:42:48 2014
@@ -179,7 +179,7 @@ public class TestFrenchLightStemFilter e
}
public void testKeyword() throws IOException {
- final CharArraySet exclusionSet = new CharArraySet(TEST_VERSION_CURRENT, asSet("chevaux"), false);
+ final CharArraySet exclusionSet = new CharArraySet( asSet("chevaux"), false);
Analyzer a = new Analyzer() {
@Override
protected TokenStreamComponents createComponents(String fieldName) {
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchMinimalStemFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchMinimalStemFilter.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchMinimalStemFilter.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchMinimalStemFilter.java Fri Aug 8 22:42:48 2014
@@ -58,7 +58,7 @@ public class TestFrenchMinimalStemFilter
}
public void testKeyword() throws IOException {
- final CharArraySet exclusionSet = new CharArraySet(TEST_VERSION_CURRENT, asSet("chevaux"), false);
+ final CharArraySet exclusionSet = new CharArraySet( asSet("chevaux"), false);
Analyzer a = new Analyzer() {
@Override
protected TokenStreamComponents createComponents(String fieldName) {
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/ga/TestIrishAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/ga/TestIrishAnalyzer.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/ga/TestIrishAnalyzer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/ga/TestIrishAnalyzer.java Fri Aug 8 22:42:48 2014
@@ -27,12 +27,12 @@ public class TestIrishAnalyzer extends B
/** This test fails with NPE when the
* stopwords file is missing in classpath */
public void testResourcesAvailable() {
- new IrishAnalyzer(TEST_VERSION_CURRENT);
+ new IrishAnalyzer();
}
/** test stopwords and stemming */
public void testBasics() throws IOException {
- Analyzer a = new IrishAnalyzer(TEST_VERSION_CURRENT);
+ Analyzer a = new IrishAnalyzer();
// stemming
checkOneTerm(a, "siopadóireacht", "siopadóir");
checkOneTerm(a, "sÃceapatacha", "sÃceapaite");
@@ -42,15 +42,15 @@ public class TestIrishAnalyzer extends B
/** test use of elisionfilter */
public void testContractions() throws IOException {
- Analyzer a = new IrishAnalyzer(TEST_VERSION_CURRENT);
+ Analyzer a = new IrishAnalyzer();
assertAnalyzesTo(a, "b'fhearr m'athair",
new String[] { "fearr", "athair" });
}
/** test use of exclusion set */
public void testExclude() throws IOException {
- CharArraySet exclusionSet = new CharArraySet(TEST_VERSION_CURRENT, asSet("feirmeoireacht"), false);
- Analyzer a = new IrishAnalyzer(TEST_VERSION_CURRENT,
+ CharArraySet exclusionSet = new CharArraySet( asSet("feirmeoireacht"), false);
+ Analyzer a = new IrishAnalyzer(
IrishAnalyzer.getDefaultStopSet(), exclusionSet);
checkOneTerm(a, "feirmeoireacht", "feirmeoireacht");
checkOneTerm(a, "siopadóireacht", "siopadóir");
@@ -58,7 +58,7 @@ public class TestIrishAnalyzer extends B
/** test special hyphen handling */
public void testHyphens() throws IOException {
- Analyzer a = new IrishAnalyzer(TEST_VERSION_CURRENT);
+ Analyzer a = new IrishAnalyzer();
assertAnalyzesTo(a, "n-athair",
new String[] { "athair" },
new int[] { 2 });
@@ -66,6 +66,6 @@ public class TestIrishAnalyzer extends B
/** blast some random strings through the analyzer */
public void testRandomStrings() throws Exception {
- checkRandomData(random(), new IrishAnalyzer(TEST_VERSION_CURRENT), 1000*RANDOM_MULTIPLIER);
+ checkRandomData(random(), new IrishAnalyzer(), 1000*RANDOM_MULTIPLIER);
}
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianAnalyzer.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianAnalyzer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianAnalyzer.java Fri Aug 8 22:42:48 2014
@@ -27,12 +27,12 @@ public class TestGalicianAnalyzer extend
/** This test fails with NPE when the
* stopwords file is missing in classpath */
public void testResourcesAvailable() {
- new GalicianAnalyzer(TEST_VERSION_CURRENT);
+ new GalicianAnalyzer();
}
/** test stopwords and stemming */
public void testBasics() throws IOException {
- Analyzer a = new GalicianAnalyzer(TEST_VERSION_CURRENT);
+ Analyzer a = new GalicianAnalyzer();
// stemming
checkOneTerm(a, "correspondente", "correspond");
checkOneTerm(a, "corresponderá", "correspond");
@@ -42,8 +42,8 @@ public class TestGalicianAnalyzer extend
/** test use of exclusion set */
public void testExclude() throws IOException {
- CharArraySet exclusionSet = new CharArraySet(TEST_VERSION_CURRENT, asSet("correspondente"), false);
- Analyzer a = new GalicianAnalyzer(TEST_VERSION_CURRENT,
+ CharArraySet exclusionSet = new CharArraySet( asSet("correspondente"), false);
+ Analyzer a = new GalicianAnalyzer(
GalicianAnalyzer.getDefaultStopSet(), exclusionSet);
checkOneTerm(a, "correspondente", "correspondente");
checkOneTerm(a, "corresponderá", "correspond");
@@ -51,6 +51,6 @@ public class TestGalicianAnalyzer extend
/** blast some random strings through the analyzer */
public void testRandomStrings() throws Exception {
- checkRandomData(random(), new GalicianAnalyzer(TEST_VERSION_CURRENT), 1000*RANDOM_MULTIPLIER);
+ checkRandomData(random(), new GalicianAnalyzer(), 1000*RANDOM_MULTIPLIER);
}
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianMinimalStemFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianMinimalStemFilter.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianMinimalStemFilter.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianMinimalStemFilter.java Fri Aug 8 22:42:48 2014
@@ -54,7 +54,7 @@ public class TestGalicianMinimalStemFilt
}
public void testKeyword() throws IOException {
- final CharArraySet exclusionSet = new CharArraySet(TEST_VERSION_CURRENT, asSet("elefantes"), false);
+ final CharArraySet exclusionSet = new CharArraySet( asSet("elefantes"), false);
Analyzer a = new Analyzer() {
@Override
protected TokenStreamComponents createComponents(String fieldName) {
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiAnalyzer.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiAnalyzer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiAnalyzer.java Fri Aug 8 22:42:48 2014
@@ -28,25 +28,25 @@ public class TestHindiAnalyzer extends B
/** This test fails with NPE when the
* stopwords file is missing in classpath */
public void testResourcesAvailable() {
- new HindiAnalyzer(TEST_VERSION_CURRENT);
+ new HindiAnalyzer();
}
public void testBasics() throws Exception {
- Analyzer a = new HindiAnalyzer(TEST_VERSION_CURRENT);
+ Analyzer a = new HindiAnalyzer();
// two ways to write 'hindi' itself.
checkOneTerm(a, "हिनà¥à¤¦à¥", "हिà¤à¤¦");
checkOneTerm(a, "हिà¤à¤¦à¥", "हिà¤à¤¦");
}
public void testExclusionSet() throws Exception {
- CharArraySet exclusionSet = new CharArraySet(TEST_VERSION_CURRENT, asSet("हिà¤à¤¦à¥"), false);
- Analyzer a = new HindiAnalyzer(TEST_VERSION_CURRENT,
+ CharArraySet exclusionSet = new CharArraySet( asSet("हिà¤à¤¦à¥"), false);
+ Analyzer a = new HindiAnalyzer(
HindiAnalyzer.getDefaultStopSet(), exclusionSet);
checkOneTerm(a, "हिà¤à¤¦à¥", "हिà¤à¤¦à¥");
}
/** blast some random strings through the analyzer */
public void testRandomStrings() throws Exception {
- checkRandomData(random(), new HindiAnalyzer(TEST_VERSION_CURRENT), 1000*RANDOM_MULTIPLIER);
+ checkRandomData(random(), new HindiAnalyzer(), 1000*RANDOM_MULTIPLIER);
}
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianAnalyzer.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianAnalyzer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianAnalyzer.java Fri Aug 8 22:42:48 2014
@@ -27,12 +27,12 @@ public class TestHungarianAnalyzer exten
/** This test fails with NPE when the
* stopwords file is missing in classpath */
public void testResourcesAvailable() {
- new HungarianAnalyzer(TEST_VERSION_CURRENT);
+ new HungarianAnalyzer();
}
/** test stopwords and stemming */
public void testBasics() throws IOException {
- Analyzer a = new HungarianAnalyzer(TEST_VERSION_CURRENT);
+ Analyzer a = new HungarianAnalyzer();
// stemming
checkOneTerm(a, "babakocsi", "babakocs");
checkOneTerm(a, "babakocsijáért", "babakocs");
@@ -42,8 +42,8 @@ public class TestHungarianAnalyzer exten
/** test use of exclusion set */
public void testExclude() throws IOException {
- CharArraySet exclusionSet = new CharArraySet(TEST_VERSION_CURRENT, asSet("babakocsi"), false);
- Analyzer a = new HungarianAnalyzer(TEST_VERSION_CURRENT,
+ CharArraySet exclusionSet = new CharArraySet( asSet("babakocsi"), false);
+ Analyzer a = new HungarianAnalyzer(
HungarianAnalyzer.getDefaultStopSet(), exclusionSet);
checkOneTerm(a, "babakocsi", "babakocsi");
checkOneTerm(a, "babakocsijáért", "babakocs");
@@ -51,6 +51,6 @@ public class TestHungarianAnalyzer exten
/** blast some random strings through the analyzer */
public void testRandomStrings() throws Exception {
- checkRandomData(random(), new HungarianAnalyzer(TEST_VERSION_CURRENT), 1000*RANDOM_MULTIPLIER);
+ checkRandomData(random(), new HungarianAnalyzer(), 1000*RANDOM_MULTIPLIER);
}
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianLightStemFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianLightStemFilter.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianLightStemFilter.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianLightStemFilter.java Fri Aug 8 22:42:48 2014
@@ -49,7 +49,7 @@ public class TestHungarianLightStemFilte
}
public void testKeyword() throws IOException {
- final CharArraySet exclusionSet = new CharArraySet(TEST_VERSION_CURRENT, asSet("babakocsi"), false);
+ final CharArraySet exclusionSet = new CharArraySet( asSet("babakocsi"), false);
Analyzer a = new Analyzer() {
@Override
protected TokenStreamComponents createComponents(String fieldName) {
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestHunspellStemFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestHunspellStemFilter.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestHunspellStemFilter.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestHunspellStemFilter.java Fri Aug 8 22:42:48 2014
@@ -64,7 +64,7 @@ public class TestHunspellStemFilter exte
// assert with keyword marker
tokenizer = whitespaceMockTokenizer("lucene is awesome");
- CharArraySet set = new CharArraySet(TEST_VERSION_CURRENT, Arrays.asList("Lucene"), true);
+ CharArraySet set = new CharArraySet( Arrays.asList("Lucene"), true);
filter = new HunspellStemFilter(new SetKeywordMarkerFilter(tokenizer, set), dictionary);
assertTokenStreamContents(filter, new String[]{"lucene", "is", "awesome"}, new int[] {1, 1, 1});
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/hy/TestArmenianAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/hy/TestArmenianAnalyzer.java?rev=1616901&r1=1616900&r2=1616901&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/hy/TestArmenianAnalyzer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/hy/TestArmenianAnalyzer.java Fri Aug 8 22:42:48 2014
@@ -27,12 +27,12 @@ public class TestArmenianAnalyzer extend
/** This test fails with NPE when the
* stopwords file is missing in classpath */
public void testResourcesAvailable() {
- new ArmenianAnalyzer(TEST_VERSION_CURRENT);
+ new ArmenianAnalyzer();
}
/** test stopwords and stemming */
public void testBasics() throws IOException {
- Analyzer a = new ArmenianAnalyzer(TEST_VERSION_CURRENT);
+ Analyzer a = new ArmenianAnalyzer();
// stemming
checkOneTerm(a, "Õ¡ÖÕ®Õ«Õ¾", "Õ¡ÖÕ®");
checkOneTerm(a, "Õ¡ÖÕ®Õ«Õ¾Õ¶Õ¥Ö", "Õ¡ÖÕ®");
@@ -42,8 +42,8 @@ public class TestArmenianAnalyzer extend
/** test use of exclusion set */
public void testExclude() throws IOException {
- CharArraySet exclusionSet = new CharArraySet(TEST_VERSION_CURRENT, asSet("Õ¡ÖÕ®Õ«Õ¾Õ¶Õ¥Ö"), false);
- Analyzer a = new ArmenianAnalyzer(TEST_VERSION_CURRENT,
+ CharArraySet exclusionSet = new CharArraySet( asSet("Õ¡ÖÕ®Õ«Õ¾Õ¶Õ¥Ö"), false);
+ Analyzer a = new ArmenianAnalyzer(
ArmenianAnalyzer.getDefaultStopSet(), exclusionSet);
checkOneTerm(a, "Õ¡ÖÕ®Õ«Õ¾Õ¶Õ¥Ö", "Õ¡ÖÕ®Õ«Õ¾Õ¶Õ¥Ö");
checkOneTerm(a, "Õ¡ÖÕ®Õ«Õ¾", "Õ¡ÖÕ®");
@@ -51,6 +51,6 @@ public class TestArmenianAnalyzer extend
/** blast some random strings through the analyzer */
public void testRandomStrings() throws Exception {
- checkRandomData(random(), new ArmenianAnalyzer(TEST_VERSION_CURRENT), 1000*RANDOM_MULTIPLIER);
+ checkRandomData(random(), new ArmenianAnalyzer(), 1000*RANDOM_MULTIPLIER);
}
}