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/21 05:12:58 UTC
svn commit: r1619283 [6/11] - in /lucene/dev/branches/branch_4x: ./ lucene/
lucene/analysis/
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/o...
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestTypeTokenFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestTypeTokenFilter.java?rev=1619283&r1=1619282&r2=1619283&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestTypeTokenFilter.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestTypeTokenFilter.java Thu Aug 21 03:12:52 2014
@@ -37,7 +37,7 @@ 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>");
- TokenStream stream = new TypeTokenFilter(TEST_VERSION_CURRENT, true, new StandardTokenizer(TEST_VERSION_CURRENT, newAttributeFactory(), reader), stopTypes);
+ TokenStream stream = new TypeTokenFilter(Version.LATEST, true, new StandardTokenizer(newAttributeFactory(), reader), stopTypes);
assertTokenStreamContents(stream, new String[]{"is", "palindrome", "while", "is", "not"});
}
@@ -60,7 +60,7 @@ public class TestTypeTokenFilter extends
// with increments
StringReader reader = new StringReader(sb.toString());
- TypeTokenFilter typeTokenFilter = new TypeTokenFilter(TEST_VERSION_CURRENT, new StandardTokenizer(TEST_VERSION_CURRENT, reader), stopSet);
+ TypeTokenFilter typeTokenFilter = new TypeTokenFilter(Version.LATEST, new StandardTokenizer(reader), stopSet);
testPositons(typeTokenFilter);
// without increments
@@ -88,7 +88,7 @@ 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>");
- TokenStream stream = new TypeTokenFilter(TEST_VERSION_CURRENT, new StandardTokenizer(TEST_VERSION_CURRENT, newAttributeFactory(), reader), stopTypes, true);
+ TokenStream stream = new TypeTokenFilter(Version.LATEST, new StandardTokenizer(newAttributeFactory(), reader), stopTypes, true);
assertTokenStreamContents(stream, new String[]{"121", "123"});
}
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestTypeTokenFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestTypeTokenFilterFactory.java?rev=1619283&r1=1619282&r2=1619283&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestTypeTokenFilterFactory.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestTypeTokenFilterFactory.java Thu Aug 21 03:12:52 2014
@@ -20,6 +20,7 @@ package org.apache.lucene.analysis.core;
import org.apache.lucene.analysis.NumericTokenStream;
import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase;
import org.apache.lucene.analysis.util.TokenFilterFactory;
+import org.apache.lucene.util.Version;
import java.util.Set;
@@ -37,7 +38,7 @@ public class TestTypeTokenFilterFactory
assertTrue("types Size: " + types.size() + " is not: " + 2, types.size() == 2);
assertTrue("enablePositionIncrements was set to true but not correctly parsed", factory.isEnablePositionIncrements());
- factory = (TypeTokenFilterFactory) tokenFilterFactory("Type",
+ factory = (TypeTokenFilterFactory) tokenFilterFactory("Type", Version.LUCENE_4_3_0,
"types", "stoptypes-1.txt, stoptypes-2.txt",
"enablePositionIncrements", "false",
"useWhitelist", "true");
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestUAX29URLEmailAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestUAX29URLEmailAnalyzer.java?rev=1619283&r1=1619282&r2=1619283&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestUAX29URLEmailAnalyzer.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestUAX29URLEmailAnalyzer.java Thu Aug 21 03:12:52 2014
@@ -27,7 +27,7 @@ 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();
@@ -354,6 +354,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/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestUAX29URLEmailTokenizer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestUAX29URLEmailTokenizer.java?rev=1619283&r1=1619282&r2=1619283&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestUAX29URLEmailTokenizer.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestUAX29URLEmailTokenizer.java Thu Aug 21 03:12:52 2014
@@ -5,7 +5,6 @@ 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;
@@ -47,7 +46,7 @@ public class TestUAX29URLEmailTokenizer
sb.append(whitespace);
sb.append("testing 1234");
String input = sb.toString();
- UAX29URLEmailTokenizer tokenizer = new UAX29URLEmailTokenizer(TEST_VERSION_CURRENT, newAttributeFactory(), new StringReader(input));
+ UAX29URLEmailTokenizer tokenizer = new UAX29URLEmailTokenizer(newAttributeFactory(), new StringReader(input));
BaseTokenStreamTestCase.assertTokenStreamContents(tokenizer, new String[] { "testing", "1234" });
}
@@ -56,7 +55,7 @@ public class TestUAX29URLEmailTokenizer
protected TokenStreamComponents createComponents
(String fieldName, Reader reader) {
- Tokenizer tokenizer = new UAX29URLEmailTokenizer(TEST_VERSION_CURRENT, newAttributeFactory(), reader);
+ Tokenizer tokenizer = new UAX29URLEmailTokenizer(newAttributeFactory(), reader);
return new TokenStreamComponents(tokenizer);
}
};
@@ -103,7 +102,7 @@ public class TestUAX29URLEmailTokenizer
private Analyzer urlAnalyzer = new Analyzer() {
@Override
protected TokenStreamComponents createComponents(String fieldName, Reader reader) {
- UAX29URLEmailTokenizer tokenizer = new UAX29URLEmailTokenizer(TEST_VERSION_CURRENT, newAttributeFactory(), reader);
+ UAX29URLEmailTokenizer tokenizer = new UAX29URLEmailTokenizer(newAttributeFactory(), reader);
tokenizer.setMaxTokenLength(Integer.MAX_VALUE); // Tokenize arbitrary length URLs
TokenFilter filter = new URLFilter(tokenizer);
return new TokenStreamComponents(tokenizer, filter);
@@ -113,7 +112,7 @@ public class TestUAX29URLEmailTokenizer
private Analyzer emailAnalyzer = new Analyzer() {
@Override
protected TokenStreamComponents createComponents(String fieldName, Reader reader) {
- UAX29URLEmailTokenizer tokenizer = new UAX29URLEmailTokenizer(TEST_VERSION_CURRENT, newAttributeFactory(), reader);
+ UAX29URLEmailTokenizer tokenizer = new UAX29URLEmailTokenizer(newAttributeFactory(), reader);
TokenFilter filter = new EmailFilter(tokenizer);
return new TokenStreamComponents(tokenizer, filter);
}
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechAnalyzer.java?rev=1619283&r1=1619282&r2=1619283&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechAnalyzer.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechAnalyzer.java Thu Aug 21 03:12:52 2014
@@ -36,12 +36,12 @@ public class TestCzechAnalyzer extends B
*/
@Deprecated
public void testStopWordLegacy() throws Exception {
- assertAnalyzesTo(new CzechAnalyzer(Version.LUCENE_3_0), "Pokud mluvime o volnem",
+ assertAnalyzesTo(new CzechAnalyzer(Version.LUCENE_3_0), "Pokud mluvime o volnem",
new String[] { "mluvime", "volnem" });
}
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" });
}
@@ -56,20 +56,20 @@ public class TestCzechAnalyzer extends B
}
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/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechStemmer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechStemmer.java?rev=1619283&r1=1619282&r2=1619283&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechStemmer.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechStemmer.java Thu Aug 21 03:12:52 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");
CzechStemFilter filter = new CzechStemFilter(new SetKeywordMarkerFilter(
new MockTokenizer(new StringReader("hole desek"), MockTokenizer.WHITESPACE, false), set));
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/da/TestDanishAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/da/TestDanishAnalyzer.java?rev=1619283&r1=1619282&r2=1619283&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/da/TestDanishAnalyzer.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/da/TestDanishAnalyzer.java Thu Aug 21 03:12:52 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/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanAnalyzer.java?rev=1619283&r1=1619282&r2=1619283&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanAnalyzer.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanAnalyzer.java Thu Aug 21 03:12:52 2014
@@ -29,24 +29,24 @@ import org.apache.lucene.util.Version;
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");
GermanStemFilter filter = new GermanStemFilter(
- new SetKeywordMarkerFilter(new LowerCaseTokenizer(TEST_VERSION_CURRENT, new StringReader(
+ new SetKeywordMarkerFilter(new LowerCaseTokenizer(new StringReader(
"Fischen Trinken")), set));
assertTokenStreamContents(filter, new String[] { "fischen", "trink" });
}
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 LATEST, 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");
@@ -66,6 +66,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/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanLightStemFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanLightStemFilter.java?rev=1619283&r1=1619282&r2=1619283&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanLightStemFilter.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanLightStemFilter.java Thu Aug 21 03:12:52 2014
@@ -50,7 +50,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, Reader reader) {
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanMinimalStemFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanMinimalStemFilter.java?rev=1619283&r1=1619282&r2=1619283&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanMinimalStemFilter.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanMinimalStemFilter.java Thu Aug 21 03:12:52 2014
@@ -57,7 +57,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, Reader reader) {
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanStemFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanStemFilter.java?rev=1619283&r1=1619282&r2=1619283&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanStemFilter.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanStemFilter.java Thu Aug 21 03:12:52 2014
@@ -46,7 +46,7 @@ public class TestGermanStemFilter extend
Reader reader) {
Tokenizer t = new MockTokenizer(reader, MockTokenizer.KEYWORD, false);
return new TokenStreamComponents(t,
- new GermanStemFilter(new LowerCaseFilter(TEST_VERSION_CURRENT, t)));
+ new GermanStemFilter(new LowerCaseFilter(t)));
}
};
@@ -57,7 +57,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, Reader reader) {
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/GreekAnalyzerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/GreekAnalyzerTest.java?rev=1619283&r1=1619282&r2=1619283&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/GreekAnalyzerTest.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/GreekAnalyzerTest.java Thu Aug 21 03:12:52 2014
@@ -32,7 +32,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, "Îία εξαιÏεÏικά καλή και ÏλοÏÏια ÏειÏά ÏαÏακÏήÏÏν ÏÎ·Ï ÎÎ»Î»Î·Î½Î¹ÎºÎ®Ï Î³Î»ÏÏÏαÏ",
@@ -72,7 +72,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, "Îία εξαιÏεÏικά καλή και ÏλοÏÏια ÏειÏά ÏαÏακÏήÏÏν ÏÎ·Ï ÎÎ»Î»Î·Î½Î¹ÎºÎ®Ï Î³Î»ÏÏÏαÏ",
@@ -90,6 +90,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/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/TestGreekStemmer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/TestGreekStemmer.java?rev=1619283&r1=1619282&r2=1619283&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/TestGreekStemmer.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/TestGreekStemmer.java Thu Aug 21 03:12:52 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/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestEnglishAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestEnglishAnalyzer.java?rev=1619283&r1=1619282&r2=1619283&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestEnglishAnalyzer.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestEnglishAnalyzer.java Thu Aug 21 03:12:52 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/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestPorterStemFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestPorterStemFilter.java?rev=1619283&r1=1619282&r2=1619283&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestPorterStemFilter.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestPorterStemFilter.java Thu Aug 21 03:12:52 2014
@@ -54,7 +54,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(new StringReader("yourselves yours"), MockTokenizer.WHITESPACE, false);
TokenStream filter = new PorterStemFilter(new SetKeywordMarkerFilter(tokenizer, set));
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishAnalyzer.java?rev=1619283&r1=1619282&r2=1619283&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishAnalyzer.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishAnalyzer.java Thu Aug 21 03:12:52 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/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/eu/TestBasqueAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/eu/TestBasqueAnalyzer.java?rev=1619283&r1=1619282&r2=1619283&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/eu/TestBasqueAnalyzer.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/eu/TestBasqueAnalyzer.java Thu Aug 21 03:12:52 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/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianAnalyzer.java?rev=1619283&r1=1619282&r2=1619283&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianAnalyzer.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianAnalyzer.java Thu Aug 21 03:12:52 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/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/fi/TestFinnishAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/fi/TestFinnishAnalyzer.java?rev=1619283&r1=1619282&r2=1619283&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/fi/TestFinnishAnalyzer.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/fi/TestFinnishAnalyzer.java Thu Aug 21 03:12:52 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/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/fi/TestFinnishLightStemFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/fi/TestFinnishLightStemFilter.java?rev=1619283&r1=1619282&r2=1619283&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/fi/TestFinnishLightStemFilter.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/fi/TestFinnishLightStemFilter.java Thu Aug 21 03:12:52 2014
@@ -50,7 +50,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, Reader reader) {
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchAnalyzer.java?rev=1619283&r1=1619282&r2=1619283&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchAnalyzer.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchAnalyzer.java Thu Aug 21 03:12:52 2014
@@ -32,7 +32,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[] {
});
@@ -204,7 +204,7 @@ public class TestFrenchAnalyzer extends
}
public void testReusableTokenStream() throws Exception {
- FrenchAnalyzer fa = new FrenchAnalyzer(TEST_VERSION_CURRENT);
+ FrenchAnalyzer fa = new FrenchAnalyzer();
// stopwords
assertAnalyzesTo(
fa,
@@ -225,20 +225,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" });
}
@@ -263,12 +263,12 @@ public class TestFrenchAnalyzer extends
/** 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/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchLightStemFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchLightStemFilter.java?rev=1619283&r1=1619282&r2=1619283&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchLightStemFilter.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchLightStemFilter.java Thu Aug 21 03:12:52 2014
@@ -180,7 +180,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, Reader reader) {
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchMinimalStemFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchMinimalStemFilter.java?rev=1619283&r1=1619282&r2=1619283&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchMinimalStemFilter.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchMinimalStemFilter.java Thu Aug 21 03:12:52 2014
@@ -59,7 +59,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, Reader reader) {
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/ga/TestIrishAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/ga/TestIrishAnalyzer.java?rev=1619283&r1=1619282&r2=1619283&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/ga/TestIrishAnalyzer.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/ga/TestIrishAnalyzer.java Thu Aug 21 03:12:52 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/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianAnalyzer.java?rev=1619283&r1=1619282&r2=1619283&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianAnalyzer.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianAnalyzer.java Thu Aug 21 03:12:52 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/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianMinimalStemFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianMinimalStemFilter.java?rev=1619283&r1=1619282&r2=1619283&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianMinimalStemFilter.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianMinimalStemFilter.java Thu Aug 21 03:12:52 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, Reader reader) {
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiAnalyzer.java?rev=1619283&r1=1619282&r2=1619283&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiAnalyzer.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiAnalyzer.java Thu Aug 21 03:12:52 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/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianAnalyzer.java?rev=1619283&r1=1619282&r2=1619283&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianAnalyzer.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianAnalyzer.java Thu Aug 21 03:12:52 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/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianLightStemFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianLightStemFilter.java?rev=1619283&r1=1619282&r2=1619283&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianLightStemFilter.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianLightStemFilter.java Thu Aug 21 03:12:52 2014
@@ -50,7 +50,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, Reader reader) {
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestHunspellStemFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestHunspellStemFilter.java?rev=1619283&r1=1619282&r2=1619283&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestHunspellStemFilter.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestHunspellStemFilter.java Thu Aug 21 03:12:52 2014
@@ -65,7 +65,7 @@ public class TestHunspellStemFilter exte
// assert with keyword marker
tokenizer = new MockTokenizer(new StringReader("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/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/hy/TestArmenianAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/hy/TestArmenianAnalyzer.java?rev=1619283&r1=1619282&r2=1619283&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/hy/TestArmenianAnalyzer.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/hy/TestArmenianAnalyzer.java Thu Aug 21 03:12:52 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);
}
}
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/id/TestIndonesianAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/id/TestIndonesianAnalyzer.java?rev=1619283&r1=1619282&r2=1619283&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/id/TestIndonesianAnalyzer.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/id/TestIndonesianAnalyzer.java Thu Aug 21 03:12:52 2014
@@ -27,12 +27,12 @@ public class TestIndonesianAnalyzer exte
/** This test fails with NPE when the
* stopwords file is missing in classpath */
public void testResourcesAvailable() {
- new IndonesianAnalyzer(TEST_VERSION_CURRENT);
+ new IndonesianAnalyzer();
}
/** test stopwords and stemming */
public void testBasics() throws IOException {
- Analyzer a = new IndonesianAnalyzer(TEST_VERSION_CURRENT);
+ Analyzer a = new IndonesianAnalyzer();
// stemming
checkOneTerm(a, "peledakan", "ledak");
checkOneTerm(a, "pembunuhan", "bunuh");
@@ -42,8 +42,8 @@ public class TestIndonesianAnalyzer exte
/** test use of exclusion set */
public void testExclude() throws IOException {
- CharArraySet exclusionSet = new CharArraySet(TEST_VERSION_CURRENT, asSet("peledakan"), false);
- Analyzer a = new IndonesianAnalyzer(TEST_VERSION_CURRENT,
+ CharArraySet exclusionSet = new CharArraySet( asSet("peledakan"), false);
+ Analyzer a = new IndonesianAnalyzer(
IndonesianAnalyzer.getDefaultStopSet(), exclusionSet);
checkOneTerm(a, "peledakan", "peledakan");
checkOneTerm(a, "pembunuhan", "bunuh");
@@ -51,6 +51,6 @@ public class TestIndonesianAnalyzer exte
/** blast some random strings through the analyzer */
public void testRandomStrings() throws Exception {
- checkRandomData(random(), new IndonesianAnalyzer(TEST_VERSION_CURRENT), 1000*RANDOM_MULTIPLIER);
+ checkRandomData(random(), new IndonesianAnalyzer(), 1000*RANDOM_MULTIPLIER);
}
}
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/it/TestItalianAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/it/TestItalianAnalyzer.java?rev=1619283&r1=1619282&r2=1619283&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/it/TestItalianAnalyzer.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/it/TestItalianAnalyzer.java Thu Aug 21 03:12:52 2014
@@ -18,8 +18,6 @@ package org.apache.lucene.analysis.it;
*/
import java.io.IOException;
-import java.util.HashSet;
-import java.util.Set;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.BaseTokenStreamTestCase;
@@ -30,12 +28,12 @@ public class TestItalianAnalyzer extends
/** This test fails with NPE when the
* stopwords file is missing in classpath */
public void testResourcesAvailable() {
- new ItalianAnalyzer(TEST_VERSION_CURRENT);
+ new ItalianAnalyzer();
}
/** test stopwords and stemming */
public void testBasics() throws IOException {
- Analyzer a = new ItalianAnalyzer(TEST_VERSION_CURRENT);
+ Analyzer a = new ItalianAnalyzer();
// stemming
checkOneTerm(a, "abbandonata", "abbandonat");
checkOneTerm(a, "abbandonati", "abbandonat");
@@ -45,8 +43,8 @@ public class TestItalianAnalyzer extends
/** test use of exclusion set */
public void testExclude() throws IOException {
- CharArraySet exclusionSet = new CharArraySet(TEST_VERSION_CURRENT, asSet("abbandonata"), false);
- Analyzer a = new ItalianAnalyzer(TEST_VERSION_CURRENT,
+ CharArraySet exclusionSet = new CharArraySet( asSet("abbandonata"), false);
+ Analyzer a = new ItalianAnalyzer(
ItalianAnalyzer.getDefaultStopSet(), exclusionSet);
checkOneTerm(a, "abbandonata", "abbandonata");
checkOneTerm(a, "abbandonati", "abbandonat");
@@ -54,12 +52,12 @@ public class TestItalianAnalyzer extends
/** blast some random strings through the analyzer */
public void testRandomStrings() throws Exception {
- checkRandomData(random(), new ItalianAnalyzer(TEST_VERSION_CURRENT), 1000*RANDOM_MULTIPLIER);
+ checkRandomData(random(), new ItalianAnalyzer(), 1000*RANDOM_MULTIPLIER);
}
/** test that the elisionfilter is working */
public void testContractions() throws IOException {
- Analyzer a = new ItalianAnalyzer(TEST_VERSION_CURRENT);
+ Analyzer a = new ItalianAnalyzer();
assertAnalyzesTo(a, "dell'Italia", new String[] { "ital" });
assertAnalyzesTo(a, "l'Italiano", new String[] { "italian" });
}
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/lv/TestLatvianAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/lv/TestLatvianAnalyzer.java?rev=1619283&r1=1619282&r2=1619283&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/lv/TestLatvianAnalyzer.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/lv/TestLatvianAnalyzer.java Thu Aug 21 03:12:52 2014
@@ -27,12 +27,12 @@ public class TestLatvianAnalyzer extends
/** This test fails with NPE when the
* stopwords file is missing in classpath */
public void testResourcesAvailable() {
- new LatvianAnalyzer(TEST_VERSION_CURRENT);
+ new LatvianAnalyzer();
}
/** test stopwords and stemming */
public void testBasics() throws IOException {
- Analyzer a = new LatvianAnalyzer(TEST_VERSION_CURRENT);
+ Analyzer a = new LatvianAnalyzer();
// stemming
checkOneTerm(a, "tirgiem", "tirg");
checkOneTerm(a, "tirgus", "tirg");
@@ -42,8 +42,8 @@ public class TestLatvianAnalyzer extends
/** test use of exclusion set */
public void testExclude() throws IOException {
- CharArraySet exclusionSet = new CharArraySet(TEST_VERSION_CURRENT, asSet("tirgiem"), false);
- Analyzer a = new LatvianAnalyzer(TEST_VERSION_CURRENT,
+ CharArraySet exclusionSet = new CharArraySet( asSet("tirgiem"), false);
+ Analyzer a = new LatvianAnalyzer(
LatvianAnalyzer.getDefaultStopSet(), exclusionSet);
checkOneTerm(a, "tirgiem", "tirgiem");
checkOneTerm(a, "tirgus", "tirg");
@@ -51,6 +51,6 @@ public class TestLatvianAnalyzer extends
/** blast some random strings through the analyzer */
public void testRandomStrings() throws Exception {
- checkRandomData(random(), new LatvianAnalyzer(TEST_VERSION_CURRENT), 1000*RANDOM_MULTIPLIER);
+ checkRandomData(random(), new LatvianAnalyzer(), 1000*RANDOM_MULTIPLIER);
}
}
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestCapitalizationFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestCapitalizationFilter.java?rev=1619283&r1=1619282&r2=1619283&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestCapitalizationFilter.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestCapitalizationFilter.java Thu Aug 21 03:12:52 2014
@@ -38,7 +38,7 @@ import static org.apache.lucene.analysis
/** Tests {@link CapitalizationFilter} */
public class TestCapitalizationFilter extends BaseTokenStreamTestCase {
public void testCapitalization() throws Exception {
- CharArraySet keep = new CharArraySet(TEST_VERSION_CURRENT,
+ CharArraySet keep = new CharArraySet(
Arrays.asList("and", "the", "it", "BIG"), false);
assertCapitalizesTo("kiTTEN", new String[] { "Kitten" },
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestCodepointCountFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestCodepointCountFilter.java?rev=1619283&r1=1619282&r2=1619283&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestCodepointCountFilter.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestCodepointCountFilter.java Thu Aug 21 03:12:52 2014
@@ -34,7 +34,7 @@ public class TestCodepointCountFilter ex
public void testFilterWithPosIncr() throws Exception {
TokenStream stream = new MockTokenizer(
new StringReader("short toolong evenmuchlongertext a ab toolong foo"), MockTokenizer.WHITESPACE, false);
- CodepointCountFilter filter = new CodepointCountFilter(TEST_VERSION_CURRENT, stream, 2, 6);
+ CodepointCountFilter filter = new CodepointCountFilter(stream, 2, 6);
assertTokenStreamContents(filter,
new String[]{"short", "ab", "foo"},
new int[]{1, 4, 2}
@@ -46,7 +46,7 @@ public class TestCodepointCountFilter ex
@Override
protected TokenStreamComponents createComponents(String fieldName, Reader reader) {
Tokenizer tokenizer = new KeywordTokenizer(reader);
- return new TokenStreamComponents(tokenizer, new CodepointCountFilter(TEST_VERSION_CURRENT, tokenizer, 0, 5));
+ return new TokenStreamComponents(tokenizer, new CodepointCountFilter(tokenizer, 0, 5));
}
};
checkOneTerm(a, "", "");
@@ -65,7 +65,7 @@ public class TestCodepointCountFilter ex
}
boolean expected = count >= min && count <= max;
TokenStream stream = new KeywordTokenizer(new StringReader(text));
- stream = new CodepointCountFilter(TEST_VERSION_CURRENT, stream, min, max);
+ stream = new CodepointCountFilter(stream, min, max);
stream.reset();
assertEquals(expected, stream.incrementToken());
stream.end();
@@ -78,6 +78,6 @@ public class TestCodepointCountFilter ex
*/
@Test(expected = IllegalArgumentException.class)
public void testIllegalArguments() throws Exception {
- new CodepointCountFilter(TEST_VERSION_CURRENT, new MockTokenizer(new StringReader("accept only valid arguments"), MockTokenizer.WHITESPACE, false), 4, 1);
+ new CodepointCountFilter(whitespaceMockTokenizer("accept only valid arguments"), 4, 1);
}
}
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeepWordFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeepWordFilter.java?rev=1619283&r1=1619282&r2=1619283&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeepWordFilter.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeepWordFilter.java Thu Aug 21 03:12:52 2014
@@ -43,12 +43,12 @@ public class TestKeepWordFilter extends
// Test Stopwords
TokenStream stream = new MockTokenizer(new StringReader(input), MockTokenizer.WHITESPACE, false);
- stream = new KeepWordFilter(TEST_VERSION_CURRENT, stream, new CharArraySet(TEST_VERSION_CURRENT, words, true));
+ stream = new KeepWordFilter(stream, new CharArraySet( words, true));
assertTokenStreamContents(stream, new String[] { "aaa", "BBB" }, new int[] { 3, 2 });
// Now force case
stream = new MockTokenizer(new StringReader(input), MockTokenizer.WHITESPACE, false);
- stream = new KeepWordFilter(TEST_VERSION_CURRENT, stream, new CharArraySet(TEST_VERSION_CURRENT,words, false));
+ stream = new KeepWordFilter(stream, new CharArraySet(words, false));
assertTokenStreamContents(stream, new String[] { "aaa" }, new int[] { 3 });
// Test Stopwords
@@ -73,7 +73,7 @@ public class TestKeepWordFilter extends
@Override
protected TokenStreamComponents createComponents(String fieldName, Reader reader) {
Tokenizer tokenizer = new MockTokenizer(reader, MockTokenizer.WHITESPACE, false);
- TokenStream stream = new KeepWordFilter(TEST_VERSION_CURRENT, tokenizer, new CharArraySet(TEST_VERSION_CURRENT, words, true));
+ TokenStream stream = new KeepWordFilter(tokenizer, new CharArraySet( words, true));
return new TokenStreamComponents(tokenizer, stream);
}
};
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeywordMarkerFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeywordMarkerFilter.java?rev=1619283&r1=1619282&r2=1619283&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeywordMarkerFilter.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeywordMarkerFilter.java Thu Aug 21 03:12:52 2014
@@ -38,14 +38,14 @@ public class TestKeywordMarkerFilter ext
@Test
public void testSetFilterIncrementToken() throws IOException {
- CharArraySet set = new CharArraySet(TEST_VERSION_CURRENT, 5, true);
+ CharArraySet set = new CharArraySet( 5, true);
set.add("lucenefox");
String[] output = new String[] { "the", "quick", "brown", "LuceneFox",
"jumps" };
assertTokenStreamContents(new LowerCaseFilterMock(
new SetKeywordMarkerFilter(new MockTokenizer(new StringReader(
"The quIck browN LuceneFox Jumps"), MockTokenizer.WHITESPACE, false), set)), output);
- CharArraySet mixedCaseSet = new CharArraySet(TEST_VERSION_CURRENT, asSet("LuceneFox"), false);
+ CharArraySet mixedCaseSet = new CharArraySet( asSet("LuceneFox"), false);
assertTokenStreamContents(new LowerCaseFilterMock(
new SetKeywordMarkerFilter(new MockTokenizer(new StringReader(
"The quIck browN LuceneFox Jumps"), MockTokenizer.WHITESPACE, false), mixedCaseSet)), output);
@@ -77,8 +77,8 @@ public class TestKeywordMarkerFilter ext
new SetKeywordMarkerFilter(
new SetKeywordMarkerFilter(
new MockTokenizer(new StringReader("Dogs Trees Birds Houses"), MockTokenizer.WHITESPACE, false),
- new CharArraySet(TEST_VERSION_CURRENT, asSet("Birds", "Houses"), false)),
- new CharArraySet(TEST_VERSION_CURRENT, asSet("Dogs", "Trees"), false)));
+ new CharArraySet( asSet("Birds", "Houses"), false)),
+ new CharArraySet( asSet("Dogs", "Trees"), false)));
assertTokenStreamContents(ts, new String[] { "Dogs", "Trees", "Birds", "Houses" });
@@ -96,7 +96,7 @@ public class TestKeywordMarkerFilter ext
new PatternKeywordMarkerFilter(
new MockTokenizer(new StringReader("Dogs Trees Birds Houses"), MockTokenizer.WHITESPACE, false),
Pattern.compile("Birds|Houses")),
- new CharArraySet(TEST_VERSION_CURRENT, asSet("Dogs", "Trees"), false)));
+ new CharArraySet( asSet("Dogs", "Trees"), false)));
assertTokenStreamContents(ts, new String[] { "Dogs", "Trees", "Birds", "Houses" });
}
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLengthFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLengthFilter.java?rev=1619283&r1=1619282&r2=1619283&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLengthFilter.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLengthFilter.java Thu Aug 21 03:12:52 2014
@@ -48,7 +48,7 @@ public class TestLengthFilter extends Ba
public void testFilterWithPosIncr() throws Exception {
TokenStream stream = new MockTokenizer(
new StringReader("short toolong evenmuchlongertext a ab toolong foo"), MockTokenizer.WHITESPACE, false);
- LengthFilter filter = new LengthFilter(TEST_VERSION_CURRENT, stream, 2, 6);
+ LengthFilter filter = new LengthFilter(stream, 2, 6);
assertTokenStreamContents(filter,
new String[]{"short", "ab", "foo"},
new int[]{1, 4, 2}
@@ -60,7 +60,7 @@ public class TestLengthFilter extends Ba
@Override
protected TokenStreamComponents createComponents(String fieldName, Reader reader) {
Tokenizer tokenizer = new KeywordTokenizer(reader);
- return new TokenStreamComponents(tokenizer, new LengthFilter(TEST_VERSION_CURRENT, tokenizer, 0, 5));
+ return new TokenStreamComponents(tokenizer, new LengthFilter(tokenizer, 0, 5));
}
};
checkOneTerm(a, "", "");
@@ -71,6 +71,6 @@ public class TestLengthFilter extends Ba
*/
@Test(expected = IllegalArgumentException.class)
public void testIllegalArguments() throws Exception {
- new LengthFilter(TEST_VERSION_CURRENT, new MockTokenizer(new StringReader("accept only valid arguments")), -4, -1);
+ new LengthFilter(new MockTokenizer(new StringReader("accept only valid arguments")), -4, -1);
}
}
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLucene47WordDelimiterFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLucene47WordDelimiterFilter.java?rev=1619283&r1=1619282&r2=1619283&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLucene47WordDelimiterFilter.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLucene47WordDelimiterFilter.java Thu Aug 21 03:12:52 2014
@@ -215,7 +215,7 @@ public class TestLucene47WordDelimiterFi
@Test
public void testPositionIncrements() throws Exception {
final int flags = GENERATE_WORD_PARTS | GENERATE_NUMBER_PARTS | CATENATE_ALL | SPLIT_ON_CASE_CHANGE | SPLIT_ON_NUMERICS | STEM_ENGLISH_POSSESSIVE;
- final CharArraySet protWords = new CharArraySet(TEST_VERSION_CURRENT, new HashSet<>(Arrays.asList("NUTCH")), false);
+ final CharArraySet protWords = new CharArraySet(new HashSet<>(Arrays.asList("NUTCH")), false);
/* analyzer that uses whitespace + wdf */
Analyzer a = new Analyzer() {
@@ -304,8 +304,7 @@ public class TestLucene47WordDelimiterFi
@Override
public TokenStreamComponents createComponents(String field, Reader reader) {
Tokenizer tokenizer = new MockTokenizer(reader, MockTokenizer.WHITESPACE, false);
- StopFilter filter = new StopFilter(TEST_VERSION_CURRENT,
- tokenizer, StandardAnalyzer.STOP_WORDS_SET);
+ StopFilter filter = new StopFilter(tokenizer, StandardAnalyzer.STOP_WORDS_SET);
return new TokenStreamComponents(tokenizer, new Lucene47WordDelimiterFilter(filter, flags, protWords));
}
};
@@ -337,7 +336,7 @@ public class TestLucene47WordDelimiterFi
final int flags = random().nextInt(512);
final CharArraySet protectedWords;
if (random().nextBoolean()) {
- protectedWords = new CharArraySet(TEST_VERSION_CURRENT, new HashSet<>(Arrays.asList("a", "b", "cd")), false);
+ protectedWords = new CharArraySet(new HashSet<>(Arrays.asList("a", "b", "cd")), false);
} else {
protectedWords = null;
}
@@ -360,7 +359,7 @@ public class TestLucene47WordDelimiterFi
final int flags = i;
final CharArraySet protectedWords;
if (random.nextBoolean()) {
- protectedWords = new CharArraySet(TEST_VERSION_CURRENT, new HashSet<>(Arrays.asList("a", "b", "cd")), false);
+ protectedWords = new CharArraySet(new HashSet<>(Arrays.asList("a", "b", "cd")), false);
} else {
protectedWords = null;
}
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestPerFieldAnalyzerWrapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestPerFieldAnalyzerWrapper.java?rev=1619283&r1=1619282&r2=1619283&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestPerFieldAnalyzerWrapper.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestPerFieldAnalyzerWrapper.java Thu Aug 21 03:12:52 2014
@@ -40,10 +40,10 @@ public class TestPerFieldAnalyzerWrapper
String text = "Qwerty";
Map<String,Analyzer> analyzerPerField =
- Collections.<String,Analyzer>singletonMap("special", new SimpleAnalyzer(TEST_VERSION_CURRENT));
+ Collections.<String,Analyzer>singletonMap("special", new SimpleAnalyzer());
PerFieldAnalyzerWrapper analyzer =
- new PerFieldAnalyzerWrapper(new WhitespaceAnalyzer(TEST_VERSION_CURRENT), analyzerPerField);
+ new PerFieldAnalyzerWrapper(new WhitespaceAnalyzer(), analyzerPerField);
TokenStream tokenStream = analyzer.tokenStream("field", text);
try {
@@ -79,8 +79,8 @@ public class TestPerFieldAnalyzerWrapper
public void testReuseWrapped() throws Exception {
final String text = "Qwerty";
- final Analyzer specialAnalyzer = new SimpleAnalyzer(TEST_VERSION_CURRENT);
- final Analyzer defaultAnalyzer = new WhitespaceAnalyzer(TEST_VERSION_CURRENT);
+ final Analyzer specialAnalyzer = new SimpleAnalyzer();
+ final Analyzer defaultAnalyzer = new WhitespaceAnalyzer();
TokenStream ts1, ts2, ts3, ts4;
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestStemmerOverrideFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestStemmerOverrideFilter.java?rev=1619283&r1=1619282&r2=1619283&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestStemmerOverrideFilter.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestStemmerOverrideFilter.java Thu Aug 21 03:12:52 2014
@@ -105,8 +105,7 @@ public class TestStemmerOverrideFilter e
output.add(entry.getValue());
}
}
- Tokenizer tokenizer = new WhitespaceTokenizer(TEST_VERSION_CURRENT,
- new StringReader(input.toString()));
+ Tokenizer tokenizer = new WhitespaceTokenizer(new StringReader(input.toString()));
TokenStream stream = new PorterStemFilter(new StemmerOverrideFilter(
tokenizer, builder.build()));
assertTokenStreamContents(stream, output.toArray(new String[0]));