You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ch...@apache.org on 2012/05/10 03:06:46 UTC
svn commit: r1336462 [1/2] - in /lucene/dev/trunk/solr:
contrib/analysis-extras/src/test/org/apache/solr/analysis/
core/src/test/org/apache/solr/analysis/
test-framework/src/java/org/apache/solr/analysis/
Author: chrism
Date: Thu May 10 01:06:43 2012
New Revision: 1336462
URL: http://svn.apache.org/viewvc?rev=1336462&view=rev
Log:
LUCENE-2510: Simplified analysis factory test hierarchy
Removed:
lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/analysis/BaseTokenTestCase.java
Modified:
lucene/dev/trunk/solr/contrib/analysis-extras/src/test/org/apache/solr/analysis/TestICUCollationKeyFilterFactory.java
lucene/dev/trunk/solr/contrib/analysis-extras/src/test/org/apache/solr/analysis/TestICUFoldingFilterFactory.java
lucene/dev/trunk/solr/contrib/analysis-extras/src/test/org/apache/solr/analysis/TestICUNormalizer2FilterFactory.java
lucene/dev/trunk/solr/contrib/analysis-extras/src/test/org/apache/solr/analysis/TestICUTokenizerFactory.java
lucene/dev/trunk/solr/contrib/analysis-extras/src/test/org/apache/solr/analysis/TestICUTransformFilterFactory.java
lucene/dev/trunk/solr/contrib/analysis-extras/src/test/org/apache/solr/analysis/TestMorfologikFilterFactory.java
lucene/dev/trunk/solr/contrib/analysis-extras/src/test/org/apache/solr/analysis/TestSmartChineseFactories.java
lucene/dev/trunk/solr/contrib/analysis-extras/src/test/org/apache/solr/analysis/TestStempelPolishStemFilterFactory.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/CommonGramsFilterFactoryTest.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/CommonGramsQueryFilterFactoryTest.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/DoubleMetaphoneFilterFactoryTest.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/LengthFilterTest.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/SnowballPorterFilterFactoryTest.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestArabicFilters.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestBeiderMorseFilterFactory.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestBrazilianStemFilterFactory.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestBulgarianStemFilterFactory.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestCJKBigramFilterFactory.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestCJKTokenizerFactory.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestCJKWidthFilterFactory.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestCapitalizationFilterFactory.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestChineseFilterFactory.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestChineseTokenizerFactory.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestCollationKeyFilterFactory.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestCzechStemFilterFactory.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestDelimitedPayloadTokenFilterFactory.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestDictionaryCompoundWordTokenFilterFactory.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestElisionFilterFactory.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestEnglishMinimalStemFilterFactory.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestFinnishLightStemFilterFactory.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestFrenchLightStemFilterFactory.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestFrenchMinimalStemFilterFactory.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestGalicianMinimalStemFilterFactory.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestGalicianStemFilterFactory.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestGermanLightStemFilterFactory.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestGermanMinimalStemFilterFactory.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestGermanNormalizationFilterFactory.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestGermanStemFilterFactory.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestGreekLowerCaseFilterFactory.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestGreekStemFilterFactory.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestHTMLStripCharFilterFactory.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestHindiFilters.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestHungarianLightStemFilterFactory.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestHunspellStemFilterFactory.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestHyphenationCompoundWordTokenFilterFactory.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestIndonesianStemFilterFactory.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestIrishLowerCaseFilterFactory.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestItalianLightStemFilterFactory.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestJapaneseBaseFormFilterFactory.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestJapanesePartOfSpeechStopFilterFactory.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestJapaneseTokenizerFactory.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestKStemFilterFactory.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestKeepFilterFactory.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestKeywordMarkerFilterFactory.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestLatvianStemFilterFactory.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestMultiWordSynonyms.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestNGramFilters.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestNorwegianLightStemFilterFactory.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestNorwegianMinimalStemFilterFactory.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestPatternReplaceCharFilterFactory.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestPatternReplaceFilterFactory.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestPatternTokenizerFactory.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestPersianNormalizationFilterFactory.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestPhoneticFilterFactory.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestPorterStemFilterFactory.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestPortugueseLightStemFilterFactory.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestPortugueseMinimalStemFilterFactory.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestPortugueseStemFilterFactory.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestRemoveDuplicatesTokenFilterFactory.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestReverseStringFilterFactory.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestReversedWildcardFilterFactory.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestRussianFilters.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestRussianLightStemFilterFactory.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestShingleFilterFactory.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestSpanishLightStemFilterFactory.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestStandardFactories.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestStemmerOverrideFilterFactory.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestStopFilterFactory.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestSwedishLightStemFilterFactory.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestSynonymFilterFactory.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestThaiWordFilterFactory.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestTrimFilterFactory.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestTurkishLowerCaseFilterFactory.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestTypeTokenFilterFactory.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestUAX29URLEmailTokenizerFactory.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestWikipediaTokenizerFactory.java
Modified: lucene/dev/trunk/solr/contrib/analysis-extras/src/test/org/apache/solr/analysis/TestICUCollationKeyFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/analysis-extras/src/test/org/apache/solr/analysis/TestICUCollationKeyFilterFactory.java?rev=1336462&r1=1336461&r2=1336462&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/analysis-extras/src/test/org/apache/solr/analysis/TestICUCollationKeyFilterFactory.java (original)
+++ lucene/dev/trunk/solr/contrib/analysis-extras/src/test/org/apache/solr/analysis/TestICUCollationKeyFilterFactory.java Thu May 10 01:06:43 2012
@@ -22,6 +22,7 @@ import java.io.StringReader;
import java.util.HashMap;
import java.util.Map;
+import org.apache.lucene.analysis.BaseTokenStreamTestCase;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.core.KeywordTokenizer;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
@@ -31,7 +32,7 @@ import com.ibm.icu.text.RuleBasedCollato
import com.ibm.icu.util.ULocale;
@Deprecated
-public class TestICUCollationKeyFilterFactory extends BaseTokenTestCase {
+public class TestICUCollationKeyFilterFactory extends BaseTokenStreamTestCase {
/*
* Turkish has some funny casing.
Modified: lucene/dev/trunk/solr/contrib/analysis-extras/src/test/org/apache/solr/analysis/TestICUFoldingFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/analysis-extras/src/test/org/apache/solr/analysis/TestICUFoldingFilterFactory.java?rev=1336462&r1=1336461&r2=1336462&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/analysis-extras/src/test/org/apache/solr/analysis/TestICUFoldingFilterFactory.java (original)
+++ lucene/dev/trunk/solr/contrib/analysis-extras/src/test/org/apache/solr/analysis/TestICUFoldingFilterFactory.java Thu May 10 01:06:43 2012
@@ -20,19 +20,20 @@ package org.apache.solr.analysis;
import java.io.Reader;
import java.io.StringReader;
+import org.apache.lucene.analysis.BaseTokenStreamTestCase;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.core.WhitespaceTokenizer;
/** basic tests for {@link ICUFoldingFilterFactory} */
-public class TestICUFoldingFilterFactory extends BaseTokenTestCase {
+public class TestICUFoldingFilterFactory extends BaseTokenStreamTestCase {
/** basic tests to ensure the folding is working */
public void test() throws Exception {
Reader reader = new StringReader("Résumé");
ICUFoldingFilterFactory factory = new ICUFoldingFilterFactory();
- factory.setLuceneMatchVersion(DEFAULT_VERSION);
- Tokenizer tokenizer = new WhitespaceTokenizer(DEFAULT_VERSION, reader);
+ factory.setLuceneMatchVersion(TEST_VERSION_CURRENT);
+ Tokenizer tokenizer = new WhitespaceTokenizer(TEST_VERSION_CURRENT, reader);
TokenStream stream = factory.create(tokenizer);
assertTokenStreamContents(stream, new String[] { "resume" });
}
Modified: lucene/dev/trunk/solr/contrib/analysis-extras/src/test/org/apache/solr/analysis/TestICUNormalizer2FilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/analysis-extras/src/test/org/apache/solr/analysis/TestICUNormalizer2FilterFactory.java?rev=1336462&r1=1336461&r2=1336462&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/analysis-extras/src/test/org/apache/solr/analysis/TestICUNormalizer2FilterFactory.java (original)
+++ lucene/dev/trunk/solr/contrib/analysis-extras/src/test/org/apache/solr/analysis/TestICUNormalizer2FilterFactory.java Thu May 10 01:06:43 2012
@@ -19,21 +19,25 @@ package org.apache.solr.analysis;
import java.io.Reader;
import java.io.StringReader;
+import java.util.Collections;
+import java.util.Map;
+import org.apache.lucene.analysis.BaseTokenStreamTestCase;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.core.WhitespaceTokenizer;
/** basic tests for {@link ICUNormalizer2FilterFactory} */
-public class TestICUNormalizer2FilterFactory extends BaseTokenTestCase {
+public class TestICUNormalizer2FilterFactory extends BaseTokenStreamTestCase {
/** Test nfkc_cf defaults */
public void testDefaults() throws Exception {
Reader reader = new StringReader("This is a ï¼´ï½
ï½ï½");
ICUNormalizer2FilterFactory factory = new ICUNormalizer2FilterFactory();
- factory.setLuceneMatchVersion(DEFAULT_VERSION);
- factory.init(EMPTY_PARAMS);
- Tokenizer tokenizer = new WhitespaceTokenizer(DEFAULT_VERSION, reader);
+ factory.setLuceneMatchVersion(TEST_VERSION_CURRENT);
+ Map<String, String> args = Collections.emptyMap();
+ factory.init(args);
+ Tokenizer tokenizer = new WhitespaceTokenizer(TEST_VERSION_CURRENT, reader);
TokenStream stream = factory.create(tokenizer);
assertTokenStreamContents(stream, new String[] { "this", "is", "a", "test" });
}
Modified: lucene/dev/trunk/solr/contrib/analysis-extras/src/test/org/apache/solr/analysis/TestICUTokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/analysis-extras/src/test/org/apache/solr/analysis/TestICUTokenizerFactory.java?rev=1336462&r1=1336461&r2=1336462&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/analysis-extras/src/test/org/apache/solr/analysis/TestICUTokenizerFactory.java (original)
+++ lucene/dev/trunk/solr/contrib/analysis-extras/src/test/org/apache/solr/analysis/TestICUTokenizerFactory.java Thu May 10 01:06:43 2012
@@ -20,10 +20,11 @@ package org.apache.solr.analysis;
import java.io.Reader;
import java.io.StringReader;
+import org.apache.lucene.analysis.BaseTokenStreamTestCase;
import org.apache.lucene.analysis.TokenStream;
/** basic tests for {@link ICUTokenizerFactory} **/
-public class TestICUTokenizerFactory extends BaseTokenTestCase {
+public class TestICUTokenizerFactory extends BaseTokenStreamTestCase {
public void testMixedText() throws Exception {
Reader reader = new StringReader("à¸à¸²à¸£à¸à¸µà¹à¹à¸à¹à¸à¹à¸à¸à¹à¸ªà¸à¸à¸§à¹à¸²à¸à¸²à¸à¸à¸µ This is a test àºàº§à»àº²àºàºàº");
ICUTokenizerFactory factory = new ICUTokenizerFactory();
Modified: lucene/dev/trunk/solr/contrib/analysis-extras/src/test/org/apache/solr/analysis/TestICUTransformFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/analysis-extras/src/test/org/apache/solr/analysis/TestICUTransformFilterFactory.java?rev=1336462&r1=1336461&r2=1336462&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/analysis-extras/src/test/org/apache/solr/analysis/TestICUTransformFilterFactory.java (original)
+++ lucene/dev/trunk/solr/contrib/analysis-extras/src/test/org/apache/solr/analysis/TestICUTransformFilterFactory.java Thu May 10 01:06:43 2012
@@ -22,12 +22,13 @@ import java.io.StringReader;
import java.util.HashMap;
import java.util.Map;
+import org.apache.lucene.analysis.BaseTokenStreamTestCase;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.core.WhitespaceTokenizer;
/** basic tests for {@link ICUTransformFilterFactory} */
-public class TestICUTransformFilterFactory extends BaseTokenTestCase {
+public class TestICUTransformFilterFactory extends BaseTokenStreamTestCase {
/** ensure the transform is working */
public void test() throws Exception {
@@ -36,7 +37,7 @@ public class TestICUTransformFilterFacto
Map<String,String> args = new HashMap<String,String>();
args.put("id", "Traditional-Simplified");
factory.init(args);
- Tokenizer tokenizer = new WhitespaceTokenizer(DEFAULT_VERSION, reader);
+ Tokenizer tokenizer = new WhitespaceTokenizer(TEST_VERSION_CURRENT, reader);
TokenStream stream = factory.create(tokenizer);
assertTokenStreamContents(stream, new String[] { "ç®åå" });
}
@@ -49,7 +50,7 @@ public class TestICUTransformFilterFacto
Map<String,String> args = new HashMap<String,String>();
args.put("id", "Cyrillic-Latin");
factory.init(args);
- Tokenizer tokenizer = new WhitespaceTokenizer(DEFAULT_VERSION, reader);
+ Tokenizer tokenizer = new WhitespaceTokenizer(TEST_VERSION_CURRENT, reader);
TokenStream stream = factory.create(tokenizer);
assertTokenStreamContents(stream, new String[] { "Rossijskaâ", "Federaciâ" });
@@ -57,7 +58,7 @@ public class TestICUTransformFilterFacto
reader = new StringReader("Rossijskaâ Federaciâ");
args.put("direction", "reverse");
factory.init(args);
- tokenizer = new WhitespaceTokenizer(DEFAULT_VERSION, reader);
+ tokenizer = new WhitespaceTokenizer(TEST_VERSION_CURRENT, reader);
stream = factory.create(tokenizer);
assertTokenStreamContents(stream, new String[] { "РоÑÑийÑкаÑ", "ФедеÑаÑиÑ" });
}
Modified: lucene/dev/trunk/solr/contrib/analysis-extras/src/test/org/apache/solr/analysis/TestMorfologikFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/analysis-extras/src/test/org/apache/solr/analysis/TestMorfologikFilterFactory.java?rev=1336462&r1=1336461&r2=1336462&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/analysis-extras/src/test/org/apache/solr/analysis/TestMorfologikFilterFactory.java (original)
+++ lucene/dev/trunk/solr/contrib/analysis-extras/src/test/org/apache/solr/analysis/TestMorfologikFilterFactory.java Thu May 10 01:06:43 2012
@@ -4,6 +4,7 @@ import java.io.StringReader;
import java.util.HashMap;
import java.util.Map;
+import org.apache.lucene.analysis.BaseTokenStreamTestCase;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.core.WhitespaceTokenizer;
import org.apache.solr.schema.IndexSchema;
@@ -28,16 +29,16 @@ import org.apache.solr.schema.IndexSchem
/**
* Test for {@link MorfologikFilterFactory}.
*/
-public class TestMorfologikFilterFactory extends BaseTokenTestCase {
+public class TestMorfologikFilterFactory extends BaseTokenStreamTestCase {
public void testCreateDictionary() throws Exception {
StringReader reader = new StringReader("rowery bilety");
Map<String,String> initParams = new HashMap<String,String>();
initParams.put(MorfologikFilterFactory.DICTIONARY_SCHEMA_ATTRIBUTE,
"morfologik");
MorfologikFilterFactory factory = new MorfologikFilterFactory();
- factory.setLuceneMatchVersion(DEFAULT_VERSION);
+ factory.setLuceneMatchVersion(TEST_VERSION_CURRENT);
factory.init(initParams);
- TokenStream ts = factory.create(new WhitespaceTokenizer(DEFAULT_VERSION,
+ TokenStream ts = factory.create(new WhitespaceTokenizer(TEST_VERSION_CURRENT,
reader));
assertTokenStreamContents(ts, new String[] {"rower", "bilet"});
}
Modified: lucene/dev/trunk/solr/contrib/analysis-extras/src/test/org/apache/solr/analysis/TestSmartChineseFactories.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/analysis-extras/src/test/org/apache/solr/analysis/TestSmartChineseFactories.java?rev=1336462&r1=1336461&r2=1336462&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/analysis-extras/src/test/org/apache/solr/analysis/TestSmartChineseFactories.java (original)
+++ lucene/dev/trunk/solr/contrib/analysis-extras/src/test/org/apache/solr/analysis/TestSmartChineseFactories.java Thu May 10 01:06:43 2012
@@ -19,6 +19,7 @@ package org.apache.solr.analysis;
import java.io.StringReader;
+import org.apache.lucene.analysis.BaseTokenStreamTestCase;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.core.WhitespaceTokenizer;
@@ -27,11 +28,11 @@ import org.apache.lucene.analysis.core.W
* Tests for {@link SmartChineseSentenceTokenizerFactory} and
* {@link SmartChineseWordTokenFilterFactory}
*/
-public class TestSmartChineseFactories extends BaseTokenTestCase {
+public class TestSmartChineseFactories extends BaseTokenStreamTestCase {
/** Test showing the behavior with whitespace */
public void testSimple() throws Exception {
String sentence = "æè´ä¹°äºéå
·åæè£
ã";
- WhitespaceTokenizer ws = new WhitespaceTokenizer(DEFAULT_VERSION, new StringReader(sentence));
+ WhitespaceTokenizer ws = new WhitespaceTokenizer(TEST_VERSION_CURRENT, new StringReader(sentence));
SmartChineseWordTokenFilterFactory factory = new SmartChineseWordTokenFilterFactory();
TokenStream ts = factory.create(ws);
// TODO: fix smart chinese to not emit punctuation tokens
Modified: lucene/dev/trunk/solr/contrib/analysis-extras/src/test/org/apache/solr/analysis/TestStempelPolishStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/analysis-extras/src/test/org/apache/solr/analysis/TestStempelPolishStemFilterFactory.java?rev=1336462&r1=1336461&r2=1336462&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/analysis-extras/src/test/org/apache/solr/analysis/TestStempelPolishStemFilterFactory.java (original)
+++ lucene/dev/trunk/solr/contrib/analysis-extras/src/test/org/apache/solr/analysis/TestStempelPolishStemFilterFactory.java Thu May 10 01:06:43 2012
@@ -2,6 +2,7 @@ package org.apache.solr.analysis;
import java.io.StringReader;
+import org.apache.lucene.analysis.BaseTokenStreamTestCase;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.core.WhitespaceTokenizer;
import org.apache.solr.core.SolrResourceLoader;
@@ -26,12 +27,12 @@ import org.apache.solr.core.SolrResource
/**
* Tests for {@link StempelPolishStemFilterFactory}
*/
-public class TestStempelPolishStemFilterFactory extends BaseTokenTestCase {
+public class TestStempelPolishStemFilterFactory extends BaseTokenStreamTestCase {
public void testBasics() throws Exception {
StringReader document = new StringReader("studenta studenci");
StempelPolishStemFilterFactory factory = new StempelPolishStemFilterFactory();
factory.inform(new SolrResourceLoader(null, null));
- TokenStream ts = factory.create(new WhitespaceTokenizer(DEFAULT_VERSION, document));
+ TokenStream ts = factory.create(new WhitespaceTokenizer(TEST_VERSION_CURRENT, document));
assertTokenStreamContents(ts,
new String[] { "student", "student" });
}
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/CommonGramsFilterFactoryTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/CommonGramsFilterFactoryTest.java?rev=1336462&r1=1336461&r2=1336462&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/CommonGramsFilterFactoryTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/CommonGramsFilterFactoryTest.java Thu May 10 01:06:43 2012
@@ -17,6 +17,7 @@ package org.apache.solr.analysis;
* limitations under the License.
*/
+import org.apache.lucene.analysis.BaseTokenStreamTestCase;
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.Tokenizer;
@@ -25,6 +26,7 @@ import org.apache.lucene.analysis.util.R
import org.apache.solr.core.SolrResourceLoader;
import java.io.StringReader;
+import java.util.Collections;
import java.util.Map;
import java.util.HashMap;
@@ -33,7 +35,7 @@ import java.util.HashMap;
* used by the StopFilterFactoryTest TODO: consider creating separate test files
* so this won't break if stop filter test files change
**/
-public class CommonGramsFilterFactoryTest extends BaseTokenTestCase {
+public class CommonGramsFilterFactoryTest extends BaseTokenStreamTestCase {
public void testInform() throws Exception {
ResourceLoader loader = new SolrResourceLoader(null, null);
@@ -42,7 +44,7 @@ public class CommonGramsFilterFactoryTes
Map<String, String> args = new HashMap<String, String>();
args.put("words", "stop-1.txt");
args.put("ignoreCase", "true");
- factory.setLuceneMatchVersion(DEFAULT_VERSION);
+ factory.setLuceneMatchVersion(TEST_VERSION_CURRENT);
factory.init(args);
factory.inform(loader);
CharArraySet words = factory.getCommonWords();
@@ -54,7 +56,7 @@ public class CommonGramsFilterFactoryTes
factory = new CommonGramsFilterFactory();
args.put("words", "stop-1.txt, stop-2.txt");
- factory.setLuceneMatchVersion(DEFAULT_VERSION);
+ factory.setLuceneMatchVersion(TEST_VERSION_CURRENT);
factory.init(args);
factory.inform(loader);
words = factory.getCommonWords();
@@ -67,7 +69,7 @@ public class CommonGramsFilterFactoryTes
factory = new CommonGramsFilterFactory();
args.put("words", "stop-snowball.txt");
args.put("format", "snowball");
- factory.setLuceneMatchVersion(DEFAULT_VERSION);
+ factory.setLuceneMatchVersion(TEST_VERSION_CURRENT);
factory.init(args);
factory.inform(loader);
words = factory.getCommonWords();
@@ -89,8 +91,9 @@ public class CommonGramsFilterFactoryTes
ResourceLoader loader = new SolrResourceLoader(null, null);
assertTrue("loader is null and it shouldn't be", loader != null);
CommonGramsFilterFactory factory = new CommonGramsFilterFactory();
- factory.setLuceneMatchVersion(DEFAULT_VERSION);
- factory.init(EMPTY_PARAMS);
+ factory.setLuceneMatchVersion(TEST_VERSION_CURRENT);
+ Map<String, String> args = Collections.emptyMap();
+ factory.init(args);
factory.inform(loader);
CharArraySet words = factory.getCommonWords();
assertTrue("words is null and it shouldn't be", words != null);
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/CommonGramsQueryFilterFactoryTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/CommonGramsQueryFilterFactoryTest.java?rev=1336462&r1=1336461&r2=1336462&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/CommonGramsQueryFilterFactoryTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/CommonGramsQueryFilterFactoryTest.java Thu May 10 01:06:43 2012
@@ -16,6 +16,7 @@
*/
package org.apache.solr.analysis;
+import org.apache.lucene.analysis.BaseTokenStreamTestCase;
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.Tokenizer;
@@ -24,6 +25,7 @@ import org.apache.lucene.analysis.util.R
import org.apache.solr.core.SolrResourceLoader;
import java.io.StringReader;
+import java.util.Collections;
import java.util.Map;
import java.util.HashMap;
@@ -32,7 +34,7 @@ import java.util.HashMap;
* used by the StopFilterFactoryTest TODO: consider creating separate test files
* so this won't break if stop filter test files change
**/
-public class CommonGramsQueryFilterFactoryTest extends BaseTokenTestCase {
+public class CommonGramsQueryFilterFactoryTest extends BaseTokenStreamTestCase {
public void testInform() throws Exception {
ResourceLoader loader = new SolrResourceLoader(null, null);
@@ -41,7 +43,7 @@ public class CommonGramsQueryFilterFacto
Map<String, String> args = new HashMap<String, String>();
args.put("words", "stop-1.txt");
args.put("ignoreCase", "true");
- factory.setLuceneMatchVersion(DEFAULT_VERSION);
+ factory.setLuceneMatchVersion(TEST_VERSION_CURRENT);
factory.init(args);
factory.inform(loader);
CharArraySet words = factory.getCommonWords();
@@ -53,7 +55,7 @@ public class CommonGramsQueryFilterFacto
factory = new CommonGramsQueryFilterFactory();
args.put("words", "stop-1.txt, stop-2.txt");
- factory.setLuceneMatchVersion(DEFAULT_VERSION);
+ factory.setLuceneMatchVersion(TEST_VERSION_CURRENT);
factory.init(args);
factory.inform(loader);
words = factory.getCommonWords();
@@ -64,7 +66,7 @@ public class CommonGramsQueryFilterFacto
.isIgnoreCase() == true);
factory = new CommonGramsQueryFilterFactory();
- factory.setLuceneMatchVersion(DEFAULT_VERSION);
+ factory.setLuceneMatchVersion(TEST_VERSION_CURRENT);
args.put("words", "stop-snowball.txt");
args.put("format", "snowball");
factory.init(args);
@@ -88,8 +90,9 @@ public class CommonGramsQueryFilterFacto
ResourceLoader loader = new SolrResourceLoader(null, null);
assertTrue("loader is null and it shouldn't be", loader != null);
CommonGramsQueryFilterFactory factory = new CommonGramsQueryFilterFactory();
- factory.setLuceneMatchVersion(DEFAULT_VERSION);
- factory.init(EMPTY_PARAMS);
+ factory.setLuceneMatchVersion(TEST_VERSION_CURRENT);
+ Map<String, String> args = Collections.emptyMap();
+ factory.init(args);
factory.inform(loader);
CharArraySet words = factory.getCommonWords();
assertTrue("words is null and it shouldn't be", words != null);
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/DoubleMetaphoneFilterFactoryTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/DoubleMetaphoneFilterFactoryTest.java?rev=1336462&r1=1336461&r2=1336462&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/DoubleMetaphoneFilterFactoryTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/DoubleMetaphoneFilterFactoryTest.java Thu May 10 01:06:43 2012
@@ -20,12 +20,13 @@ import java.io.StringReader;
import java.util.HashMap;
import java.util.Map;
+import org.apache.lucene.analysis.BaseTokenStreamTestCase;
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.phonetic.DoubleMetaphoneFilter;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
-public class DoubleMetaphoneFilterFactoryTest extends BaseTokenTestCase {
+public class DoubleMetaphoneFilterFactoryTest extends BaseTokenStreamTestCase {
public void testDefaults() throws Exception {
DoubleMetaphoneFilterFactory factory = new DoubleMetaphoneFilterFactory();
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/LengthFilterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/LengthFilterTest.java?rev=1336462&r1=1336461&r2=1336462&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/LengthFilterTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/LengthFilterTest.java Thu May 10 01:06:43 2012
@@ -21,10 +21,11 @@ import java.io.StringReader;
import java.util.HashMap;
import java.util.Map;
+import org.apache.lucene.analysis.BaseTokenStreamTestCase;
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.analysis.TokenStream;
-public class LengthFilterTest extends BaseTokenTestCase {
+public class LengthFilterTest extends BaseTokenStreamTestCase {
public void test() throws IOException {
LengthFilterFactory factory = new LengthFilterFactory();
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/SnowballPorterFilterFactoryTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/SnowballPorterFilterFactoryTest.java?rev=1336462&r1=1336461&r2=1336462&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/SnowballPorterFilterFactoryTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/SnowballPorterFilterFactoryTest.java Thu May 10 01:06:43 2012
@@ -16,6 +16,7 @@ package org.apache.solr.analysis;
* limitations under the License.
*/
+import org.apache.lucene.analysis.BaseTokenStreamTestCase;
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.Tokenizer;
@@ -34,7 +35,7 @@ import java.util.List;
import java.util.Map;
import java.util.ArrayList;
-public class SnowballPorterFilterFactoryTest extends BaseTokenTestCase {
+public class SnowballPorterFilterFactoryTest extends BaseTokenStreamTestCase {
public void test() throws IOException {
EnglishStemmer stemmer = new EnglishStemmer();
@@ -50,7 +51,7 @@ public class SnowballPorterFilterFactory
Map<String, String> args = new HashMap<String, String>();
args.put("language", "English");
- factory.setLuceneMatchVersion(DEFAULT_VERSION);
+ factory.setLuceneMatchVersion(TEST_VERSION_CURRENT);
factory.init(args);
factory.inform(new LinesMockSolrResourceLoader(new ArrayList<String>()));
Tokenizer tokenizer = new MockTokenizer(
@@ -88,7 +89,7 @@ public class SnowballPorterFilterFactory
Map<String,String> args = new HashMap<String,String>();
args.put("protected", "protwords.txt");
args.put("language", "English");
- factory.setLuceneMatchVersion(DEFAULT_VERSION);
+ factory.setLuceneMatchVersion(TEST_VERSION_CURRENT);
factory.init(args);
factory.inform(loader);
Reader reader = new StringReader("ridding of some stemming");
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestArabicFilters.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestArabicFilters.java?rev=1336462&r1=1336461&r2=1336462&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestArabicFilters.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestArabicFilters.java Thu May 10 01:06:43 2012
@@ -19,7 +19,10 @@ package org.apache.solr.analysis;
import java.io.Reader;
import java.io.StringReader;
+import java.util.Collections;
+import java.util.Map;
+import org.apache.lucene.analysis.BaseTokenStreamTestCase;
import org.apache.lucene.analysis.CharReader;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.Tokenizer;
@@ -27,7 +30,7 @@ import org.apache.lucene.analysis.Tokeni
/**
* Simple tests to ensure the Arabic filter Factories are working.
*/
-public class TestArabicFilters extends BaseTokenTestCase {
+public class TestArabicFilters extends BaseTokenStreamTestCase {
/**
* Test ArabicLetterTokenizerFactory
* @deprecated (3.1) Remove in Lucene 5.0
@@ -36,8 +39,9 @@ public class TestArabicFilters extends B
public void testTokenizer() throws Exception {
Reader reader = new StringReader("Ø§ÙØ°ÙÙ Ù
ÙÙÙØª Ø£ÙÙ
اÙÙÙ
");
ArabicLetterTokenizerFactory factory = new ArabicLetterTokenizerFactory();
- factory.setLuceneMatchVersion(DEFAULT_VERSION);
- factory.init(EMPTY_PARAMS);
+ factory.setLuceneMatchVersion(TEST_VERSION_CURRENT);
+ Map<String, String> args = Collections.emptyMap();
+ factory.init(args);
Tokenizer stream = factory.create(reader);
assertTokenStreamContents(stream, new String[] {"Ø§ÙØ°ÙÙ", "Ù
ÙÙÙØª", "Ø£ÙÙ
اÙÙÙ
"});
}
@@ -48,11 +52,12 @@ public class TestArabicFilters extends B
public void testNormalizer() throws Exception {
Reader reader = new StringReader("Ø§ÙØ°ÙÙ Ù
ÙÙÙØª Ø£ÙÙ
اÙÙÙ
");
StandardTokenizerFactory factory = new StandardTokenizerFactory();
- factory.setLuceneMatchVersion(DEFAULT_VERSION);
+ factory.setLuceneMatchVersion(TEST_VERSION_CURRENT);
ArabicNormalizationFilterFactory filterFactory = new ArabicNormalizationFilterFactory();
- filterFactory.setLuceneMatchVersion(DEFAULT_VERSION);
- factory.init(EMPTY_PARAMS);
- filterFactory.init(EMPTY_PARAMS);
+ filterFactory.setLuceneMatchVersion(TEST_VERSION_CURRENT);
+ Map<String, String> args = Collections.emptyMap();
+ factory.init(args);
+ filterFactory.init(args);
Tokenizer tokenizer = factory.create(reader);
TokenStream stream = filterFactory.create(tokenizer);
assertTokenStreamContents(stream, new String[] {"Ø§ÙØ°ÙÙ", "Ù
ÙÙØª", "اÙÙ
اÙÙÙ
"});
@@ -64,12 +69,13 @@ public class TestArabicFilters extends B
public void testStemmer() throws Exception {
Reader reader = new StringReader("Ø§ÙØ°ÙÙ Ù
ÙÙÙØª Ø£ÙÙ
اÙÙÙ
");
StandardTokenizerFactory factory = new StandardTokenizerFactory();
- factory.setLuceneMatchVersion(DEFAULT_VERSION);
+ factory.setLuceneMatchVersion(TEST_VERSION_CURRENT);
ArabicNormalizationFilterFactory normFactory = new ArabicNormalizationFilterFactory();
- normFactory.setLuceneMatchVersion(DEFAULT_VERSION);
+ normFactory.setLuceneMatchVersion(TEST_VERSION_CURRENT);
ArabicStemFilterFactory stemFactory = new ArabicStemFilterFactory();
- factory.init(EMPTY_PARAMS);
- normFactory.init(EMPTY_PARAMS);
+ Map<String, String> args = Collections.emptyMap();
+ factory.init(args);
+ normFactory.init(args);
Tokenizer tokenizer = factory.create(reader);
TokenStream stream = normFactory.create(tokenizer);
stream = stemFactory.create(stream);
@@ -83,8 +89,9 @@ public class TestArabicFilters extends B
Reader reader = new StringReader("Ù
ÛâØ®ÙØ±Ø¯");
PersianCharFilterFactory charfilterFactory = new PersianCharFilterFactory();
StandardTokenizerFactory tokenizerFactory = new StandardTokenizerFactory();
- tokenizerFactory.setLuceneMatchVersion(DEFAULT_VERSION);
- tokenizerFactory.init(EMPTY_PARAMS);
+ tokenizerFactory.setLuceneMatchVersion(TEST_VERSION_CURRENT);
+ Map<String, String> args = Collections.emptyMap();
+ tokenizerFactory.init(args);
TokenStream stream = tokenizerFactory.create(charfilterFactory.create(CharReader.get(reader)));
assertTokenStreamContents(stream, new String[] { "Ù
Û", "Ø®ÙØ±Ø¯" });
}
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestBeiderMorseFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestBeiderMorseFilterFactory.java?rev=1336462&r1=1336461&r2=1336462&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestBeiderMorseFilterFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestBeiderMorseFilterFactory.java Thu May 10 01:06:43 2012
@@ -18,18 +18,21 @@ package org.apache.solr.analysis;
*/
import java.io.StringReader;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
+import org.apache.lucene.analysis.BaseTokenStreamTestCase;
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.analysis.TokenStream;
/** Simple tests for {@link BeiderMorseFilterFactory} */
-public class TestBeiderMorseFilterFactory extends BaseTokenTestCase {
+public class TestBeiderMorseFilterFactory extends BaseTokenStreamTestCase {
public void testBasics() throws Exception {
BeiderMorseFilterFactory factory = new BeiderMorseFilterFactory();
- factory.setLuceneMatchVersion(DEFAULT_VERSION);
- factory.init(EMPTY_PARAMS);
+ factory.setLuceneMatchVersion(TEST_VERSION_CURRENT);
+ Map<String, String> args = Collections.emptyMap();
+ factory.init(args);
TokenStream ts = factory.create(new MockTokenizer(new StringReader("Weinberg"), MockTokenizer.WHITESPACE, false));
assertTokenStreamContents(ts,
new String[] { "vDnbirk", "vanbirk", "vinbirk", "wDnbirk", "wanbirk", "winbirk" },
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestBrazilianStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestBrazilianStemFilterFactory.java?rev=1336462&r1=1336461&r2=1336462&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestBrazilianStemFilterFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestBrazilianStemFilterFactory.java Thu May 10 01:06:43 2012
@@ -20,6 +20,7 @@ package org.apache.solr.analysis;
import java.io.Reader;
import java.io.StringReader;
+import org.apache.lucene.analysis.BaseTokenStreamTestCase;
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.Tokenizer;
@@ -27,7 +28,7 @@ import org.apache.lucene.analysis.Tokeni
/**
* Simple tests to ensure the Brazilian stem filter factory is working.
*/
-public class TestBrazilianStemFilterFactory extends BaseTokenTestCase {
+public class TestBrazilianStemFilterFactory extends BaseTokenStreamTestCase {
/**
* Ensure the filter actually stems and normalizes text.
*/
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestBulgarianStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestBulgarianStemFilterFactory.java?rev=1336462&r1=1336461&r2=1336462&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestBulgarianStemFilterFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestBulgarianStemFilterFactory.java Thu May 10 01:06:43 2012
@@ -20,6 +20,7 @@ package org.apache.solr.analysis;
import java.io.Reader;
import java.io.StringReader;
+import org.apache.lucene.analysis.BaseTokenStreamTestCase;
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.Tokenizer;
@@ -27,7 +28,7 @@ import org.apache.lucene.analysis.Tokeni
/**
* Simple tests to ensure the Bulgarian stem filter factory is working.
*/
-public class TestBulgarianStemFilterFactory extends BaseTokenTestCase {
+public class TestBulgarianStemFilterFactory extends BaseTokenStreamTestCase {
/**
* Ensure the filter actually stems text.
*/
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestCJKBigramFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestCJKBigramFilterFactory.java?rev=1336462&r1=1336461&r2=1336462&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestCJKBigramFilterFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestCJKBigramFilterFactory.java Thu May 10 01:06:43 2012
@@ -19,9 +19,11 @@ package org.apache.solr.analysis;
import java.io.Reader;
import java.io.StringReader;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
+import org.apache.lucene.analysis.BaseTokenStreamTestCase;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.standard.StandardTokenizer;
@@ -29,12 +31,13 @@ import org.apache.lucene.analysis.standa
* Simple tests to ensure the CJK bigram factory is working.
* @deprecated
*/
-public class TestCJKBigramFilterFactory extends BaseTokenTestCase {
+public class TestCJKBigramFilterFactory extends BaseTokenStreamTestCase {
public void testDefaults() throws Exception {
Reader reader = new StringReader("å¤ãã®å¦çã試é¨ã«è½ã¡ãã");
CJKBigramFilterFactory factory = new CJKBigramFilterFactory();
- factory.setLuceneMatchVersion(DEFAULT_VERSION);
- factory.init(EMPTY_PARAMS);
+ factory.setLuceneMatchVersion(TEST_VERSION_CURRENT);
+ Map<String, String> args = Collections.emptyMap();
+ factory.init(args);
TokenStream stream = factory.create(new StandardTokenizer(TEST_VERSION_CURRENT, reader));
assertTokenStreamContents(stream,
new String[] { "å¤ã", "ãã®", "ã®å¦", "å¦ç", "çã", "ã試", "試é¨", "é¨ã«", "ã«è½", "è½ã¡", "ã¡ã" });
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestCJKTokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestCJKTokenizerFactory.java?rev=1336462&r1=1336461&r2=1336462&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestCJKTokenizerFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestCJKTokenizerFactory.java Thu May 10 01:06:43 2012
@@ -20,6 +20,7 @@ package org.apache.solr.analysis;
import java.io.Reader;
import java.io.StringReader;
+import org.apache.lucene.analysis.BaseTokenStreamTestCase;
import org.apache.lucene.analysis.TokenStream;
/**
@@ -27,7 +28,7 @@ import org.apache.lucene.analysis.TokenS
* @deprecated
*/
@Deprecated
-public class TestCJKTokenizerFactory extends BaseTokenTestCase {
+public class TestCJKTokenizerFactory extends BaseTokenStreamTestCase {
/**
* Ensure the tokenizer actually tokenizes CJK text correctly
*/
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestCJKWidthFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestCJKWidthFilterFactory.java?rev=1336462&r1=1336461&r2=1336462&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestCJKWidthFilterFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestCJKWidthFilterFactory.java Thu May 10 01:06:43 2012
@@ -20,13 +20,14 @@ package org.apache.solr.analysis;
import java.io.Reader;
import java.io.StringReader;
+import org.apache.lucene.analysis.BaseTokenStreamTestCase;
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.analysis.TokenStream;
/**
* Simple tests to ensure the CJKWidthFilterFactory is working
*/
-public class TestCJKWidthFilterFactory extends BaseTokenTestCase {
+public class TestCJKWidthFilterFactory extends BaseTokenStreamTestCase {
public void test() throws Exception {
Reader reader = new StringReader("ï¼´ï½
ï½ï½ ï¼ï¼ï¼ï¼");
CJKWidthFilterFactory factory = new CJKWidthFilterFactory();
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestCapitalizationFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestCapitalizationFilterFactory.java?rev=1336462&r1=1336461&r2=1336462&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestCapitalizationFilterFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestCapitalizationFilterFactory.java Thu May 10 01:06:43 2012
@@ -21,6 +21,7 @@ import java.io.StringReader;
import java.util.HashMap;
import java.util.Map;
+import org.apache.lucene.analysis.BaseTokenStreamTestCase;
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.Tokenizer;
@@ -29,7 +30,7 @@ import org.apache.lucene.analysis.Tokeni
/**
*
*/
-public class TestCapitalizationFilterFactory extends BaseTokenTestCase {
+public class TestCapitalizationFilterFactory extends BaseTokenStreamTestCase {
public void testCapitalization() throws Exception
{
@@ -38,7 +39,7 @@ public class TestCapitalizationFilterFac
args.put( CapitalizationFilterFactory.ONLY_FIRST_WORD, "true" );
CapitalizationFilterFactory factory = new CapitalizationFilterFactory();
- factory.setLuceneMatchVersion(DEFAULT_VERSION);
+ factory.setLuceneMatchVersion(TEST_VERSION_CURRENT);
factory.init( args );
assertTokenStreamContents(factory.create(
new MockTokenizer(new StringReader("kiTTEN"), MockTokenizer.WHITESPACE, false)),
@@ -95,7 +96,7 @@ public class TestCapitalizationFilterFac
// Now try some prefixes
factory = new CapitalizationFilterFactory();
- factory.setLuceneMatchVersion(DEFAULT_VERSION);
+ factory.setLuceneMatchVersion(TEST_VERSION_CURRENT);
args.put( "okPrefix", "McK" ); // all words
factory.init( args );
assertTokenStreamContents(factory.create(
@@ -122,7 +123,7 @@ public class TestCapitalizationFilterFac
args.put( CapitalizationFilterFactory.ONLY_FIRST_WORD, "true" );
CapitalizationFilterFactory factory = new CapitalizationFilterFactory();
- factory.setLuceneMatchVersion(DEFAULT_VERSION);
+ factory.setLuceneMatchVersion(TEST_VERSION_CURRENT);
factory.init( args );
factory.forceFirstLetter = true;
assertTokenStreamContents(factory.create(
@@ -150,7 +151,7 @@ public class TestCapitalizationFilterFac
args.put(CapitalizationFilterFactory.ONLY_FIRST_WORD, "true");
args.put(CapitalizationFilterFactory.MIN_WORD_LENGTH, "5");
CapitalizationFilterFactory factory = new CapitalizationFilterFactory();
- factory.setLuceneMatchVersion(DEFAULT_VERSION);
+ factory.setLuceneMatchVersion(TEST_VERSION_CURRENT);
factory.init(args);
Tokenizer tokenizer = new MockTokenizer(new StringReader(
"helo testing"), MockTokenizer.WHITESPACE, false);
@@ -166,7 +167,7 @@ public class TestCapitalizationFilterFac
Map<String,String> args = new HashMap<String,String>();
args.put(CapitalizationFilterFactory.MAX_WORD_COUNT, "2");
CapitalizationFilterFactory factory = new CapitalizationFilterFactory();
- factory.setLuceneMatchVersion(DEFAULT_VERSION);
+ factory.setLuceneMatchVersion(TEST_VERSION_CURRENT);
factory.init(args);
Tokenizer tokenizer = new MockTokenizer(new StringReader(
"one two three four"), MockTokenizer.WHITESPACE, false);
@@ -181,7 +182,7 @@ public class TestCapitalizationFilterFac
Map<String,String> args = new HashMap<String,String>();
args.put(CapitalizationFilterFactory.MAX_WORD_COUNT, "2");
CapitalizationFilterFactory factory = new CapitalizationFilterFactory();
- factory.setLuceneMatchVersion(DEFAULT_VERSION);
+ factory.setLuceneMatchVersion(TEST_VERSION_CURRENT);
factory.init(args);
Tokenizer tokenizer = new MockTokenizer(new StringReader(
"one two three four"), MockTokenizer.KEYWORD, false);
@@ -198,7 +199,7 @@ public class TestCapitalizationFilterFac
Map<String,String> args = new HashMap<String,String>();
args.put(CapitalizationFilterFactory.MAX_TOKEN_LENGTH, "2");
CapitalizationFilterFactory factory = new CapitalizationFilterFactory();
- factory.setLuceneMatchVersion(DEFAULT_VERSION);
+ factory.setLuceneMatchVersion(TEST_VERSION_CURRENT);
factory.init(args);
Tokenizer tokenizer = new MockTokenizer(new StringReader(
"this is a test"), MockTokenizer.WHITESPACE, false);
@@ -214,7 +215,7 @@ public class TestCapitalizationFilterFac
args.put(CapitalizationFilterFactory.KEEP, "kitten");
args.put(CapitalizationFilterFactory.FORCE_FIRST_LETTER, "true");
CapitalizationFilterFactory factory = new CapitalizationFilterFactory();
- factory.setLuceneMatchVersion(DEFAULT_VERSION);
+ factory.setLuceneMatchVersion(TEST_VERSION_CURRENT);
factory.init(args);
Tokenizer tokenizer = new MockTokenizer(new StringReader("kitten"), MockTokenizer.WHITESPACE, false);
TokenStream ts = factory.create(tokenizer);
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestChineseFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestChineseFilterFactory.java?rev=1336462&r1=1336461&r2=1336462&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestChineseFilterFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestChineseFilterFactory.java Thu May 10 01:06:43 2012
@@ -20,6 +20,7 @@ package org.apache.solr.analysis;
import java.io.Reader;
import java.io.StringReader;
+import org.apache.lucene.analysis.BaseTokenStreamTestCase;
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.Tokenizer;
@@ -27,7 +28,7 @@ import org.apache.lucene.analysis.Tokeni
/**
* Simple tests to ensure the Chinese filter factory is working.
*/
-public class TestChineseFilterFactory extends BaseTokenTestCase {
+public class TestChineseFilterFactory extends BaseTokenStreamTestCase {
/**
* Ensure the filter actually normalizes text (numerics, stopwords)
*/
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestChineseTokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestChineseTokenizerFactory.java?rev=1336462&r1=1336461&r2=1336462&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestChineseTokenizerFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestChineseTokenizerFactory.java Thu May 10 01:06:43 2012
@@ -20,12 +20,13 @@ package org.apache.solr.analysis;
import java.io.Reader;
import java.io.StringReader;
+import org.apache.lucene.analysis.BaseTokenStreamTestCase;
import org.apache.lucene.analysis.TokenStream;
/**
* Simple tests to ensure the Chinese tokenizer factory is working.
*/
-public class TestChineseTokenizerFactory extends BaseTokenTestCase {
+public class TestChineseTokenizerFactory extends BaseTokenStreamTestCase {
/**
* Ensure the tokenizer actually tokenizes chinese text correctly
*/
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestCollationKeyFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestCollationKeyFilterFactory.java?rev=1336462&r1=1336461&r2=1336462&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestCollationKeyFilterFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestCollationKeyFilterFactory.java Thu May 10 01:06:43 2012
@@ -28,12 +28,13 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
+import org.apache.lucene.analysis.BaseTokenStreamTestCase;
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.lucene.analysis.util.ResourceLoader;
-public class TestCollationKeyFilterFactory extends BaseTokenTestCase {
+public class TestCollationKeyFilterFactory extends BaseTokenStreamTestCase {
/*
* Turkish has some funny casing.
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestCzechStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestCzechStemFilterFactory.java?rev=1336462&r1=1336461&r2=1336462&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestCzechStemFilterFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestCzechStemFilterFactory.java Thu May 10 01:06:43 2012
@@ -20,6 +20,7 @@ package org.apache.solr.analysis;
import java.io.Reader;
import java.io.StringReader;
+import org.apache.lucene.analysis.BaseTokenStreamTestCase;
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.Tokenizer;
@@ -27,7 +28,7 @@ import org.apache.lucene.analysis.Tokeni
/**
* Simple tests to ensure the Czech stem filter factory is working.
*/
-public class TestCzechStemFilterFactory extends BaseTokenTestCase {
+public class TestCzechStemFilterFactory extends BaseTokenStreamTestCase {
/**
* Ensure the filter actually stems text.
*/
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestDelimitedPayloadTokenFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestDelimitedPayloadTokenFilterFactory.java?rev=1336462&r1=1336461&r2=1336462&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestDelimitedPayloadTokenFilterFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestDelimitedPayloadTokenFilterFactory.java Thu May 10 01:06:43 2012
@@ -21,6 +21,7 @@ import java.io.StringReader;
import java.util.HashMap;
import java.util.Map;
+import org.apache.lucene.analysis.BaseTokenStreamTestCase;
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.payloads.DelimitedPayloadTokenFilter;
@@ -30,7 +31,7 @@ import org.apache.lucene.analysis.tokena
import org.apache.lucene.analysis.util.ResourceLoader;
import org.apache.solr.core.SolrResourceLoader;
-public class TestDelimitedPayloadTokenFilterFactory extends BaseTokenTestCase {
+public class TestDelimitedPayloadTokenFilterFactory extends BaseTokenStreamTestCase {
public void testEncoder() throws Exception {
Map<String,String> args = new HashMap<String, String>();
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestDictionaryCompoundWordTokenFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestDictionaryCompoundWordTokenFilterFactory.java?rev=1336462&r1=1336461&r2=1336462&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestDictionaryCompoundWordTokenFilterFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestDictionaryCompoundWordTokenFilterFactory.java Thu May 10 01:06:43 2012
@@ -22,6 +22,7 @@ import java.io.StringReader;
import java.util.HashMap;
import java.util.Map;
+import org.apache.lucene.analysis.BaseTokenStreamTestCase;
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.Tokenizer;
@@ -31,7 +32,7 @@ import org.apache.solr.core.SolrResource
/**
* Simple tests to ensure the Dictionary compound filter factory is working.
*/
-public class TestDictionaryCompoundWordTokenFilterFactory extends BaseTokenTestCase {
+public class TestDictionaryCompoundWordTokenFilterFactory extends BaseTokenStreamTestCase {
/**
* Ensure the filter actually decompounds text.
*/
@@ -42,7 +43,7 @@ public class TestDictionaryCompoundWordT
ResourceLoader loader = new SolrResourceLoader(null, null);
Map<String,String> args = new HashMap<String,String>();
args.put("dictionary", "compoundDictionary.txt");
- factory.setLuceneMatchVersion(DEFAULT_VERSION);
+ factory.setLuceneMatchVersion(TEST_VERSION_CURRENT);
factory.init(args);
factory.inform(loader);
TokenStream stream = factory.create(tokenizer);
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestElisionFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestElisionFilterFactory.java?rev=1336462&r1=1336461&r2=1336462&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestElisionFilterFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestElisionFilterFactory.java Thu May 10 01:06:43 2012
@@ -19,9 +19,11 @@ package org.apache.solr.analysis;
import java.io.Reader;
import java.io.StringReader;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
+import org.apache.lucene.analysis.BaseTokenStreamTestCase;
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.Tokenizer;
@@ -31,7 +33,7 @@ import org.apache.solr.core.SolrResource
/**
* Simple tests to ensure the French elision filter factory is working.
*/
-public class TestElisionFilterFactory extends BaseTokenTestCase {
+public class TestElisionFilterFactory extends BaseTokenStreamTestCase {
/**
* Ensure the filter actually normalizes text.
*/
@@ -39,8 +41,7 @@ public class TestElisionFilterFactory ex
Reader reader = new StringReader("l'avion");
Tokenizer tokenizer = new MockTokenizer(reader, MockTokenizer.WHITESPACE, false);
ElisionFilterFactory factory = new ElisionFilterFactory();
- factory.setLuceneMatchVersion(DEFAULT_VERSION);
- factory.init(EMPTY_PARAMS);
+ factory.setLuceneMatchVersion(TEST_VERSION_CURRENT);
ResourceLoader loader = new SolrResourceLoader(null, null);
Map<String,String> args = new HashMap<String,String>();
args.put("articles", "frenchArticles.txt");
@@ -57,10 +58,10 @@ public class TestElisionFilterFactory ex
Reader reader = new StringReader("l'avion");
Tokenizer tokenizer = new MockTokenizer(reader, MockTokenizer.WHITESPACE, false);
ElisionFilterFactory factory = new ElisionFilterFactory();
- factory.setLuceneMatchVersion(DEFAULT_VERSION);
- factory.init(EMPTY_PARAMS);
+ factory.setLuceneMatchVersion(TEST_VERSION_CURRENT);
+ Map<String, String> args = Collections.emptyMap();
+ factory.init(args);
ResourceLoader loader = new SolrResourceLoader(null, null);
- factory.init(new HashMap<String,String>());
factory.inform(loader);
TokenStream stream = factory.create(tokenizer);
assertTokenStreamContents(stream, new String[] { "avion" });
@@ -73,8 +74,7 @@ public class TestElisionFilterFactory ex
Reader reader = new StringReader("L'avion");
Tokenizer tokenizer = new MockTokenizer(reader, MockTokenizer.WHITESPACE, false);
ElisionFilterFactory factory = new ElisionFilterFactory();
- factory.setLuceneMatchVersion(DEFAULT_VERSION);
- factory.init(EMPTY_PARAMS);
+ factory.setLuceneMatchVersion(TEST_VERSION_CURRENT);
ResourceLoader loader = new SolrResourceLoader(null, null);
Map<String,String> args = new HashMap<String,String>();
args.put("articles", "frenchArticles.txt");
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestEnglishMinimalStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestEnglishMinimalStemFilterFactory.java?rev=1336462&r1=1336461&r2=1336462&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestEnglishMinimalStemFilterFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestEnglishMinimalStemFilterFactory.java Thu May 10 01:06:43 2012
@@ -20,13 +20,14 @@ package org.apache.solr.analysis;
import java.io.Reader;
import java.io.StringReader;
+import org.apache.lucene.analysis.BaseTokenStreamTestCase;
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.analysis.TokenStream;
/**
* Simple tests to ensure the English minimal stem factory is working.
*/
-public class TestEnglishMinimalStemFilterFactory extends BaseTokenTestCase {
+public class TestEnglishMinimalStemFilterFactory extends BaseTokenStreamTestCase {
public void testStemming() throws Exception {
Reader reader = new StringReader("bricks");
EnglishMinimalStemFilterFactory factory = new EnglishMinimalStemFilterFactory();
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestFinnishLightStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestFinnishLightStemFilterFactory.java?rev=1336462&r1=1336461&r2=1336462&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestFinnishLightStemFilterFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestFinnishLightStemFilterFactory.java Thu May 10 01:06:43 2012
@@ -20,13 +20,14 @@ package org.apache.solr.analysis;
import java.io.Reader;
import java.io.StringReader;
+import org.apache.lucene.analysis.BaseTokenStreamTestCase;
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.analysis.TokenStream;
/**
* Simple tests to ensure the Finnish light stem factory is working.
*/
-public class TestFinnishLightStemFilterFactory extends BaseTokenTestCase {
+public class TestFinnishLightStemFilterFactory extends BaseTokenStreamTestCase {
public void testStemming() throws Exception {
Reader reader = new StringReader("aseistettujen");
FinnishLightStemFilterFactory factory = new FinnishLightStemFilterFactory();
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestFrenchLightStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestFrenchLightStemFilterFactory.java?rev=1336462&r1=1336461&r2=1336462&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestFrenchLightStemFilterFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestFrenchLightStemFilterFactory.java Thu May 10 01:06:43 2012
@@ -20,13 +20,14 @@ package org.apache.solr.analysis;
import java.io.Reader;
import java.io.StringReader;
+import org.apache.lucene.analysis.BaseTokenStreamTestCase;
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.analysis.TokenStream;
/**
* Simple tests to ensure the French light stem factory is working.
*/
-public class TestFrenchLightStemFilterFactory extends BaseTokenTestCase {
+public class TestFrenchLightStemFilterFactory extends BaseTokenStreamTestCase {
public void testStemming() throws Exception {
Reader reader = new StringReader("administrativement");
FrenchLightStemFilterFactory factory = new FrenchLightStemFilterFactory();
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestFrenchMinimalStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestFrenchMinimalStemFilterFactory.java?rev=1336462&r1=1336461&r2=1336462&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestFrenchMinimalStemFilterFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestFrenchMinimalStemFilterFactory.java Thu May 10 01:06:43 2012
@@ -20,13 +20,14 @@ package org.apache.solr.analysis;
import java.io.Reader;
import java.io.StringReader;
+import org.apache.lucene.analysis.BaseTokenStreamTestCase;
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.analysis.TokenStream;
/**
* Simple tests to ensure the French minimal stem factory is working.
*/
-public class TestFrenchMinimalStemFilterFactory extends BaseTokenTestCase {
+public class TestFrenchMinimalStemFilterFactory extends BaseTokenStreamTestCase {
public void testStemming() throws Exception {
Reader reader = new StringReader("chevaux");
FrenchMinimalStemFilterFactory factory = new FrenchMinimalStemFilterFactory();
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestGalicianMinimalStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestGalicianMinimalStemFilterFactory.java?rev=1336462&r1=1336461&r2=1336462&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestGalicianMinimalStemFilterFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestGalicianMinimalStemFilterFactory.java Thu May 10 01:06:43 2012
@@ -20,13 +20,14 @@ package org.apache.solr.analysis;
import java.io.Reader;
import java.io.StringReader;
+import org.apache.lucene.analysis.BaseTokenStreamTestCase;
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.analysis.TokenStream;
/**
* Simple tests to ensure the Galician plural stem factory is working.
*/
-public class TestGalicianMinimalStemFilterFactory extends BaseTokenTestCase {
+public class TestGalicianMinimalStemFilterFactory extends BaseTokenStreamTestCase {
public void testStemming() throws Exception {
Reader reader = new StringReader("elefantes");
GalicianMinimalStemFilterFactory factory = new GalicianMinimalStemFilterFactory();
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestGalicianStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestGalicianStemFilterFactory.java?rev=1336462&r1=1336461&r2=1336462&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestGalicianStemFilterFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestGalicianStemFilterFactory.java Thu May 10 01:06:43 2012
@@ -20,13 +20,14 @@ package org.apache.solr.analysis;
import java.io.Reader;
import java.io.StringReader;
+import org.apache.lucene.analysis.BaseTokenStreamTestCase;
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.analysis.TokenStream;
/**
* Simple tests to ensure the Galician stem factory is working.
*/
-public class TestGalicianStemFilterFactory extends BaseTokenTestCase {
+public class TestGalicianStemFilterFactory extends BaseTokenStreamTestCase {
public void testStemming() throws Exception {
Reader reader = new StringReader("cariñosa");
GalicianStemFilterFactory factory = new GalicianStemFilterFactory();
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestGermanLightStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestGermanLightStemFilterFactory.java?rev=1336462&r1=1336461&r2=1336462&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestGermanLightStemFilterFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestGermanLightStemFilterFactory.java Thu May 10 01:06:43 2012
@@ -20,13 +20,14 @@ package org.apache.solr.analysis;
import java.io.Reader;
import java.io.StringReader;
+import org.apache.lucene.analysis.BaseTokenStreamTestCase;
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.analysis.TokenStream;
/**
* Simple tests to ensure the German light stem factory is working.
*/
-public class TestGermanLightStemFilterFactory extends BaseTokenTestCase {
+public class TestGermanLightStemFilterFactory extends BaseTokenStreamTestCase {
public void testStemming() throws Exception {
Reader reader = new StringReader("häuser");
GermanLightStemFilterFactory factory = new GermanLightStemFilterFactory();
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestGermanMinimalStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestGermanMinimalStemFilterFactory.java?rev=1336462&r1=1336461&r2=1336462&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestGermanMinimalStemFilterFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestGermanMinimalStemFilterFactory.java Thu May 10 01:06:43 2012
@@ -20,13 +20,14 @@ package org.apache.solr.analysis;
import java.io.Reader;
import java.io.StringReader;
+import org.apache.lucene.analysis.BaseTokenStreamTestCase;
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.analysis.TokenStream;
/**
* Simple tests to ensure the German minimal stem factory is working.
*/
-public class TestGermanMinimalStemFilterFactory extends BaseTokenTestCase {
+public class TestGermanMinimalStemFilterFactory extends BaseTokenStreamTestCase {
public void testStemming() throws Exception {
Reader reader = new StringReader("bilder");
GermanMinimalStemFilterFactory factory = new GermanMinimalStemFilterFactory();
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestGermanNormalizationFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestGermanNormalizationFilterFactory.java?rev=1336462&r1=1336461&r2=1336462&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestGermanNormalizationFilterFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestGermanNormalizationFilterFactory.java Thu May 10 01:06:43 2012
@@ -20,13 +20,14 @@ package org.apache.solr.analysis;
import java.io.Reader;
import java.io.StringReader;
+import org.apache.lucene.analysis.BaseTokenStreamTestCase;
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.analysis.TokenStream;
/**
* Simple tests to ensure the German normalization factory is working.
*/
-public class TestGermanNormalizationFilterFactory extends BaseTokenTestCase {
+public class TestGermanNormalizationFilterFactory extends BaseTokenStreamTestCase {
public void testStemming() throws Exception {
Reader reader = new StringReader("weiÃbier");
GermanNormalizationFilterFactory factory = new GermanNormalizationFilterFactory();
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestGermanStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestGermanStemFilterFactory.java?rev=1336462&r1=1336461&r2=1336462&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestGermanStemFilterFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestGermanStemFilterFactory.java Thu May 10 01:06:43 2012
@@ -20,6 +20,7 @@ package org.apache.solr.analysis;
import java.io.Reader;
import java.io.StringReader;
+import org.apache.lucene.analysis.BaseTokenStreamTestCase;
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.Tokenizer;
@@ -27,7 +28,7 @@ import org.apache.lucene.analysis.Tokeni
/**
* Simple tests to ensure the German stem filter factory is working.
*/
-public class TestGermanStemFilterFactory extends BaseTokenTestCase {
+public class TestGermanStemFilterFactory extends BaseTokenStreamTestCase {
/**
* Ensure the filter actually stems text.
*/
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestGreekLowerCaseFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestGreekLowerCaseFilterFactory.java?rev=1336462&r1=1336461&r2=1336462&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestGreekLowerCaseFilterFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestGreekLowerCaseFilterFactory.java Thu May 10 01:06:43 2012
@@ -19,7 +19,10 @@ package org.apache.solr.analysis;
import java.io.Reader;
import java.io.StringReader;
+import java.util.Collections;
+import java.util.Map;
+import org.apache.lucene.analysis.BaseTokenStreamTestCase;
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.Tokenizer;
@@ -27,7 +30,7 @@ import org.apache.lucene.analysis.Tokeni
/**
* Simple tests to ensure the Greek lowercase filter factory is working.
*/
-public class TestGreekLowerCaseFilterFactory extends BaseTokenTestCase {
+public class TestGreekLowerCaseFilterFactory extends BaseTokenStreamTestCase {
/**
* Ensure the filter actually lowercases (and a bit more) greek text.
*/
@@ -35,8 +38,9 @@ public class TestGreekLowerCaseFilterFac
Reader reader = new StringReader("ÎάÏÎ¿Ï ÎÎΪÎΣ");
Tokenizer tokenizer = new MockTokenizer(reader, MockTokenizer.WHITESPACE, false);
GreekLowerCaseFilterFactory factory = new GreekLowerCaseFilterFactory();
- factory.setLuceneMatchVersion(DEFAULT_VERSION);
- factory.init(EMPTY_PARAMS);
+ factory.setLuceneMatchVersion(TEST_VERSION_CURRENT);
+ Map<String, String> args = Collections.emptyMap();
+ factory.init(args);
TokenStream stream = factory.create(tokenizer);
assertTokenStreamContents(stream, new String[] { "μαιοÏ", "μαιοÏ" });
}
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestGreekStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestGreekStemFilterFactory.java?rev=1336462&r1=1336461&r2=1336462&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestGreekStemFilterFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestGreekStemFilterFactory.java Thu May 10 01:06:43 2012
@@ -3,6 +3,7 @@ package org.apache.solr.analysis;
import java.io.Reader;
import java.io.StringReader;
+import org.apache.lucene.analysis.BaseTokenStreamTestCase;
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.Tokenizer;
@@ -28,11 +29,11 @@ import org.apache.lucene.analysis.el.Gre
/**
* Simple tests to ensure the Greek stem filter factory is working.
*/
-public class TestGreekStemFilterFactory extends BaseTokenTestCase {
+public class TestGreekStemFilterFactory extends BaseTokenStreamTestCase {
public void testStemming() throws Exception {
Reader reader = new StringReader("άνθÏÏÏοÏ");
Tokenizer tokenizer = new MockTokenizer(reader, MockTokenizer.WHITESPACE, false);
- TokenStream normalized = new GreekLowerCaseFilter(DEFAULT_VERSION, tokenizer);
+ TokenStream normalized = new GreekLowerCaseFilter(TEST_VERSION_CURRENT, tokenizer);
GreekStemFilterFactory factory = new GreekStemFilterFactory();
TokenStream stream = factory.create(normalized);
assertTokenStreamContents(stream, new String[] { "ανθÏÏÏ" });
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestHTMLStripCharFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestHTMLStripCharFilterFactory.java?rev=1336462&r1=1336461&r2=1336462&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestHTMLStripCharFilterFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestHTMLStripCharFilterFactory.java Thu May 10 01:06:43 2012
@@ -22,15 +22,12 @@ import java.io.StringReader;
import java.util.HashMap;
import java.util.Map;
-import org.apache.lucene.analysis.CharReader;
-import org.apache.lucene.analysis.CharStream;
-import org.apache.lucene.analysis.MockTokenizer;
-import org.apache.lucene.analysis.TokenStream;
+import org.apache.lucene.analysis.*;
/**
* Simple tests to ensure this factory is working
*/
-public class TestHTMLStripCharFilterFactory extends BaseTokenTestCase {
+public class TestHTMLStripCharFilterFactory extends BaseTokenStreamTestCase {
public void testNothingChanged() throws IOException {
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestHindiFilters.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestHindiFilters.java?rev=1336462&r1=1336461&r2=1336462&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestHindiFilters.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestHindiFilters.java Thu May 10 01:06:43 2012
@@ -19,25 +19,29 @@ package org.apache.solr.analysis;
import java.io.Reader;
import java.io.StringReader;
+import java.util.Collections;
+import java.util.Map;
+import org.apache.lucene.analysis.BaseTokenStreamTestCase;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.Tokenizer;
/**
* Simple tests to ensure the Hindi filter Factories are working.
*/
-public class TestHindiFilters extends BaseTokenTestCase {
+public class TestHindiFilters extends BaseTokenStreamTestCase {
/**
* Test IndicNormalizationFilterFactory
*/
public void testIndicNormalizer() throws Exception {
Reader reader = new StringReader("তà§â à¤
ाà¥à¤°");
StandardTokenizerFactory factory = new StandardTokenizerFactory();
- factory.setLuceneMatchVersion(DEFAULT_VERSION);
+ factory.setLuceneMatchVersion(TEST_VERSION_CURRENT);
IndicNormalizationFilterFactory filterFactory = new IndicNormalizationFilterFactory();
- filterFactory.setLuceneMatchVersion(DEFAULT_VERSION);
- factory.init(EMPTY_PARAMS);
- filterFactory.init(EMPTY_PARAMS);
+ filterFactory.setLuceneMatchVersion(TEST_VERSION_CURRENT);
+ Map<String, String> args = Collections.emptyMap();
+ factory.init(args);
+ filterFactory.init(args);
Tokenizer tokenizer = factory.create(reader);
TokenStream stream = filterFactory.create(tokenizer);
assertTokenStreamContents(stream, new String[] { "à§", "à¤à¤°" });
@@ -49,12 +53,13 @@ public class TestHindiFilters extends Ba
public void testHindiNormalizer() throws Exception {
Reader reader = new StringReader("à¥à¤¿à¤¤à¤¾à¤¬");
StandardTokenizerFactory factory = new StandardTokenizerFactory();
- factory.setLuceneMatchVersion(DEFAULT_VERSION);
+ factory.setLuceneMatchVersion(TEST_VERSION_CURRENT);
IndicNormalizationFilterFactory indicFilterFactory = new IndicNormalizationFilterFactory();
HindiNormalizationFilterFactory hindiFilterFactory = new HindiNormalizationFilterFactory();
- hindiFilterFactory.setLuceneMatchVersion(DEFAULT_VERSION);
- factory.init(EMPTY_PARAMS);
- hindiFilterFactory.init(EMPTY_PARAMS);
+ hindiFilterFactory.setLuceneMatchVersion(TEST_VERSION_CURRENT);
+ Map<String, String> args = Collections.emptyMap();
+ factory.init(args);
+ hindiFilterFactory.init(args);
Tokenizer tokenizer = factory.create(reader);
TokenStream stream = indicFilterFactory.create(tokenizer);
stream = hindiFilterFactory.create(stream);
@@ -67,13 +72,14 @@ public class TestHindiFilters extends Ba
public void testStemmer() throws Exception {
Reader reader = new StringReader("à¤à¤¿à¤¤à¤¾à¤¬à¥à¤");
StandardTokenizerFactory factory = new StandardTokenizerFactory();
- factory.setLuceneMatchVersion(DEFAULT_VERSION);
+ factory.setLuceneMatchVersion(TEST_VERSION_CURRENT);
IndicNormalizationFilterFactory indicFilterFactory = new IndicNormalizationFilterFactory();
HindiNormalizationFilterFactory hindiFilterFactory = new HindiNormalizationFilterFactory();
HindiStemFilterFactory stemFactory = new HindiStemFilterFactory();
- stemFactory.setLuceneMatchVersion(DEFAULT_VERSION);
- factory.init(EMPTY_PARAMS);
- stemFactory.init(EMPTY_PARAMS);
+ stemFactory.setLuceneMatchVersion(TEST_VERSION_CURRENT);
+ Map<String, String> args = Collections.emptyMap();
+ factory.init(args);
+ stemFactory.init(args);
Tokenizer tokenizer = factory.create(reader);
TokenStream stream = indicFilterFactory.create(tokenizer);
stream = hindiFilterFactory.create(stream);
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestHungarianLightStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestHungarianLightStemFilterFactory.java?rev=1336462&r1=1336461&r2=1336462&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestHungarianLightStemFilterFactory.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestHungarianLightStemFilterFactory.java Thu May 10 01:06:43 2012
@@ -20,13 +20,14 @@ package org.apache.solr.analysis;
import java.io.Reader;
import java.io.StringReader;
+import org.apache.lucene.analysis.BaseTokenStreamTestCase;
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.analysis.TokenStream;
/**
* Simple tests to ensure the Hungarian light stem factory is working.
*/
-public class TestHungarianLightStemFilterFactory extends BaseTokenTestCase {
+public class TestHungarianLightStemFilterFactory extends BaseTokenStreamTestCase {
public void testStemming() throws Exception {
Reader reader = new StringReader("házakat");
HungarianLightStemFilterFactory factory = new HungarianLightStemFilterFactory();