You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2013/09/22 15:57:45 UTC
svn commit: r1525362 [1/3] - in /lucene/dev/trunk: lucene/
lucene/analysis/common/src/java/org/apache/lucene/analysis/core/
lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/
lucene/analysis/common/src/java/org/apache/lucene/analysis/pat...
Author: uschindler
Date: Sun Sep 22 13:57:43 2013
New Revision: 1525362
URL: http://svn.apache.org/r1525362
Log:
LUCENE-5235: Tokenizers now throw an IllegalStateException if the consumer does not call reset() before consuming the stream. Previous versions throwed NullPointerException or ArrayIndexOutOfBoundsException on best effort which was not user-friendly.
Modified:
lucene/dev/trunk/lucene/CHANGES.txt
lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/KeywordTokenizer.java
lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/Lucene43NGramTokenizer.java
lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternTokenizer.java
lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizer.java
lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizer.java
lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizer.java
lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/CharTokenizer.java
lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizer.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicAnalyzer.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicNormalizationFilter.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicStemFilter.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianAnalyzer.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianStemmer.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/br/TestBrazilianStemmer.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/ca/TestCatalanAnalyzer.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKAnalyzer.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKWidthFilter.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/compound/TestCompoundWordTokenFilter.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechAnalyzer.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechStemmer.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/da/TestDanishAnalyzer.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanAnalyzer.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanLightStemFilter.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanMinimalStemFilter.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanNormalizationFilter.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanStemFilter.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/GreekAnalyzerTest.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/TestGreekStemmer.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestEnglishAnalyzer.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestEnglishMinimalStemFilter.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestKStemmer.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestPorterStemFilter.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishAnalyzer.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishLightStemFilter.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/eu/TestBasqueAnalyzer.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianAnalyzer.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianNormalizationFilter.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/fi/TestFinnishAnalyzer.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/fi/TestFinnishLightStemFilter.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchAnalyzer.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchLightStemFilter.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchMinimalStemFilter.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/ga/TestIrishAnalyzer.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/ga/TestIrishLowerCaseFilter.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianAnalyzer.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianMinimalStemFilter.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianStemFilter.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiAnalyzer.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiNormalizer.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiStemmer.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianAnalyzer.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianLightStemFilter.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/HunspellStemFilterTest.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/hy/TestArmenianAnalyzer.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/id/TestIndonesianAnalyzer.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/id/TestIndonesianStemmer.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/in/TestIndicNormalizer.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/it/TestItalianAnalyzer.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/it/TestItalianLightStemFilter.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/lv/TestLatvianAnalyzer.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/lv/TestLatvianStemmer.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestASCIIFoldingFilter.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestCapitalizationFilter.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestHyphenatedWordsFilter.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLengthFilter.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestRemoveDuplicatesTokenFilter.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestTrimFilter.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/EdgeNGramTokenFilterTest.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/nl/TestDutchStemmer.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/no/TestNorwegianAnalyzer.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/no/TestNorwegianLightStemFilter.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/no/TestNorwegianMinimalStemFilter.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternReplaceFilter.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/DelimitedPayloadTokenFilterTest.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseAnalyzer.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseLightStemFilter.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseMinimalStemFilter.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseStemFilter.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/reverse/TestReverseStringFilter.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/ro/TestRomanianAnalyzer.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/ru/TestRussianAnalyzer.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/ru/TestRussianLightStemFilter.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapperTest.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/shingle/ShingleFilterTest.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowball.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/sv/TestSwedishAnalyzer.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/sv/TestSwedishLightStemFilter.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/th/TestThaiAnalyzer.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/tr/TestTurkishAnalyzer.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/tr/TestTurkishLowerCaseFilter.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestElision.java
lucene/dev/trunk/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/ICUTokenizer.java
lucene/dev/trunk/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUFoldingFilter.java
lucene/dev/trunk/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUNormalizer2Filter.java
lucene/dev/trunk/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUTransformFilter.java
lucene/dev/trunk/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestICUTokenizer.java
lucene/dev/trunk/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestWithCJKBigramFilter.java
lucene/dev/trunk/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseTokenizer.java
lucene/dev/trunk/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseBaseFormFilter.java
lucene/dev/trunk/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseKatakanaStemFilter.java
lucene/dev/trunk/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseReadingFormFilter.java
lucene/dev/trunk/lucene/analysis/morfologik/src/test/org/apache/lucene/analysis/morfologik/TestMorfologikAnalyzer.java
lucene/dev/trunk/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/DoubleMetaphoneFilterTest.java
lucene/dev/trunk/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestBeiderMorseFilter.java
lucene/dev/trunk/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestDoubleMetaphoneFilterFactory.java
lucene/dev/trunk/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestPhoneticFilter.java
lucene/dev/trunk/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/SentenceTokenizer.java
lucene/dev/trunk/lucene/analysis/smartcn/src/test/org/apache/lucene/analysis/cn/smart/TestSmartChineseAnalyzer.java
lucene/dev/trunk/lucene/analysis/stempel/src/test/org/apache/lucene/analysis/pl/TestPolishAnalyzer.java
lucene/dev/trunk/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/BaseUIMATokenizer.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/analysis/Tokenizer.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/analysis/TestGraphTokenizers.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/analysis/TestMockAnalyzer.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTermRangeQuery.java
lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/highlight/OffsetLimitTokenFilterTest.java
lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java
lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiPhraseQueryParsing.java
lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/analysis/BaseTokenStreamTestCase.java
lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/analysis/VocabularyAssert.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/TrieTokenizerFactory.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/BoolField.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/PreAnalyzedField.java
Modified: lucene/dev/trunk/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/CHANGES.txt?rev=1525362&r1=1525361&r2=1525362&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/CHANGES.txt (original)
+++ lucene/dev/trunk/lucene/CHANGES.txt Sun Sep 22 13:57:43 2013
@@ -74,6 +74,12 @@ New Features
* LUCENE-5219: Add support to SynonymFilterFactory for custom
parsers. (Ryan Ernst via Robert Muir)
+* LUCENE-5235: Tokenizers now throw an IllegalStateException if the
+ consumer does not call reset() before consuming the stream. Previous
+ versions throwed NullPointerException or ArrayIndexOutOfBoundsException
+ on best effort which was not user-friendly.
+ (Uwe Schindler, Robert Muir)
+
Bug Fixes
* LUCENE-4998: Fixed a few places to pass IOContext.READONCE instead
@@ -94,6 +100,11 @@ Documentation
Changes in backwards compatibility policy
+* LUCENE-5235: Sub classes of Tokenizer have to call super.reset()
+ when implementing reset(). Otherwise the consumer will get an
+ IllegalStateException because the Reader is not correctly assigned.
+ (Uwe Schindler, Robert Muir)
+
* LUCENE-5204: Directory doesn't have default implementations for
LockFactory-related methods, which have been moved to BaseDirectory. If you
had a custom Directory implementation that extended Directory, you need to
Modified: lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/KeywordTokenizer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/KeywordTokenizer.java?rev=1525362&r1=1525361&r2=1525362&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/KeywordTokenizer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/KeywordTokenizer.java Sun Sep 22 13:57:43 2013
@@ -88,6 +88,7 @@ public final class KeywordTokenizer exte
@Override
public void reset() throws IOException {
+ super.reset();
this.done = false;
}
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/Lucene43NGramTokenizer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/Lucene43NGramTokenizer.java?rev=1525362&r1=1525361&r2=1525362&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/Lucene43NGramTokenizer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/Lucene43NGramTokenizer.java Sun Sep 22 13:57:43 2013
@@ -140,7 +140,8 @@ public final class Lucene43NGramTokenize
}
@Override
- public void end() {
+ public void end() throws IOException {
+ super.end();
// set final offset
final int finalOffset = correctOffset(charsRead);
this.offsetAtt.setOffset(finalOffset, finalOffset);
Modified: lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternTokenizer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternTokenizer.java?rev=1525362&r1=1525361&r2=1525362&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternTokenizer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternTokenizer.java Sun Sep 22 13:57:43 2013
@@ -138,6 +138,7 @@ public final class PatternTokenizer exte
@Override
public void reset() throws IOException {
+ super.reset();
fillBuffer(str, input);
matcher.reset(str);
index = 0;
Modified: lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizer.java?rev=1525362&r1=1525361&r2=1525362&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizer.java Sun Sep 22 13:57:43 2013
@@ -114,7 +114,7 @@ public final class ClassicTokenizer exte
}
private void init(Version matchVersion) {
- this.scanner = new ClassicTokenizerImpl(null); // best effort NPE if you dont call reset
+ this.scanner = new ClassicTokenizerImpl(input);
}
// this tokenizer generates three attributes:
@@ -170,9 +170,16 @@ public final class ClassicTokenizer exte
// adjust any skipped tokens
posIncrAtt.setPositionIncrement(posIncrAtt.getPositionIncrement()+skippedPositions);
}
+
+ @Override
+ public void close() throws IOException {
+ super.close();
+ scanner.yyreset(input);
+ }
@Override
public void reset() throws IOException {
+ super.reset();
scanner.yyreset(input);
skippedPositions = 0;
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizer.java?rev=1525362&r1=1525361&r2=1525362&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizer.java Sun Sep 22 13:57:43 2013
@@ -128,7 +128,7 @@ public final class StandardTokenizer ext
}
private final void init(Version matchVersion) {
- this.scanner = new StandardTokenizerImpl(null); // best effort NPE if you dont call reset
+ this.scanner = new StandardTokenizerImpl(input);
}
// this tokenizer generates three attributes:
@@ -180,7 +180,14 @@ public final class StandardTokenizer ext
}
@Override
+ public void close() throws IOException {
+ super.close();
+ scanner.yyreset(input);
+ }
+
+ @Override
public void reset() throws IOException {
+ super.reset();
scanner.yyreset(input);
skippedPositions = 0;
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizer.java?rev=1525362&r1=1525361&r2=1525362&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizer.java Sun Sep 22 13:57:43 2013
@@ -111,8 +111,8 @@ public final class UAX29URLEmailTokenize
this.scanner = getScannerFor(matchVersion);
}
- private static StandardTokenizerInterface getScannerFor(Version matchVersion) {
- return new UAX29URLEmailTokenizerImpl(null); // best effort NPE if you dont call reset
+ private StandardTokenizerInterface getScannerFor(Version matchVersion) {
+ return new UAX29URLEmailTokenizerImpl(input);
}
// this tokenizer generates three attributes:
@@ -157,9 +157,16 @@ public final class UAX29URLEmailTokenize
// adjust any skipped tokens
posIncrAtt.setPositionIncrement(posIncrAtt.getPositionIncrement()+skippedPositions);
}
+
+ @Override
+ public void close() throws IOException {
+ super.close();
+ scanner.yyreset(input);
+ }
@Override
public void reset() throws IOException {
+ super.reset();
scanner.yyreset(input);
skippedPositions = 0;
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/CharTokenizer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/CharTokenizer.java?rev=1525362&r1=1525361&r2=1525362&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/CharTokenizer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/CharTokenizer.java Sun Sep 22 13:57:43 2013
@@ -62,8 +62,7 @@ public abstract class CharTokenizer exte
charUtils = CharacterUtils.getInstance(matchVersion);
}
- // note: bufferIndex is -1 here to best-effort AIOOBE consumers that don't call reset()
- private int offset = 0, bufferIndex = -1, dataLen = 0, finalOffset = 0;
+ private int offset = 0, bufferIndex = 0, dataLen = 0, finalOffset = 0;
private static final int MAX_WORD_LEN = 255;
private static final int IO_BUFFER_SIZE = 4096;
@@ -150,6 +149,7 @@ public abstract class CharTokenizer exte
@Override
public void reset() throws IOException {
+ super.reset();
bufferIndex = 0;
offset = 0;
dataLen = 0;
Modified: lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizer.java?rev=1525362&r1=1525361&r2=1525362&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizer.java Sun Sep 22 13:57:43 2013
@@ -143,7 +143,7 @@ public final class WikipediaTokenizer ex
*/
public WikipediaTokenizer(Reader input, int tokenOutput, Set<String> untokenizedTypes) {
super(input);
- this.scanner = new WikipediaTokenizerImpl(null); // best effort NPE if you dont call reset
+ this.scanner = new WikipediaTokenizerImpl(this.input);
init(tokenOutput, untokenizedTypes);
}
@@ -156,7 +156,7 @@ public final class WikipediaTokenizer ex
*/
public WikipediaTokenizer(AttributeFactory factory, Reader input, int tokenOutput, Set<String> untokenizedTypes) {
super(factory, input);
- this.scanner = new WikipediaTokenizerImpl(null); // best effort NPE if you dont call reset
+ this.scanner = new WikipediaTokenizerImpl(this.input);
init(tokenOutput, untokenizedTypes);
}
@@ -295,6 +295,12 @@ public final class WikipediaTokenizer ex
offsetAtt.setOffset(correctOffset(start), correctOffset(start + termAtt.length()));
}
+ @Override
+ public void close() throws IOException {
+ super.close();
+ scanner.yyreset(input);
+ }
+
/*
* (non-Javadoc)
*
@@ -302,6 +308,7 @@ public final class WikipediaTokenizer ex
*/
@Override
public void reset() throws IOException {
+ super.reset();
scanner.yyreset(input);
tokens = null;
scanner.reset();
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicAnalyzer.java?rev=1525362&r1=1525361&r2=1525362&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicAnalyzer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicAnalyzer.java Sun Sep 22 13:57:43 2013
@@ -60,8 +60,8 @@ public class TestArabicAnalyzer extends
*/
public void testReusableTokenStream() throws Exception {
ArabicAnalyzer a = new ArabicAnalyzer(TEST_VERSION_CURRENT);
- assertAnalyzesToReuse(a, "ÙبÙر", new String[] { "ÙبÙر" });
- assertAnalyzesToReuse(a, "ÙبÙرة", new String[] { "ÙبÙر" }); // feminine marker
+ assertAnalyzesTo(a, "ÙبÙر", new String[] { "ÙبÙر" });
+ assertAnalyzesTo(a, "ÙبÙرة", new String[] { "ÙبÙر" }); // feminine marker
}
/**
@@ -86,12 +86,12 @@ public class TestArabicAnalyzer extends
CharArraySet set = new CharArraySet(TEST_VERSION_CURRENT, asSet("ساÙدÙات"), false);
ArabicAnalyzer a = new ArabicAnalyzer(TEST_VERSION_CURRENT, CharArraySet.EMPTY_SET, set);
assertAnalyzesTo(a, "ÙبÙرة the quick ساÙدÙات", new String[] { "ÙبÙر","the", "quick", "ساÙدÙات" });
- assertAnalyzesToReuse(a, "ÙبÙرة the quick ساÙدÙات", new String[] { "ÙبÙر","the", "quick", "ساÙدÙات" });
+ assertAnalyzesTo(a, "ÙبÙرة the quick ساÙدÙات", new String[] { "ÙبÙر","the", "quick", "ساÙدÙات" });
a = new ArabicAnalyzer(TEST_VERSION_CURRENT, CharArraySet.EMPTY_SET, CharArraySet.EMPTY_SET);
assertAnalyzesTo(a, "ÙبÙرة the quick ساÙدÙات", new String[] { "ÙبÙر","the", "quick", "ساÙد" });
- assertAnalyzesToReuse(a, "ÙبÙرة the quick ساÙدÙات", new String[] { "ÙبÙر","the", "quick", "ساÙد" });
+ assertAnalyzesTo(a, "ÙبÙرة the quick ساÙدÙات", new String[] { "ÙبÙر","the", "quick", "ساÙد" });
}
/** blast some random strings through the analyzer */
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicNormalizationFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicNormalizationFilter.java?rev=1525362&r1=1525361&r2=1525362&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicNormalizationFilter.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicNormalizationFilter.java Sun Sep 22 13:57:43 2013
@@ -102,7 +102,7 @@ public class TestArabicNormalizationFilt
return new TokenStreamComponents(tokenizer, new ArabicNormalizationFilter(tokenizer));
}
};
- checkOneTermReuse(a, "", "");
+ checkOneTerm(a, "", "");
}
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicStemFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicStemFilter.java?rev=1525362&r1=1525361&r2=1525362&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicStemFilter.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicStemFilter.java Sun Sep 22 13:57:43 2013
@@ -142,6 +142,6 @@ public class TestArabicStemFilter extend
return new TokenStreamComponents(tokenizer, new ArabicStemFilter(tokenizer));
}
};
- checkOneTermReuse(a, "", "");
+ checkOneTerm(a, "", "");
}
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianAnalyzer.java?rev=1525362&r1=1525361&r2=1525362&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianAnalyzer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianAnalyzer.java Sun Sep 22 13:57:43 2013
@@ -49,8 +49,8 @@ public class TestBulgarianAnalyzer exten
public void testReusableTokenStream() throws IOException {
Analyzer a = new BulgarianAnalyzer(TEST_VERSION_CURRENT);
- assertAnalyzesToReuse(a, "докÑменÑи", new String[] {"докÑменÑ"});
- assertAnalyzesToReuse(a, "докÑменÑ", new String[] {"докÑменÑ"});
+ assertAnalyzesTo(a, "докÑменÑи", new String[] {"докÑменÑ"});
+ assertAnalyzesTo(a, "докÑменÑ", new String[] {"докÑменÑ"});
}
/**
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianStemmer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianStemmer.java?rev=1525362&r1=1525361&r2=1525362&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianStemmer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianStemmer.java Sun Sep 22 13:57:43 2013
@@ -234,6 +234,6 @@ public class TestBulgarianStemmer extend
return new TokenStreamComponents(tokenizer, new BulgarianStemFilter(tokenizer));
}
};
- checkOneTermReuse(a, "", "");
+ checkOneTerm(a, "", "");
}
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/br/TestBrazilianStemmer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/br/TestBrazilianStemmer.java?rev=1525362&r1=1525361&r2=1525362&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/br/TestBrazilianStemmer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/br/TestBrazilianStemmer.java Sun Sep 22 13:57:43 2013
@@ -157,7 +157,7 @@ public class TestBrazilianStemmer extend
}
private void checkReuse(Analyzer a, String input, String expected) throws Exception {
- checkOneTermReuse(a, input, expected);
+ checkOneTerm(a, input, expected);
}
/** blast some random strings through the analyzer */
@@ -173,6 +173,6 @@ public class TestBrazilianStemmer extend
return new TokenStreamComponents(tokenizer, new BrazilianStemFilter(tokenizer));
}
};
- checkOneTermReuse(a, "", "");
+ checkOneTerm(a, "", "");
}
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/ca/TestCatalanAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/ca/TestCatalanAnalyzer.java?rev=1525362&r1=1525361&r2=1525362&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/ca/TestCatalanAnalyzer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/ca/TestCatalanAnalyzer.java Sun Sep 22 13:57:43 2013
@@ -34,8 +34,8 @@ public class TestCatalanAnalyzer extends
public void testBasics() throws IOException {
Analyzer a = new CatalanAnalyzer(TEST_VERSION_CURRENT);
// stemming
- checkOneTermReuse(a, "llengües", "llengu");
- checkOneTermReuse(a, "llengua", "llengu");
+ checkOneTerm(a, "llengües", "llengu");
+ checkOneTerm(a, "llengua", "llengu");
// stopword
assertAnalyzesTo(a, "un", new String[] { });
}
@@ -52,8 +52,8 @@ public class TestCatalanAnalyzer extends
CharArraySet exclusionSet = new CharArraySet(TEST_VERSION_CURRENT, asSet("llengües"), false);
Analyzer a = new CatalanAnalyzer(TEST_VERSION_CURRENT,
CatalanAnalyzer.getDefaultStopSet(), exclusionSet);
- checkOneTermReuse(a, "llengües", "llengües");
- checkOneTermReuse(a, "llengua", "llengu");
+ checkOneTerm(a, "llengües", "llengües");
+ checkOneTerm(a, "llengua", "llengu");
}
/** blast some random strings through the analyzer */
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKAnalyzer.java?rev=1525362&r1=1525361&r2=1525362&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKAnalyzer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKAnalyzer.java Sun Sep 22 13:57:43 2013
@@ -167,14 +167,14 @@ public class TestCJKAnalyzer extends Bas
}
public void testReusableTokenStream() throws IOException {
- assertAnalyzesToReuse(analyzer, "ãããããabcããããã",
+ assertAnalyzesTo(analyzer, "ãããããabcããããã",
new String[] { "ãã", "ãã", "ãã", "ãã", "abc", "ãã", "ãã", "ãã", "ãã" },
new int[] { 0, 1, 2, 3, 5, 8, 9, 10, 11 },
new int[] { 2, 3, 4, 5, 8, 10, 11, 12, 13 },
new String[] { "<DOUBLE>", "<DOUBLE>", "<DOUBLE>", "<DOUBLE>", "<ALPHANUM>", "<DOUBLE>", "<DOUBLE>", "<DOUBLE>", "<DOUBLE>" },
new int[] { 1, 1, 1, 1, 1, 1, 1, 1, 1});
- assertAnalyzesToReuse(analyzer, "ãããããabãcãããã ã",
+ assertAnalyzesTo(analyzer, "ãããããabãcãããã ã",
new String[] { "ãã", "ãã", "ãã", "ãã", "ab", "ã", "c", "ãã", "ãã", "ãã", "ã" },
new int[] { 0, 1, 2, 3, 5, 7, 8, 9, 10, 11, 14 },
new int[] { 2, 3, 4, 5, 7, 8, 9, 11, 12, 13, 15 },
@@ -288,6 +288,6 @@ public class TestCJKAnalyzer extends Bas
return new TokenStreamComponents(tokenizer, new CJKBigramFilter(tokenizer));
}
};
- checkOneTermReuse(a, "", "");
+ checkOneTerm(a, "", "");
}
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKWidthFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKWidthFilter.java?rev=1525362&r1=1525361&r2=1525362&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKWidthFilter.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKWidthFilter.java Sun Sep 22 13:57:43 2013
@@ -74,6 +74,6 @@ public class TestCJKWidthFilter extends
return new TokenStreamComponents(tokenizer, new CJKWidthFilter(tokenizer));
}
};
- checkOneTermReuse(a, "", "");
+ checkOneTerm(a, "", "");
}
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/compound/TestCompoundWordTokenFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/compound/TestCompoundWordTokenFilter.java?rev=1525362&r1=1525361&r2=1525362&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/compound/TestCompoundWordTokenFilter.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/compound/TestCompoundWordTokenFilter.java Sun Sep 22 13:57:43 2013
@@ -377,7 +377,7 @@ public class TestCompoundWordTokenFilter
return new TokenStreamComponents(tokenizer, new DictionaryCompoundWordTokenFilter(TEST_VERSION_CURRENT, tokenizer, dict));
}
};
- checkOneTermReuse(a, "", "");
+ checkOneTerm(a, "", "");
InputSource is = new InputSource(getClass().getResource("da_UTF8.xml").toExternalForm());
final HyphenationTree hyphenator = HyphenationCompoundWordTokenFilter.getHyphenationTree(is);
@@ -390,6 +390,6 @@ public class TestCompoundWordTokenFilter
return new TokenStreamComponents(tokenizer, filter);
}
};
- checkOneTermReuse(b, "", "");
+ checkOneTerm(b, "", "");
}
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechAnalyzer.java?rev=1525362&r1=1525361&r2=1525362&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechAnalyzer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechAnalyzer.java Sun Sep 22 13:57:43 2013
@@ -39,8 +39,8 @@ public class TestCzechAnalyzer extends B
public void testReusableTokenStream() throws Exception {
Analyzer analyzer = new CzechAnalyzer(TEST_VERSION_CURRENT);
- assertAnalyzesToReuse(analyzer, "Pokud mluvime o volnem", new String[] { "mluvim", "voln" });
- assertAnalyzesToReuse(analyzer, "Äeská Republika", new String[] { "Äesk", "republik" });
+ assertAnalyzesTo(analyzer, "Pokud mluvime o volnem", new String[] { "mluvim", "voln" });
+ assertAnalyzesTo(analyzer, "Äeská Republika", new String[] { "Äesk", "republik" });
}
public void testWithStemExclusionSet() throws IOException{
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechStemmer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechStemmer.java?rev=1525362&r1=1525361&r2=1525362&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechStemmer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechStemmer.java Sun Sep 22 13:57:43 2013
@@ -294,7 +294,7 @@ public class TestCzechStemmer extends Ba
return new TokenStreamComponents(tokenizer, new CzechStemFilter(tokenizer));
}
};
- checkOneTermReuse(a, "", "");
+ checkOneTerm(a, "", "");
}
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/da/TestDanishAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/da/TestDanishAnalyzer.java?rev=1525362&r1=1525361&r2=1525362&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/da/TestDanishAnalyzer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/da/TestDanishAnalyzer.java Sun Sep 22 13:57:43 2013
@@ -34,8 +34,8 @@ public class TestDanishAnalyzer extends
public void testBasics() throws IOException {
Analyzer a = new DanishAnalyzer(TEST_VERSION_CURRENT);
// stemming
- checkOneTermReuse(a, "undersøg", "undersøg");
- checkOneTermReuse(a, "undersøgelse", "undersøg");
+ checkOneTerm(a, "undersøg", "undersøg");
+ checkOneTerm(a, "undersøgelse", "undersøg");
// stopword
assertAnalyzesTo(a, "på", new String[] {});
}
@@ -45,8 +45,8 @@ public class TestDanishAnalyzer extends
CharArraySet exclusionSet = new CharArraySet(TEST_VERSION_CURRENT, asSet("undersøgelse"), false);
Analyzer a = new DanishAnalyzer(TEST_VERSION_CURRENT,
DanishAnalyzer.getDefaultStopSet(), exclusionSet);
- checkOneTermReuse(a, "undersøgelse", "undersøgelse");
- checkOneTermReuse(a, "undersøg", "undersøg");
+ checkOneTerm(a, "undersøgelse", "undersøgelse");
+ checkOneTerm(a, "undersøg", "undersøg");
}
/** blast some random strings through the analyzer */
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanAnalyzer.java?rev=1525362&r1=1525361&r2=1525362&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanAnalyzer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanAnalyzer.java Sun Sep 22 13:57:43 2013
@@ -29,9 +29,9 @@ import org.apache.lucene.analysis.util.C
public class TestGermanAnalyzer extends BaseTokenStreamTestCase {
public void testReusableTokenStream() throws Exception {
Analyzer a = new GermanAnalyzer(TEST_VERSION_CURRENT);
- checkOneTermReuse(a, "Tisch", "tisch");
- checkOneTermReuse(a, "Tische", "tisch");
- checkOneTermReuse(a, "Tischen", "tisch");
+ checkOneTerm(a, "Tisch", "tisch");
+ checkOneTerm(a, "Tische", "tisch");
+ checkOneTerm(a, "Tischen", "tisch");
}
public void testWithKeywordAttribute() throws IOException {
@@ -46,7 +46,7 @@ public class TestGermanAnalyzer extends
public void testStemExclusionTable() throws Exception {
GermanAnalyzer a = new GermanAnalyzer(TEST_VERSION_CURRENT, CharArraySet.EMPTY_SET,
new CharArraySet(TEST_VERSION_CURRENT, asSet("tischen"), false));
- checkOneTermReuse(a, "tischen", "tischen");
+ checkOneTerm(a, "tischen", "tischen");
}
/** test some features of the new snowball filter
@@ -55,8 +55,8 @@ public class TestGermanAnalyzer extends
public void testGermanSpecials() throws Exception {
GermanAnalyzer a = new GermanAnalyzer(TEST_VERSION_CURRENT);
// a/o/u + e is equivalent to the umlaut form
- checkOneTermReuse(a, "Schaltflächen", "schaltflach");
- checkOneTermReuse(a, "Schaltflaechen", "schaltflach");
+ checkOneTerm(a, "Schaltflächen", "schaltflach");
+ checkOneTerm(a, "Schaltflaechen", "schaltflach");
}
/** blast some random strings through the analyzer */
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanLightStemFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanLightStemFilter.java?rev=1525362&r1=1525361&r2=1525362&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanLightStemFilter.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanLightStemFilter.java Sun Sep 22 13:57:43 2013
@@ -75,6 +75,6 @@ public class TestGermanLightStemFilter e
return new TokenStreamComponents(tokenizer, new GermanLightStemFilter(tokenizer));
}
};
- checkOneTermReuse(a, "", "");
+ checkOneTerm(a, "", "");
}
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanMinimalStemFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanMinimalStemFilter.java?rev=1525362&r1=1525361&r2=1525362&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanMinimalStemFilter.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanMinimalStemFilter.java Sun Sep 22 13:57:43 2013
@@ -87,6 +87,6 @@ public class TestGermanMinimalStemFilter
return new TokenStreamComponents(tokenizer, new GermanMinimalStemFilter(tokenizer));
}
};
- checkOneTermReuse(a, "", "");
+ checkOneTerm(a, "", "");
}
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanNormalizationFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanNormalizationFilter.java?rev=1525362&r1=1525361&r2=1525362&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanNormalizationFilter.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanNormalizationFilter.java Sun Sep 22 13:57:43 2013
@@ -75,6 +75,6 @@ public class TestGermanNormalizationFilt
return new TokenStreamComponents(tokenizer, new GermanNormalizationFilter(tokenizer));
}
};
- checkOneTermReuse(a, "", "");
+ checkOneTerm(a, "", "");
}
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanStemFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanStemFilter.java?rev=1525362&r1=1525361&r2=1525362&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanStemFilter.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanStemFilter.java Sun Sep 22 13:57:43 2013
@@ -88,6 +88,6 @@ public class TestGermanStemFilter extend
return new TokenStreamComponents(tokenizer, new GermanStemFilter(tokenizer));
}
};
- checkOneTermReuse(a, "", "");
+ checkOneTerm(a, "", "");
}
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/GreekAnalyzerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/GreekAnalyzerTest.java?rev=1525362&r1=1525361&r2=1525362&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/GreekAnalyzerTest.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/GreekAnalyzerTest.java Sun Sep 22 13:57:43 2013
@@ -51,16 +51,16 @@ public class GreekAnalyzerTest extends B
Analyzer a = new GreekAnalyzer(TEST_VERSION_CURRENT);
// Verify the correct analysis of capitals and small accented letters, and
// stemming
- assertAnalyzesToReuse(a, "Îία εξαιÏεÏικά καλή και ÏλοÏÏια ÏειÏά ÏαÏακÏήÏÏν ÏÎ·Ï ÎÎ»Î»Î·Î½Î¹ÎºÎ®Ï Î³Î»ÏÏÏαÏ",
+ assertAnalyzesTo(a, "Îία εξαιÏεÏικά καλή και ÏλοÏÏια ÏειÏά ÏαÏακÏήÏÏν ÏÎ·Ï ÎÎ»Î»Î·Î½Î¹ÎºÎ®Ï Î³Î»ÏÏÏαÏ",
new String[] { "μια", "εξαιÏεÏ", "καλ", "ÏλοÏ
Ï", "ÏειÏ", "ÏαÏακÏηÏ",
"ελληνικ", "γλÏÏÏ" });
// Verify the correct analysis of small letters with diaeresis and the elimination
// of punctuation marks
- assertAnalyzesToReuse(a, "Î ÏοÏÏνÏα (και) [ÏολλαÏλÎÏ] - ÎÎÎÎÎÎΣ",
+ assertAnalyzesTo(a, "Î ÏοÏÏνÏα (και) [ÏολλαÏλÎÏ] - ÎÎÎÎÎÎΣ",
new String[] { "ÏÏοιονÏ", "ÏολλαÏλ", "αναγκ" });
// Verify the correct analysis of capital accented letters and capital letters with diaeresis,
// as well as the elimination of stop words
- assertAnalyzesToReuse(a, "ΠΡÎΫΠÎÎÎΣÎÎΣ ÎÏογοÏ, ο μεÏÏÏÏ ÎºÎ±Î¹ οι άλλοι",
+ assertAnalyzesTo(a, "ΠΡÎΫΠÎÎÎΣÎÎΣ ÎÏογοÏ, ο μεÏÏÏÏ ÎºÎ±Î¹ οι άλλοι",
new String[] { "ÏÏοÏ
ÏοθεÏ", "αÏογ", "μεÏÏ", "αλλ" });
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/TestGreekStemmer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/TestGreekStemmer.java?rev=1525362&r1=1525361&r2=1525362&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/TestGreekStemmer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/TestGreekStemmer.java Sun Sep 22 13:57:43 2013
@@ -536,6 +536,6 @@ public class TestGreekStemmer extends Ba
return new TokenStreamComponents(tokenizer, new GreekStemFilter(tokenizer));
}
};
- checkOneTermReuse(a, "", "");
+ checkOneTerm(a, "", "");
}
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestEnglishAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestEnglishAnalyzer.java?rev=1525362&r1=1525361&r2=1525362&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestEnglishAnalyzer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestEnglishAnalyzer.java Sun Sep 22 13:57:43 2013
@@ -34,14 +34,14 @@ public class TestEnglishAnalyzer extends
public void testBasics() throws IOException {
Analyzer a = new EnglishAnalyzer(TEST_VERSION_CURRENT);
// stemming
- checkOneTermReuse(a, "books", "book");
- checkOneTermReuse(a, "book", "book");
+ checkOneTerm(a, "books", "book");
+ checkOneTerm(a, "book", "book");
// stopword
assertAnalyzesTo(a, "the", new String[] {});
// possessive removal
- checkOneTermReuse(a, "steven's", "steven");
- checkOneTermReuse(a, "steven\u2019s", "steven");
- checkOneTermReuse(a, "steven\uFF07s", "steven");
+ checkOneTerm(a, "steven's", "steven");
+ checkOneTerm(a, "steven\u2019s", "steven");
+ checkOneTerm(a, "steven\uFF07s", "steven");
}
/** test use of exclusion set */
@@ -49,8 +49,8 @@ public class TestEnglishAnalyzer extends
CharArraySet exclusionSet = new CharArraySet(TEST_VERSION_CURRENT, asSet("books"), false);
Analyzer a = new EnglishAnalyzer(TEST_VERSION_CURRENT,
EnglishAnalyzer.getDefaultStopSet(), exclusionSet);
- checkOneTermReuse(a, "books", "books");
- checkOneTermReuse(a, "book", "book");
+ checkOneTerm(a, "books", "books");
+ checkOneTerm(a, "book", "book");
}
/** blast some random strings through the analyzer */
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestEnglishMinimalStemFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestEnglishMinimalStemFilter.java?rev=1525362&r1=1525361&r2=1525362&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestEnglishMinimalStemFilter.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestEnglishMinimalStemFilter.java Sun Sep 22 13:57:43 2013
@@ -65,6 +65,6 @@ public class TestEnglishMinimalStemFilte
return new TokenStreamComponents(tokenizer, new EnglishMinimalStemFilter(tokenizer));
}
};
- checkOneTermReuse(a, "", "");
+ checkOneTerm(a, "", "");
}
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestKStemmer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestKStemmer.java?rev=1525362&r1=1525361&r2=1525362&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestKStemmer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestKStemmer.java Sun Sep 22 13:57:43 2013
@@ -62,7 +62,7 @@ public class TestKStemmer extends BaseTo
return new TokenStreamComponents(tokenizer, new KStemFilter(tokenizer));
}
};
- checkOneTermReuse(a, "", "");
+ checkOneTerm(a, "", "");
}
/****** requires original java kstem source code to create map
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestPorterStemFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestPorterStemFilter.java?rev=1525362&r1=1525361&r2=1525362&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestPorterStemFilter.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestPorterStemFilter.java Sun Sep 22 13:57:43 2013
@@ -74,6 +74,6 @@ public class TestPorterStemFilter extend
return new TokenStreamComponents(tokenizer, new PorterStemFilter(tokenizer));
}
};
- checkOneTermReuse(a, "", "");
+ checkOneTerm(a, "", "");
}
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishAnalyzer.java?rev=1525362&r1=1525361&r2=1525362&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishAnalyzer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishAnalyzer.java Sun Sep 22 13:57:43 2013
@@ -34,8 +34,8 @@ public class TestSpanishAnalyzer extends
public void testBasics() throws IOException {
Analyzer a = new SpanishAnalyzer(TEST_VERSION_CURRENT);
// stemming
- checkOneTermReuse(a, "chicana", "chican");
- checkOneTermReuse(a, "chicano", "chican");
+ checkOneTerm(a, "chicana", "chican");
+ checkOneTerm(a, "chicano", "chican");
// stopword
assertAnalyzesTo(a, "los", new String[] {});
}
@@ -45,8 +45,8 @@ public class TestSpanishAnalyzer extends
CharArraySet exclusionSet = new CharArraySet(TEST_VERSION_CURRENT, asSet("chicano"), false);
Analyzer a = new SpanishAnalyzer(TEST_VERSION_CURRENT,
SpanishAnalyzer.getDefaultStopSet(), exclusionSet);
- checkOneTermReuse(a, "chicana", "chican");
- checkOneTermReuse(a, "chicano", "chicano");
+ checkOneTerm(a, "chicana", "chican");
+ checkOneTerm(a, "chicano", "chicano");
}
/** blast some random strings through the analyzer */
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishLightStemFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishLightStemFilter.java?rev=1525362&r1=1525361&r2=1525362&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishLightStemFilter.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishLightStemFilter.java Sun Sep 22 13:57:43 2013
@@ -59,6 +59,6 @@ public class TestSpanishLightStemFilter
return new TokenStreamComponents(tokenizer, new SpanishLightStemFilter(tokenizer));
}
};
- checkOneTermReuse(a, "", "");
+ checkOneTerm(a, "", "");
}
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/eu/TestBasqueAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/eu/TestBasqueAnalyzer.java?rev=1525362&r1=1525361&r2=1525362&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/eu/TestBasqueAnalyzer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/eu/TestBasqueAnalyzer.java Sun Sep 22 13:57:43 2013
@@ -34,8 +34,8 @@ public class TestBasqueAnalyzer extends
public void testBasics() throws IOException {
Analyzer a = new BasqueAnalyzer(TEST_VERSION_CURRENT);
// stemming
- checkOneTermReuse(a, "zaldi", "zaldi");
- checkOneTermReuse(a, "zaldiak", "zaldi");
+ checkOneTerm(a, "zaldi", "zaldi");
+ checkOneTerm(a, "zaldiak", "zaldi");
// stopword
assertAnalyzesTo(a, "izan", new String[] { });
}
@@ -45,8 +45,8 @@ public class TestBasqueAnalyzer extends
CharArraySet exclusionSet = new CharArraySet(TEST_VERSION_CURRENT, asSet("zaldiak"), false);
Analyzer a = new BasqueAnalyzer(TEST_VERSION_CURRENT,
BasqueAnalyzer.getDefaultStopSet(), exclusionSet);
- checkOneTermReuse(a, "zaldiak", "zaldiak");
- checkOneTermReuse(a, "mendiari", "mendi");
+ checkOneTerm(a, "zaldiak", "zaldiak");
+ checkOneTerm(a, "mendiari", "mendi");
}
/** blast some random strings through the analyzer */
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianAnalyzer.java?rev=1525362&r1=1525361&r2=1525362&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianAnalyzer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianAnalyzer.java Sun Sep 22 13:57:43 2013
@@ -208,8 +208,8 @@ public class TestPersianAnalyzer extends
*/
public void testReusableTokenStream() throws Exception {
Analyzer a = new PersianAnalyzer(TEST_VERSION_CURRENT);
- assertAnalyzesToReuse(a, "Ø®Ùرد٠Ù
٠شد٠بÙد٠باشد", new String[] { "Ø®ÙردÙ" });
- assertAnalyzesToReuse(a, "برگâÙا", new String[] { "برگ" });
+ assertAnalyzesTo(a, "Ø®Ùرد٠Ù
٠شد٠بÙد٠باشد", new String[] { "Ø®ÙردÙ" });
+ assertAnalyzesTo(a, "برگâÙا", new String[] { "برگ" });
}
/**
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianNormalizationFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianNormalizationFilter.java?rev=1525362&r1=1525361&r2=1525362&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianNormalizationFilter.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianNormalizationFilter.java Sun Sep 22 13:57:43 2013
@@ -72,7 +72,7 @@ public class TestPersianNormalizationFil
return new TokenStreamComponents(tokenizer, new PersianNormalizationFilter(tokenizer));
}
};
- checkOneTermReuse(a, "", "");
+ checkOneTerm(a, "", "");
}
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/fi/TestFinnishAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/fi/TestFinnishAnalyzer.java?rev=1525362&r1=1525361&r2=1525362&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/fi/TestFinnishAnalyzer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/fi/TestFinnishAnalyzer.java Sun Sep 22 13:57:43 2013
@@ -34,8 +34,8 @@ public class TestFinnishAnalyzer extends
public void testBasics() throws IOException {
Analyzer a = new FinnishAnalyzer(TEST_VERSION_CURRENT);
// stemming
- checkOneTermReuse(a, "edeltäjiinsä", "edeltäj");
- checkOneTermReuse(a, "edeltäjistään", "edeltäj");
+ checkOneTerm(a, "edeltäjiinsä", "edeltäj");
+ checkOneTerm(a, "edeltäjistään", "edeltäj");
// stopword
assertAnalyzesTo(a, "olla", new String[] {});
}
@@ -45,8 +45,8 @@ public class TestFinnishAnalyzer extends
CharArraySet exclusionSet = new CharArraySet(TEST_VERSION_CURRENT, asSet("edeltäjistään"), false);
Analyzer a = new FinnishAnalyzer(TEST_VERSION_CURRENT,
FinnishAnalyzer.getDefaultStopSet(), exclusionSet);
- checkOneTermReuse(a, "edeltäjiinsä", "edeltäj");
- checkOneTermReuse(a, "edeltäjistään", "edeltäjistään");
+ checkOneTerm(a, "edeltäjiinsä", "edeltäj");
+ checkOneTerm(a, "edeltäjistään", "edeltäjistään");
}
/** blast some random strings through the analyzer */
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/fi/TestFinnishLightStemFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/fi/TestFinnishLightStemFilter.java?rev=1525362&r1=1525361&r2=1525362&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/fi/TestFinnishLightStemFilter.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/fi/TestFinnishLightStemFilter.java Sun Sep 22 13:57:43 2013
@@ -75,6 +75,6 @@ public class TestFinnishLightStemFilter
return new TokenStreamComponents(tokenizer, new FinnishLightStemFilter(tokenizer));
}
};
- checkOneTermReuse(a, "", "");
+ checkOneTerm(a, "", "");
}
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchAnalyzer.java?rev=1525362&r1=1525361&r2=1525362&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchAnalyzer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchAnalyzer.java Sun Sep 22 13:57:43 2013
@@ -117,13 +117,13 @@ public class TestFrenchAnalyzer extends
public void testReusableTokenStream() throws Exception {
FrenchAnalyzer fa = new FrenchAnalyzer(TEST_VERSION_CURRENT);
// stopwords
- assertAnalyzesToReuse(
+ assertAnalyzesTo(
fa,
"le la chien les aux chat du des à cheval",
new String[] { "chien", "chat", "cheval" });
// some nouns and adjectives
- assertAnalyzesToReuse(
+ assertAnalyzesTo(
fa,
"lances chismes habitable chiste éléments captifs",
new String[] {
@@ -140,7 +140,7 @@ public class TestFrenchAnalyzer extends
set.add("habitable");
FrenchAnalyzer fa = new FrenchAnalyzer(TEST_VERSION_CURRENT,
CharArraySet.EMPTY_SET, set);
- assertAnalyzesToReuse(fa, "habitable chiste", new String[] { "habitable",
+ assertAnalyzesTo(fa, "habitable chiste", new String[] { "habitable",
"chist" });
fa = new FrenchAnalyzer(TEST_VERSION_CURRENT, CharArraySet.EMPTY_SET, set);
@@ -169,7 +169,7 @@ public class TestFrenchAnalyzer extends
/** test accent-insensitive */
public void testAccentInsensitive() throws Exception {
Analyzer a = new FrenchAnalyzer(TEST_VERSION_CURRENT);
- checkOneTermReuse(a, "sécuritaires", "securitair");
- checkOneTermReuse(a, "securitaires", "securitair");
+ checkOneTerm(a, "sécuritaires", "securitair");
+ checkOneTerm(a, "securitaires", "securitair");
}
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchLightStemFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchLightStemFilter.java?rev=1525362&r1=1525361&r2=1525362&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchLightStemFilter.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchLightStemFilter.java Sun Sep 22 13:57:43 2013
@@ -205,6 +205,6 @@ public class TestFrenchLightStemFilter e
return new TokenStreamComponents(tokenizer, new FrenchLightStemFilter(tokenizer));
}
};
- checkOneTermReuse(a, "", "");
+ checkOneTerm(a, "", "");
}
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchMinimalStemFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchMinimalStemFilter.java?rev=1525362&r1=1525361&r2=1525362&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchMinimalStemFilter.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchMinimalStemFilter.java Sun Sep 22 13:57:43 2013
@@ -89,6 +89,6 @@ public class TestFrenchMinimalStemFilter
return new TokenStreamComponents(tokenizer, new FrenchMinimalStemFilter(tokenizer));
}
};
- checkOneTermReuse(a, "", "");
+ checkOneTerm(a, "", "");
}
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/ga/TestIrishAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/ga/TestIrishAnalyzer.java?rev=1525362&r1=1525361&r2=1525362&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/ga/TestIrishAnalyzer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/ga/TestIrishAnalyzer.java Sun Sep 22 13:57:43 2013
@@ -34,8 +34,8 @@ public class TestIrishAnalyzer extends B
public void testBasics() throws IOException {
Analyzer a = new IrishAnalyzer(TEST_VERSION_CURRENT);
// stemming
- checkOneTermReuse(a, "siopadóireacht", "siopadóir");
- checkOneTermReuse(a, "sÃceapatacha", "sÃceapaite");
+ checkOneTerm(a, "siopadóireacht", "siopadóir");
+ checkOneTerm(a, "sÃceapatacha", "sÃceapaite");
// stopword
assertAnalyzesTo(a, "le", new String[] { });
}
@@ -52,8 +52,8 @@ public class TestIrishAnalyzer extends B
CharArraySet exclusionSet = new CharArraySet(TEST_VERSION_CURRENT, asSet("feirmeoireacht"), false);
Analyzer a = new IrishAnalyzer(TEST_VERSION_CURRENT,
IrishAnalyzer.getDefaultStopSet(), exclusionSet);
- checkOneTermReuse(a, "feirmeoireacht", "feirmeoireacht");
- checkOneTermReuse(a, "siopadóireacht", "siopadóir");
+ checkOneTerm(a, "feirmeoireacht", "feirmeoireacht");
+ checkOneTerm(a, "siopadóireacht", "siopadóir");
}
/** test special hyphen handling */
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/ga/TestIrishLowerCaseFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/ga/TestIrishLowerCaseFilter.java?rev=1525362&r1=1525361&r2=1525362&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/ga/TestIrishLowerCaseFilter.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/ga/TestIrishLowerCaseFilter.java Sun Sep 22 13:57:43 2013
@@ -52,6 +52,6 @@ public class TestIrishLowerCaseFilter ex
return new TokenStreamComponents(tokenizer, new IrishLowerCaseFilter(tokenizer));
}
};
- checkOneTermReuse(a, "", "");
+ checkOneTerm(a, "", "");
}
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianAnalyzer.java?rev=1525362&r1=1525361&r2=1525362&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianAnalyzer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianAnalyzer.java Sun Sep 22 13:57:43 2013
@@ -34,8 +34,8 @@ public class TestGalicianAnalyzer extend
public void testBasics() throws IOException {
Analyzer a = new GalicianAnalyzer(TEST_VERSION_CURRENT);
// stemming
- checkOneTermReuse(a, "correspondente", "correspond");
- checkOneTermReuse(a, "corresponderá", "correspond");
+ checkOneTerm(a, "correspondente", "correspond");
+ checkOneTerm(a, "corresponderá", "correspond");
// stopword
assertAnalyzesTo(a, "e", new String[] {});
}
@@ -45,8 +45,8 @@ public class TestGalicianAnalyzer extend
CharArraySet exclusionSet = new CharArraySet(TEST_VERSION_CURRENT, asSet("correspondente"), false);
Analyzer a = new GalicianAnalyzer(TEST_VERSION_CURRENT,
GalicianAnalyzer.getDefaultStopSet(), exclusionSet);
- checkOneTermReuse(a, "correspondente", "correspondente");
- checkOneTermReuse(a, "corresponderá", "correspond");
+ checkOneTerm(a, "correspondente", "correspondente");
+ checkOneTerm(a, "corresponderá", "correspond");
}
/** blast some random strings through the analyzer */
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianMinimalStemFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianMinimalStemFilter.java?rev=1525362&r1=1525361&r2=1525362&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianMinimalStemFilter.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianMinimalStemFilter.java Sun Sep 22 13:57:43 2013
@@ -79,6 +79,6 @@ public class TestGalicianMinimalStemFilt
return new TokenStreamComponents(tokenizer, new GalicianMinimalStemFilter(tokenizer));
}
};
- checkOneTermReuse(a, "", "");
+ checkOneTerm(a, "", "");
}
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianStemFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianStemFilter.java?rev=1525362&r1=1525361&r2=1525362&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianStemFilter.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianStemFilter.java Sun Sep 22 13:57:43 2013
@@ -58,6 +58,6 @@ public class TestGalicianStemFilter exte
return new TokenStreamComponents(tokenizer, new GalicianStemFilter(tokenizer));
}
};
- checkOneTermReuse(a, "", "");
+ checkOneTerm(a, "", "");
}
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiAnalyzer.java?rev=1525362&r1=1525361&r2=1525362&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiAnalyzer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiAnalyzer.java Sun Sep 22 13:57:43 2013
@@ -34,15 +34,15 @@ public class TestHindiAnalyzer extends B
public void testBasics() throws Exception {
Analyzer a = new HindiAnalyzer(TEST_VERSION_CURRENT);
// two ways to write 'hindi' itself.
- checkOneTermReuse(a, "हिनà¥à¤¦à¥", "हिà¤à¤¦");
- checkOneTermReuse(a, "हिà¤à¤¦à¥", "हिà¤à¤¦");
+ 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,
HindiAnalyzer.getDefaultStopSet(), exclusionSet);
- checkOneTermReuse(a, "हिà¤à¤¦à¥", "हिà¤à¤¦à¥");
+ checkOneTerm(a, "हिà¤à¤¦à¥", "हिà¤à¤¦à¥");
}
/** blast some random strings through the analyzer */
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiNormalizer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiNormalizer.java?rev=1525362&r1=1525361&r2=1525362&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiNormalizer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiNormalizer.java Sun Sep 22 13:57:43 2013
@@ -75,6 +75,6 @@ public class TestHindiNormalizer extends
return new TokenStreamComponents(tokenizer, new HindiNormalizationFilter(tokenizer));
}
};
- checkOneTermReuse(a, "", "");
+ checkOneTerm(a, "", "");
}
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiStemmer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiStemmer.java?rev=1525362&r1=1525361&r2=1525362&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiStemmer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiStemmer.java Sun Sep 22 13:57:43 2013
@@ -97,6 +97,6 @@ public class TestHindiStemmer extends Ba
return new TokenStreamComponents(tokenizer, new HindiStemFilter(tokenizer));
}
};
- checkOneTermReuse(a, "", "");
+ checkOneTerm(a, "", "");
}
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianAnalyzer.java?rev=1525362&r1=1525361&r2=1525362&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianAnalyzer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianAnalyzer.java Sun Sep 22 13:57:43 2013
@@ -34,8 +34,8 @@ public class TestHungarianAnalyzer exten
public void testBasics() throws IOException {
Analyzer a = new HungarianAnalyzer(TEST_VERSION_CURRENT);
// stemming
- checkOneTermReuse(a, "babakocsi", "babakocs");
- checkOneTermReuse(a, "babakocsijáért", "babakocs");
+ checkOneTerm(a, "babakocsi", "babakocs");
+ checkOneTerm(a, "babakocsijáért", "babakocs");
// stopword
assertAnalyzesTo(a, "által", new String[] {});
}
@@ -45,8 +45,8 @@ public class TestHungarianAnalyzer exten
CharArraySet exclusionSet = new CharArraySet(TEST_VERSION_CURRENT, asSet("babakocsi"), false);
Analyzer a = new HungarianAnalyzer(TEST_VERSION_CURRENT,
HungarianAnalyzer.getDefaultStopSet(), exclusionSet);
- checkOneTermReuse(a, "babakocsi", "babakocsi");
- checkOneTermReuse(a, "babakocsijáért", "babakocs");
+ checkOneTerm(a, "babakocsi", "babakocsi");
+ checkOneTerm(a, "babakocsijáért", "babakocs");
}
/** blast some random strings through the analyzer */
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianLightStemFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianLightStemFilter.java?rev=1525362&r1=1525361&r2=1525362&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianLightStemFilter.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianLightStemFilter.java Sun Sep 22 13:57:43 2013
@@ -70,6 +70,6 @@ public class TestHungarianLightStemFilte
return new TokenStreamComponents(tokenizer, new HungarianLightStemFilter(tokenizer));
}
};
- checkOneTermReuse(a, "", "");
+ checkOneTerm(a, "", "");
}
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/HunspellStemFilterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/HunspellStemFilterTest.java?rev=1525362&r1=1525361&r2=1525362&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/HunspellStemFilterTest.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/HunspellStemFilterTest.java Sun Sep 22 13:57:43 2013
@@ -89,6 +89,6 @@ public class HunspellStemFilterTest ext
return new TokenStreamComponents(tokenizer, new HunspellStemFilter(tokenizer, DICTIONARY, _TestUtil.nextInt(random(), 1, 3)));
}
};
- checkOneTermReuse(a, "", "");
+ checkOneTerm(a, "", "");
}
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/hy/TestArmenianAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/hy/TestArmenianAnalyzer.java?rev=1525362&r1=1525361&r2=1525362&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/hy/TestArmenianAnalyzer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/hy/TestArmenianAnalyzer.java Sun Sep 22 13:57:43 2013
@@ -34,8 +34,8 @@ public class TestArmenianAnalyzer extend
public void testBasics() throws IOException {
Analyzer a = new ArmenianAnalyzer(TEST_VERSION_CURRENT);
// stemming
- checkOneTermReuse(a, "Õ¡ÖÕ®Õ«Õ¾", "Õ¡ÖÕ®");
- checkOneTermReuse(a, "Õ¡ÖÕ®Õ«Õ¾Õ¶Õ¥Ö", "Õ¡ÖÕ®");
+ checkOneTerm(a, "Õ¡ÖÕ®Õ«Õ¾", "Õ¡ÖÕ®");
+ checkOneTerm(a, "Õ¡ÖÕ®Õ«Õ¾Õ¶Õ¥Ö", "Õ¡ÖÕ®");
// stopword
assertAnalyzesTo(a, "Õ§", new String[] { });
}
@@ -45,8 +45,8 @@ public class TestArmenianAnalyzer extend
CharArraySet exclusionSet = new CharArraySet(TEST_VERSION_CURRENT, asSet("Õ¡ÖÕ®Õ«Õ¾Õ¶Õ¥Ö"), false);
Analyzer a = new ArmenianAnalyzer(TEST_VERSION_CURRENT,
ArmenianAnalyzer.getDefaultStopSet(), exclusionSet);
- checkOneTermReuse(a, "Õ¡ÖÕ®Õ«Õ¾Õ¶Õ¥Ö", "Õ¡ÖÕ®Õ«Õ¾Õ¶Õ¥Ö");
- checkOneTermReuse(a, "Õ¡ÖÕ®Õ«Õ¾", "Õ¡ÖÕ®");
+ checkOneTerm(a, "Õ¡ÖÕ®Õ«Õ¾Õ¶Õ¥Ö", "Õ¡ÖÕ®Õ«Õ¾Õ¶Õ¥Ö");
+ checkOneTerm(a, "Õ¡ÖÕ®Õ«Õ¾", "Õ¡ÖÕ®");
}
/** blast some random strings through the analyzer */
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/id/TestIndonesianAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/id/TestIndonesianAnalyzer.java?rev=1525362&r1=1525361&r2=1525362&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/id/TestIndonesianAnalyzer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/id/TestIndonesianAnalyzer.java Sun Sep 22 13:57:43 2013
@@ -34,8 +34,8 @@ public class TestIndonesianAnalyzer exte
public void testBasics() throws IOException {
Analyzer a = new IndonesianAnalyzer(TEST_VERSION_CURRENT);
// stemming
- checkOneTermReuse(a, "peledakan", "ledak");
- checkOneTermReuse(a, "pembunuhan", "bunuh");
+ checkOneTerm(a, "peledakan", "ledak");
+ checkOneTerm(a, "pembunuhan", "bunuh");
// stopword
assertAnalyzesTo(a, "bahwa", new String[] {});
}
@@ -45,8 +45,8 @@ public class TestIndonesianAnalyzer exte
CharArraySet exclusionSet = new CharArraySet(TEST_VERSION_CURRENT, asSet("peledakan"), false);
Analyzer a = new IndonesianAnalyzer(TEST_VERSION_CURRENT,
IndonesianAnalyzer.getDefaultStopSet(), exclusionSet);
- checkOneTermReuse(a, "peledakan", "peledakan");
- checkOneTermReuse(a, "pembunuhan", "bunuh");
+ checkOneTerm(a, "peledakan", "peledakan");
+ checkOneTerm(a, "pembunuhan", "bunuh");
}
/** blast some random strings through the analyzer */