You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2015/03/05 17:45:04 UTC
svn commit: r1664404 [1/6] - in /lucene/dev/trunk/lucene:
analysis/common/src/java/org/apache/lucene/analysis/synonym/
analysis/common/src/test/org/apache/lucene/analysis/ar/
analysis/common/src/test/org/apache/lucene/analysis/bg/
analysis/common/src/t...
Author: rmuir
Date: Thu Mar 5 16:45:02 2015
New Revision: 1664404
URL: http://svn.apache.org/r1664404
Log:
LUCENE-6335: test fixes, and one real fix to synonymfilterfactory (missing analyzer.close)
Modified:
lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymFilterFactory.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/TestBrazilianAnalyzer.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/charfilter/HTMLStripCharFilterTest.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestMappingCharFilter.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/TestCJKBigramFilter.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/ckb/TestSoraniAnalyzer.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniNormalizationFilter.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniStemFilter.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/commongrams/CommonGramsFilterTest.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/core/TestAnalyzers.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestBugInSomething.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestDuelingAnalyzers.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestFactories.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordAnalyzer.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStopAnalyzer.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/custom/TestCustomAnalyzer.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/TestPersianCharFilter.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/TestHunspellStemFilter.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/TestCodepointCountFilter.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/TestKeepWordFilter.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/TestLimitTokenCountAnalyzer.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenPositionFilter.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestPerFieldAnalyzerWrapper.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/TestScandinavianFoldingFilter.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestScandinavianNormalizationFilter.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/miscellaneous/TestWordDelimiterFilter.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/ngram/EdgeNGramTokenizerTest.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/NGramTokenFilterTest.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/NGramTokenizerTest.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/nl/TestDutchAnalyzer.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/path/TestPathHierarchyTokenizer.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/path/TestReversePathHierarchyTokenizer.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternCaptureGroupTokenFilter.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternReplaceCharFilter.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/pattern/TestPatternTokenizer.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/query/QueryAutoStopWordAnalyzerTest.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/sinks/TestTeeSinkTokenFilter.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/snowball/TestSnowballVocab.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/sr/TestSerbianNormalizationFilter.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestClassicAnalyzer.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestStandardAnalyzer.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestUAX29URLEmailAnalyzer.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestUAX29URLEmailTokenizer.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/synonym/TestSolrSynonymParser.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymMapFilter.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestWordnetSynonymParser.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/TestCharTokenizers.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestElision.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestSegmentingTokenizerBase.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerTest.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/collation/TestCollationDocValuesField.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/collation/TestCollationKeyAnalyzer.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/TestICUNormalizer2CharFilter.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/TestICUTokenizerCJK.java
lucene/dev/trunk/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestWithCJKBigramFilter.java
lucene/dev/trunk/lucene/analysis/icu/src/test/org/apache/lucene/collation/TestICUCollationKeyAnalyzer.java
lucene/dev/trunk/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestExtendedMode.java
lucene/dev/trunk/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseAnalyzer.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/TestJapaneseIterationMarkCharFilter.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/TestJapaneseNumberFilter.java
lucene/dev/trunk/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseReadingFormFilter.java
lucene/dev/trunk/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseTokenizer.java
lucene/dev/trunk/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestSearchMode.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/TestDaitchMokotoffSoundexFilter.java
lucene/dev/trunk/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestPhoneticFilter.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/test/org/apache/lucene/analysis/uima/UIMABaseAnalyzerTest.java
lucene/dev/trunk/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/UIMATypeAwareAnalyzerTest.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/TestDemo.java
lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/CommonTermsQueryTest.java
lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/function/FunctionTestSetup.java
lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/function/TestLongNormValueSource.java
lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/function/TestValueSources.java
lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/mlt/TestMoreLikeThis.java
lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/DuplicateFilterTest.java
lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/FuzzyLikeThisQueryTest.java
lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowFuzzyQuery2.java
lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestSpanRegexQuery.java
lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/search/TestTermAutomatonQuery.java
lucene/dev/trunk/lucene/spatial/src/test/org/apache/lucene/spatial/SpatialTestCase.java
lucene/dev/trunk/lucene/suggest/src/test/org/apache/lucene/search/spell/TestDirectSpellChecker.java
lucene/dev/trunk/lucene/suggest/src/test/org/apache/lucene/search/spell/TestLuceneDictionary.java
lucene/dev/trunk/lucene/suggest/src/test/org/apache/lucene/search/spell/TestSpellChecker.java
lucene/dev/trunk/lucene/suggest/src/test/org/apache/lucene/search/spell/TestWordBreakSpellChecker.java
lucene/dev/trunk/lucene/suggest/src/test/org/apache/lucene/search/suggest/DocumentDictionaryTest.java
lucene/dev/trunk/lucene/suggest/src/test/org/apache/lucene/search/suggest/DocumentValueSourceDictionaryTest.java
lucene/dev/trunk/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggesterTest.java
lucene/dev/trunk/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingSuggesterTest.java
lucene/dev/trunk/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/FuzzySuggesterTest.java
lucene/dev/trunk/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestFreeTextSuggester.java
lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/RandomIndexWriter.java
lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/BaseExplanationTestCase.java
lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/LineFileDocs.java
Modified: lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymFilterFactory.java?rev=1664404&r1=1664403&r2=1664404&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymFilterFactory.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymFilterFactory.java Thu Mar 5 16:45:02 2015
@@ -138,7 +138,7 @@ public class SynonymFilterFactory extend
};
}
- try {
+ try (Analyzer a = analyzer) {
String formatClass = format;
if (format == null || format.equals("solr")) {
formatClass = SolrSynonymParser.class.getName();
@@ -146,7 +146,7 @@ public class SynonymFilterFactory extend
formatClass = WordnetSynonymParser.class.getName();
}
// TODO: expose dedup as a parameter?
- map = loadSynonyms(loader, formatClass, true, analyzer);
+ map = loadSynonyms(loader, formatClass, true, a);
} catch (ParseException e) {
throw new IOException("Error parsing synonyms file:", e);
}
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=1664404&r1=1664403&r2=1664404&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 Thu Mar 5 16:45:02 2015
@@ -31,7 +31,7 @@ public class TestArabicAnalyzer extends
/** This test fails with NPE when the
* stopwords file is missing in classpath */
public void testResourcesAvailable() {
- new ArabicAnalyzer();
+ new ArabicAnalyzer().close();
}
/**
@@ -53,6 +53,7 @@ public class TestArabicAnalyzer extends
assertAnalyzesTo(a, "Ù
ا Ù
ÙÙت Ø£ÙÙ
اÙÙÙ
", new String[] { "Ù
ÙÙت", "اÙÙ
اÙÙÙ
"});
assertAnalyzesTo(a, "اÙØ°ÙÙ Ù
ÙÙت Ø£ÙÙ
اÙÙÙ
", new String[] { "Ù
ÙÙت", "اÙÙ
اÙÙÙ
" }); // stopwords
+ a.close();
}
/**
@@ -62,14 +63,17 @@ public class TestArabicAnalyzer extends
ArabicAnalyzer a = new ArabicAnalyzer();
assertAnalyzesTo(a, "ÙبÙر", new String[] { "ÙبÙر" });
assertAnalyzesTo(a, "ÙبÙرة", new String[] { "ÙبÙر" }); // feminine marker
+ a.close();
}
/**
* Non-arabic text gets treated in a similar way as SimpleAnalyzer.
*/
public void testEnglishInput() throws Exception {
- assertAnalyzesTo(new ArabicAnalyzer(), "English text.", new String[] {
+ ArabicAnalyzer a = new ArabicAnalyzer();
+ assertAnalyzesTo(a, "English text.", new String[] {
"english", "text" });
+ a.close();
}
/**
@@ -80,6 +84,7 @@ public class TestArabicAnalyzer extends
ArabicAnalyzer a = new ArabicAnalyzer(set);
assertAnalyzesTo(a, "The quick brown fox.", new String[] { "quick",
"brown", "fox" });
+ a.close();
}
public void testWithStemExclusionSet() throws IOException {
@@ -87,15 +92,18 @@ public class TestArabicAnalyzer extends
ArabicAnalyzer a = new ArabicAnalyzer(CharArraySet.EMPTY_SET, set);
assertAnalyzesTo(a, "ÙبÙرة the quick ساÙدÙات", new String[] { "ÙبÙر","the", "quick", "ساÙدÙات" });
assertAnalyzesTo(a, "ÙبÙرة the quick ساÙدÙات", new String[] { "ÙبÙر","the", "quick", "ساÙدÙات" });
-
+ a.close();
a = new ArabicAnalyzer(CharArraySet.EMPTY_SET, CharArraySet.EMPTY_SET);
assertAnalyzesTo(a, "ÙبÙرة the quick ساÙدÙات", new String[] { "ÙبÙر","the", "quick", "ساÙد" });
assertAnalyzesTo(a, "ÙبÙرة the quick ساÙدÙات", new String[] { "ÙبÙر","the", "quick", "ساÙد" });
+ a.close();
}
/** blast some random strings through the analyzer */
public void testRandomStrings() throws Exception {
- checkRandomData(random(), new ArabicAnalyzer(), 1000*RANDOM_MULTIPLIER);
+ ArabicAnalyzer a = new ArabicAnalyzer();
+ checkRandomData(random(), a, 1000*RANDOM_MULTIPLIER);
+ a.close();
}
}
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=1664404&r1=1664403&r2=1664404&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 Thu Mar 5 16:45:02 2015
@@ -104,6 +104,7 @@ public class TestArabicNormalizationFilt
}
};
checkOneTerm(a, "", "");
+ a.close();
}
}
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=1664404&r1=1664403&r2=1664404&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 Thu Mar 5 16:45:02 2015
@@ -141,5 +141,6 @@ public class TestArabicStemFilter extend
}
};
checkOneTerm(a, "", "");
+ a.close();
}
}
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=1664404&r1=1664403&r2=1664404&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 Thu Mar 5 16:45:02 2015
@@ -32,24 +32,27 @@ public class TestBulgarianAnalyzer exten
* This test fails with NPE when the stopwords file is missing in classpath
*/
public void testResourcesAvailable() {
- new BulgarianAnalyzer();
+ new BulgarianAnalyzer().close();
}
public void testStopwords() throws IOException {
Analyzer a = new BulgarianAnalyzer();
assertAnalyzesTo(a, "Ðак Ñе казваÑ?", new String[] {"казваÑ"});
+ a.close();
}
public void testCustomStopwords() throws IOException {
Analyzer a = new BulgarianAnalyzer(CharArraySet.EMPTY_SET);
assertAnalyzesTo(a, "Ðак Ñе казваÑ?",
new String[] {"как", "Ñе", "казваÑ"});
+ a.close();
}
public void testReusableTokenStream() throws IOException {
Analyzer a = new BulgarianAnalyzer();
assertAnalyzesTo(a, "докÑменÑи", new String[] {"докÑменÑ"});
assertAnalyzesTo(a, "докÑменÑ", new String[] {"докÑменÑ"});
+ a.close();
}
/**
@@ -64,6 +67,7 @@ public class TestBulgarianAnalyzer exten
assertAnalyzesTo(a, "компÑÑÑÑ", new String[] {"компÑÑÑ"});
assertAnalyzesTo(a, "гÑадове", new String[] {"гÑад"});
+ a.close();
}
public void testWithStemExclusionSet() throws IOException {
@@ -71,10 +75,13 @@ public class TestBulgarianAnalyzer exten
set.add("ÑÑÑоеве");
Analyzer a = new BulgarianAnalyzer(CharArraySet.EMPTY_SET, set);
assertAnalyzesTo(a, "ÑÑÑоевеÑе ÑÑÑоеве", new String[] { "ÑÑÑой", "ÑÑÑоеве" });
+ a.close();
}
/** blast some random strings through the analyzer */
public void testRandomStrings() throws Exception {
- checkRandomData(random(), new BulgarianAnalyzer(), 1000*RANDOM_MULTIPLIER);
+ BulgarianAnalyzer a = new BulgarianAnalyzer();
+ checkRandomData(random(), a, 1000*RANDOM_MULTIPLIER);
+ a.close();
}
}
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=1664404&r1=1664403&r2=1664404&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 Thu Mar 5 16:45:02 2015
@@ -97,6 +97,8 @@ public class TestBulgarianStemmer extend
assertAnalyzesTo(a, "бÑаÑÑ", new String[] {"бÑаÑ"});
assertAnalyzesTo(a, "бÑаÑÑÑа", new String[] {"бÑаÑ"});
assertAnalyzesTo(a, "бÑаÑе", new String[] {"бÑаÑ"});
+
+ a.close();
}
/**
@@ -109,6 +111,8 @@ public class TestBulgarianStemmer extend
assertAnalyzesTo(a, "веÑÑÑа", new String[] {"веÑÑ"});
assertAnalyzesTo(a, "веÑÑи", new String[] {"веÑÑ"});
assertAnalyzesTo(a, "веÑÑиÑе", new String[] {"веÑÑ"});
+
+ a.close();
}
/**
@@ -138,6 +142,8 @@ public class TestBulgarianStemmer extend
assertAnalyzesTo(a, "изклÑÑениÑÑа", new String[] {"изклÑÑени"});
/* note the below form in this example does not conflate with the rest */
assertAnalyzesTo(a, "изклÑÑениÑ", new String[] {"изклÑÑн"});
+
+ a.close();
}
/**
@@ -154,6 +160,7 @@ public class TestBulgarianStemmer extend
assertAnalyzesTo(a, "кÑаÑивоÑо", new String[] {"кÑаÑив"});
assertAnalyzesTo(a, "кÑаÑиви", new String[] {"кÑаÑив"});
assertAnalyzesTo(a, "кÑаÑивиÑе", new String[] {"кÑаÑив"});
+ a.close();
}
/**
@@ -212,6 +219,8 @@ public class TestBulgarianStemmer extend
/* note the below forms conflate with each other, but not the rest */
assertAnalyzesTo(a, "ÑÑÑоÑ", new String[] {"ÑÑÑ"});
assertAnalyzesTo(a, "ÑÑÑоÑÑ", new String[] {"ÑÑÑ"});
+
+ a.close();
}
public void testWithKeywordAttribute() throws IOException {
@@ -234,5 +243,6 @@ public class TestBulgarianStemmer extend
}
};
checkOneTerm(a, "", "");
+ a.close();
}
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/br/TestBrazilianAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/br/TestBrazilianAnalyzer.java?rev=1664404&r1=1664403&r2=1664404&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/br/TestBrazilianAnalyzer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/br/TestBrazilianAnalyzer.java Thu Mar 5 16:45:02 2015
@@ -135,12 +135,14 @@ public class TestBrazilianAnalyzer exten
checkReuse(a, "boainain", "boainain");
checkReuse(a, "boas", "boas");
checkReuse(a, "bôas", "boas"); // removes diacritic: different from snowball portugese
+ a.close();
}
public void testStemExclusionTable() throws Exception {
BrazilianAnalyzer a = new BrazilianAnalyzer(
CharArraySet.EMPTY_SET, new CharArraySet(asSet("quintessência"), false));
checkReuse(a, "quintessência", "quintessência"); // excluded words will be completely unchanged.
+ a.close();
}
public void testWithKeywordAttribute() throws IOException {
@@ -154,7 +156,9 @@ public class TestBrazilianAnalyzer exten
}
private void check(final String input, final String expected) throws Exception {
- checkOneTerm(new BrazilianAnalyzer(), input, expected);
+ BrazilianAnalyzer a = new BrazilianAnalyzer();
+ checkOneTerm(a, input, expected);
+ a.close();
}
private void checkReuse(Analyzer a, String input, String expected) throws Exception {
@@ -163,7 +167,9 @@ public class TestBrazilianAnalyzer exten
/** blast some random strings through the analyzer */
public void testRandomStrings() throws Exception {
- checkRandomData(random(), new BrazilianAnalyzer(), 1000*RANDOM_MULTIPLIER);
+ BrazilianAnalyzer a = new BrazilianAnalyzer();
+ checkRandomData(random(), a, 1000*RANDOM_MULTIPLIER);
+ a.close();
}
public void testEmptyTerm() throws IOException {
@@ -175,5 +181,6 @@ public class TestBrazilianAnalyzer exten
}
};
checkOneTerm(a, "", "");
+ a.close();
}
}
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=1664404&r1=1664403&r2=1664404&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 Thu Mar 5 16:45:02 2015
@@ -27,7 +27,7 @@ public class TestCatalanAnalyzer extends
/** This test fails with NPE when the
* stopwords file is missing in classpath */
public void testResourcesAvailable() {
- new CatalanAnalyzer();
+ new CatalanAnalyzer().close();
}
/** test stopwords and stemming */
@@ -38,6 +38,7 @@ public class TestCatalanAnalyzer extends
checkOneTerm(a, "llengua", "llengu");
// stopword
assertAnalyzesTo(a, "un", new String[] { });
+ a.close();
}
/** test use of elisionfilter */
@@ -45,6 +46,7 @@ public class TestCatalanAnalyzer extends
Analyzer a = new CatalanAnalyzer();
assertAnalyzesTo(a, "Diccionari de l'Institut d'Estudis Catalans",
new String[] { "diccion", "inst", "estud", "catalan" });
+ a.close();
}
/** test use of exclusion set */
@@ -53,10 +55,13 @@ public class TestCatalanAnalyzer extends
Analyzer a = new CatalanAnalyzer(CatalanAnalyzer.getDefaultStopSet(), exclusionSet);
checkOneTerm(a, "llengües", "llengües");
checkOneTerm(a, "llengua", "llengu");
+ a.close();
}
/** blast some random strings through the analyzer */
public void testRandomStrings() throws Exception {
- checkRandomData(random(), new CatalanAnalyzer(), 1000*RANDOM_MULTIPLIER);
+ CatalanAnalyzer a = new CatalanAnalyzer();
+ checkRandomData(random(), a, 1000*RANDOM_MULTIPLIER);
+ a.close();
}
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/HTMLStripCharFilterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/HTMLStripCharFilterTest.java?rev=1664404&r1=1664403&r2=1664404&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/HTMLStripCharFilterTest.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/HTMLStripCharFilterTest.java Thu Mar 5 16:45:02 2015
@@ -25,7 +25,6 @@ import java.io.StringReader;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.HashSet;
-import java.util.List;
import java.util.Set;
import org.apache.lucene.analysis.Analyzer;
@@ -403,16 +402,22 @@ public class HTMLStripCharFilterTest ext
public void testRandom() throws Exception {
int numRounds = RANDOM_MULTIPLIER * 1000;
- checkRandomData(random(), newTestAnalyzer(), numRounds);
+ Analyzer a = newTestAnalyzer();
+ checkRandomData(random(), a, numRounds);
+ a.close();
}
public void testRandomHugeStrings() throws Exception {
int numRounds = RANDOM_MULTIPLIER * 100;
- checkRandomData(random(), newTestAnalyzer(), numRounds, 8192);
+ Analyzer a = newTestAnalyzer();
+ checkRandomData(random(), a, numRounds, 8192);
+ a.close();
}
public void testCloseBR() throws Exception {
- checkAnalysisConsistency(random(), newTestAnalyzer(), random().nextBoolean(), " Secretary)</br> [[M");
+ Analyzer a = newTestAnalyzer();
+ checkAnalysisConsistency(random(), a, random().nextBoolean(), " Secretary)</br> [[M");
+ a.close();
}
public void testServerSideIncludes() throws Exception {
@@ -549,7 +554,9 @@ public class HTMLStripCharFilterTest ext
public void testRandomBrokenHTML() throws Exception {
int maxNumElements = 10000;
String text = TestUtil.randomHtmlishString(random(), maxNumElements);
- checkAnalysisConsistency(random(), newTestAnalyzer(), random().nextBoolean(), text);
+ Analyzer a = newTestAnalyzer();
+ checkAnalysisConsistency(random(), a, random().nextBoolean(), text);
+ a.close();
}
public void testRandomText() throws Exception {
@@ -617,6 +624,7 @@ public class HTMLStripCharFilterTest ext
assertAnalyzesTo(analyzer, " �", new String[] { "\uFFFD" } );
assertAnalyzesTo(analyzer, " �", new String[] { "\uFFFD" } );
assertAnalyzesTo(analyzer, " �<br>", new String[] { "�" } );
+ analyzer.close();
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestMappingCharFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestMappingCharFilter.java?rev=1664404&r1=1664403&r2=1664404&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestMappingCharFilter.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestMappingCharFilter.java Thu Mar 5 16:45:02 2015
@@ -216,6 +216,7 @@ public class TestMappingCharFilter exten
int numRounds = RANDOM_MULTIPLIER * 10000;
checkRandomData(random(), analyzer, numRounds);
+ analyzer.close();
}
//@Ignore("wrong finalOffset: https://issues.apache.org/jira/browse/LUCENE-3971")
@@ -242,6 +243,7 @@ public class TestMappingCharFilter exten
String text = "gzw f quaxot";
checkAnalysisConsistency(random(), analyzer, false, text);
+ analyzer.close();
}
//@Ignore("wrong finalOffset: https://issues.apache.org/jira/browse/LUCENE-3971")
@@ -263,6 +265,7 @@ public class TestMappingCharFilter exten
};
int numRounds = 100;
checkRandomData(random(), analyzer, numRounds);
+ analyzer.close();
}
}
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=1664404&r1=1664403&r2=1664404&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 Thu Mar 5 16:45:02 2015
@@ -19,7 +19,6 @@ package org.apache.lucene.analysis.cjk;
import java.io.IOException;
import java.io.Reader;
-import java.util.Random;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.BaseTokenStreamTestCase;
@@ -39,7 +38,19 @@ import org.apache.lucene.analysis.util.C
* Most tests adopted from TestCJKTokenizer
*/
public class TestCJKAnalyzer extends BaseTokenStreamTestCase {
- private Analyzer analyzer = new CJKAnalyzer();
+ private Analyzer analyzer;
+
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
+ analyzer = new CJKAnalyzer();
+ }
+
+ @Override
+ public void tearDown() throws Exception {
+ analyzer.close();
+ super.tearDown();
+ }
public void testJa1() throws IOException {
assertAnalyzesTo(analyzer, "ä¸äºä¸åäºå
ä¸å
«ä¹å",
@@ -228,6 +239,8 @@ public class TestCJKAnalyzer extends Bas
// before bigramming, the 4 tokens look like:
// { 0, 0, 1, 1 },
// { 0, 1, 1, 2 }
+
+ analyzer.close();
}
private static class FakeStandardTokenizer extends TokenFilter {
@@ -267,17 +280,21 @@ public class TestCJKAnalyzer extends Bas
new int[] { 1 },
new String[] { "<SINGLE>" },
new int[] { 1 });
+ analyzer.close();
}
/** blast some random strings through the analyzer */
public void testRandomStrings() throws Exception {
- checkRandomData(random(), new CJKAnalyzer(), 1000*RANDOM_MULTIPLIER);
+ Analyzer a = new CJKAnalyzer();
+ checkRandomData(random(), a, 1000*RANDOM_MULTIPLIER);
+ a.close();
}
/** blast some random strings through the analyzer */
public void testRandomHugeStrings() throws Exception {
- Random random = random();
- checkRandomData(random, new CJKAnalyzer(), 100*RANDOM_MULTIPLIER, 8192);
+ Analyzer a = new CJKAnalyzer();
+ checkRandomData(random(), a, 100*RANDOM_MULTIPLIER, 8192);
+ a.close();
}
public void testEmptyTerm() throws IOException {
@@ -289,5 +306,6 @@ public class TestCJKAnalyzer extends Bas
}
};
checkOneTerm(a, "", "");
+ a.close();
}
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKBigramFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKBigramFilter.java?rev=1664404&r1=1664403&r2=1664404&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKBigramFilter.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKBigramFilter.java Thu Mar 5 16:45:02 2015
@@ -17,31 +17,42 @@ package org.apache.lucene.analysis.cjk;
* limitations under the License.
*/
-import java.io.Reader;
import java.util.Random;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.BaseTokenStreamTestCase;
import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.standard.StandardTokenizer;
+import org.apache.lucene.util.IOUtils;
public class TestCJKBigramFilter extends BaseTokenStreamTestCase {
- Analyzer analyzer = new Analyzer() {
- @Override
- protected TokenStreamComponents createComponents(String fieldName) {
- Tokenizer t = new StandardTokenizer();
- return new TokenStreamComponents(t, new CJKBigramFilter(t));
- }
- };
-
- Analyzer unibiAnalyzer = new Analyzer() {
- @Override
- protected TokenStreamComponents createComponents(String fieldName) {
- Tokenizer t = new StandardTokenizer();
- return new TokenStreamComponents(t,
- new CJKBigramFilter(t, 0xff, true));
- }
- };
+ Analyzer analyzer, unibiAnalyzer;
+
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
+ analyzer = new Analyzer() {
+ @Override
+ protected TokenStreamComponents createComponents(String fieldName) {
+ Tokenizer t = new StandardTokenizer();
+ return new TokenStreamComponents(t, new CJKBigramFilter(t));
+ }
+ };
+ unibiAnalyzer = new Analyzer() {
+ @Override
+ protected TokenStreamComponents createComponents(String fieldName) {
+ Tokenizer t = new StandardTokenizer();
+ return new TokenStreamComponents(t,
+ new CJKBigramFilter(t, 0xff, true));
+ }
+ };
+ }
+
+ @Override
+ public void tearDown() throws Exception {
+ IOUtils.close(analyzer, unibiAnalyzer);
+ super.tearDown();
+ }
public void testHuge() throws Exception {
assertAnalyzesTo(analyzer, "å¤ãã®å¦çã試é¨ã«è½ã¡ã" + "å¤ãã®å¦çã試é¨ã«è½ã¡ã" + "å¤ãã®å¦çã試é¨ã«è½ã¡ã"
@@ -79,6 +90,7 @@ public class TestCJKBigramFilter extends
"<HIRAGANA>", "<SINGLE>", "<HIRAGANA>", "<HIRAGANA>", "<SINGLE>" },
new int[] { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 },
new int[] { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 });
+ a.close();
}
public void testAllScripts() throws Exception {
@@ -92,6 +104,7 @@ public class TestCJKBigramFilter extends
};
assertAnalyzesTo(a, "å¤ãã®å¦çã試é¨ã«è½ã¡ãã",
new String[] { "å¤ã", "ãã®", "ã®å¦", "å¦ç", "çã", "ã試", "試é¨", "é¨ã«", "ã«è½", "è½ã¡", "ã¡ã" });
+ a.close();
}
public void testUnigramsAndBigramsAllScripts() throws Exception {
@@ -132,6 +145,7 @@ public class TestCJKBigramFilter extends
"<HIRAGANA>", "<SINGLE>", "<HIRAGANA>", "<HIRAGANA>", "<SINGLE>" },
new int[] { 1, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1 },
new int[] { 1, 1, 1, 1, 2, 1, 1, 1, 2, 1, 1, 1, 1, 1 });
+ a.close();
}
public void testUnigramsAndBigramsHuge() throws Exception {
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=1664404&r1=1664403&r2=1664404&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 Thu Mar 5 16:45:02 2015
@@ -29,13 +29,25 @@ import org.apache.lucene.analysis.core.K
* Tests for {@link CJKWidthFilter}
*/
public class TestCJKWidthFilter extends BaseTokenStreamTestCase {
- private Analyzer analyzer = new Analyzer() {
- @Override
- protected TokenStreamComponents createComponents(String fieldName) {
- Tokenizer source = new MockTokenizer(MockTokenizer.WHITESPACE, false);
- return new TokenStreamComponents(source, new CJKWidthFilter(source));
- }
- };
+ private Analyzer analyzer;
+
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
+ analyzer = new Analyzer() {
+ @Override
+ protected TokenStreamComponents createComponents(String fieldName) {
+ Tokenizer source = new MockTokenizer(MockTokenizer.WHITESPACE, false);
+ return new TokenStreamComponents(source, new CJKWidthFilter(source));
+ }
+ };
+ }
+
+ @Override
+ public void tearDown() throws Exception {
+ analyzer.close();
+ super.tearDown();
+ }
/**
* Full-width ASCII forms normalized to half-width (basic latin)
@@ -74,5 +86,6 @@ public class TestCJKWidthFilter extends
}
};
checkOneTerm(a, "", "");
+ a.close();
}
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniAnalyzer.java?rev=1664404&r1=1664403&r2=1664404&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniAnalyzer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniAnalyzer.java Thu Mar 5 16:45:02 2015
@@ -32,24 +32,27 @@ public class TestSoraniAnalyzer extends
* This test fails with NPE when the stopwords file is missing in classpath
*/
public void testResourcesAvailable() {
- new SoraniAnalyzer();
+ new SoraniAnalyzer().close();
}
public void testStopwords() throws IOException {
Analyzer a = new SoraniAnalyzer();
assertAnalyzesTo(a, "ئÛÙ
Ù¾ÛاÙÛ", new String[] {"Ù¾ÛاÙ"});
+ a.close();
}
public void testCustomStopwords() throws IOException {
Analyzer a = new SoraniAnalyzer(CharArraySet.EMPTY_SET);
assertAnalyzesTo(a, "ئÛÙ
Ù¾ÛاÙÛ",
new String[] {"ئÛÙ
", "Ù¾ÛاÙ"});
+ a.close();
}
public void testReusableTokenStream() throws IOException {
Analyzer a = new SoraniAnalyzer();
assertAnalyzesTo(a, "Ù¾ÛاÙÛ", new String[] {"Ù¾ÛاÙ"});
assertAnalyzesTo(a, "Ù¾ÛاÙ", new String[] {"Ù¾ÛاÙ"});
+ a.close();
}
public void testWithStemExclusionSet() throws IOException {
@@ -57,10 +60,13 @@ public class TestSoraniAnalyzer extends
set.add("Ù¾ÛاÙÛ");
Analyzer a = new SoraniAnalyzer(CharArraySet.EMPTY_SET, set);
assertAnalyzesTo(a, "Ù¾ÛاÙÛ", new String[] { "Ù¾ÛاÙÛ" });
+ a.close();
}
/** blast some random strings through the analyzer */
public void testRandomStrings() throws Exception {
- checkRandomData(random(), new SoraniAnalyzer(), 1000*RANDOM_MULTIPLIER);
+ Analyzer a = new SoraniAnalyzer();
+ checkRandomData(random(), a, 1000*RANDOM_MULTIPLIER);
+ a.close();
}
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniNormalizationFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniNormalizationFilter.java?rev=1664404&r1=1664403&r2=1664404&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniNormalizationFilter.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniNormalizationFilter.java Thu Mar 5 16:45:02 2015
@@ -18,7 +18,6 @@ package org.apache.lucene.analysis.ckb;
*/
import java.io.IOException;
-import java.io.Reader;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.BaseTokenStreamTestCase;
@@ -30,13 +29,25 @@ import org.apache.lucene.analysis.core.K
* Tests normalization for Sorani (this is more critical than stemming...)
*/
public class TestSoraniNormalizationFilter extends BaseTokenStreamTestCase {
- Analyzer a = new Analyzer() {
- @Override
- protected TokenStreamComponents createComponents(String fieldName) {
- Tokenizer tokenizer = new MockTokenizer(MockTokenizer.KEYWORD, false);
- return new TokenStreamComponents(tokenizer, new SoraniNormalizationFilter(tokenizer));
- }
- };
+ Analyzer a;
+
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
+ a = new Analyzer() {
+ @Override
+ protected TokenStreamComponents createComponents(String fieldName) {
+ Tokenizer tokenizer = new MockTokenizer(MockTokenizer.KEYWORD, false);
+ return new TokenStreamComponents(tokenizer, new SoraniNormalizationFilter(tokenizer));
+ }
+ };
+ }
+
+ @Override
+ public void tearDown() throws Exception {
+ a.close();
+ super.tearDown();
+ }
public void testY() throws Exception {
checkOneTerm(a, "\u064A", "\u06CC");
@@ -96,5 +107,6 @@ public class TestSoraniNormalizationFilt
}
};
checkOneTerm(a, "", "");
+ a.close();
}
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniStemFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniStemFilter.java?rev=1664404&r1=1664403&r2=1664404&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniStemFilter.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniStemFilter.java Thu Mar 5 16:45:02 2015
@@ -20,7 +20,6 @@ package org.apache.lucene.analysis.ckb;
import static org.apache.lucene.analysis.VocabularyAssert.assertVocabulary;
import java.io.IOException;
-import java.io.Reader;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.BaseTokenStreamTestCase;
@@ -31,7 +30,19 @@ import org.apache.lucene.analysis.core.K
* Test the Sorani Stemmer.
*/
public class TestSoraniStemFilter extends BaseTokenStreamTestCase {
- SoraniAnalyzer a = new SoraniAnalyzer();
+ Analyzer a;
+
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
+ a = new SoraniAnalyzer();
+ }
+
+ @Override
+ public void tearDown() throws Exception {
+ a.close();
+ super.tearDown();
+ }
public void testIndefiniteSingular() throws Exception {
checkOneTerm(a, "Ù¾ÛاÙÛÚ©", "Ù¾ÛاÙ"); // -ek
@@ -90,6 +101,7 @@ public class TestSoraniStemFilter extend
}
};
checkOneTerm(a, "", "");
+ a.close();
}
/** test against a basic vocabulary file */
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/commongrams/CommonGramsFilterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/commongrams/CommonGramsFilterTest.java?rev=1664404&r1=1664403&r2=1664404&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/commongrams/CommonGramsFilterTest.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/commongrams/CommonGramsFilterTest.java Thu Mar 5 16:45:02 2015
@@ -156,6 +156,7 @@ public class CommonGramsFilterTest exten
new String[] { "s_s", "s_s" });
assertAnalyzesTo(a, "of the of",
new String[] { "of_the", "the_of" });
+ a.close();
}
public void testCommonGramsFilter() throws Exception {
@@ -242,6 +243,7 @@ public class CommonGramsFilterTest exten
assertAnalyzesTo(a, "of the of",
new String[] { "of", "of_the", "the", "the_of", "of" },
new int[] { 1, 0, 1, 0, 1 });
+ a.close();
}
/**
@@ -330,6 +332,7 @@ public class CommonGramsFilterTest exten
};
checkRandomData(random(), a, 1000*RANDOM_MULTIPLIER);
+ a.close();
Analyzer b = new Analyzer() {
@@ -342,5 +345,6 @@ public class CommonGramsFilterTest exten
};
checkRandomData(random(), b, 1000*RANDOM_MULTIPLIER);
+ b.close();
}
}
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=1664404&r1=1664403&r2=1664404&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 Thu Mar 5 16:45:02 2015
@@ -336,6 +336,7 @@ public class TestCompoundWordTokenFilter
new String[] { "bankueberfall", "fall" },
new int[] { 0, 0 },
new int[] { 12, 12 });
+ analyzer.close();
}
/** blast some random strings through the analyzer */
@@ -350,6 +351,7 @@ public class TestCompoundWordTokenFilter
}
};
checkRandomData(random(), a, 1000*RANDOM_MULTIPLIER);
+ a.close();
InputSource is = new InputSource(getClass().getResource("da_UTF8.xml").toExternalForm());
final HyphenationTree hyphenator = HyphenationCompoundWordTokenFilter.getHyphenationTree(is);
@@ -363,6 +365,7 @@ public class TestCompoundWordTokenFilter
}
};
checkRandomData(random(), b, 1000*RANDOM_MULTIPLIER);
+ b.close();
}
public void testEmptyTerm() throws Exception {
@@ -376,6 +379,7 @@ public class TestCompoundWordTokenFilter
}
};
checkOneTerm(a, "", "");
+ a.close();
InputSource is = new InputSource(getClass().getResource("da_UTF8.xml").toExternalForm());
final HyphenationTree hyphenator = HyphenationCompoundWordTokenFilter.getHyphenationTree(is);
@@ -389,5 +393,6 @@ public class TestCompoundWordTokenFilter
}
};
checkOneTerm(b, "", "");
+ b.close();
}
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestAnalyzers.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestAnalyzers.java?rev=1664404&r1=1664403&r2=1664404&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestAnalyzers.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestAnalyzers.java Thu Mar 5 16:45:02 2015
@@ -18,15 +18,18 @@ package org.apache.lucene.analysis.core;
*/
import java.io.IOException;
-import java.io.Reader;
import java.io.StringReader;
-import java.util.Random;
-import org.apache.lucene.analysis.*;
+import org.apache.lucene.analysis.Analyzer;
+import org.apache.lucene.analysis.BaseTokenStreamTestCase;
+import org.apache.lucene.analysis.TokenFilter;
+import org.apache.lucene.analysis.TokenStream;
+import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.standard.StandardTokenizer;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.lucene.analysis.tokenattributes.PayloadAttribute;
import org.apache.lucene.util.BytesRef;
+import org.apache.lucene.util.IOUtils;
public class TestAnalyzers extends BaseTokenStreamTestCase {
@@ -48,6 +51,7 @@ public class TestAnalyzers extends BaseT
new String[] { "b" });
assertAnalyzesTo(a, "\"QUOTED\" word",
new String[] { "quoted", "word" });
+ a.close();
}
public void testNull() throws Exception {
@@ -68,6 +72,7 @@ public class TestAnalyzers extends BaseT
new String[] { "2B" });
assertAnalyzesTo(a, "\"QUOTED\" word",
new String[] { "\"QUOTED\"", "word" });
+ a.close();
}
public void testStop() throws Exception {
@@ -76,6 +81,7 @@ public class TestAnalyzers extends BaseT
new String[] { "foo", "bar", "foo", "bar" });
assertAnalyzesTo(a, "foo a bar such FOO THESE BAR",
new String[] { "foo", "bar", "foo", "bar" });
+ a.close();
}
void verifyPayload(TokenStream ts) throws IOException {
@@ -159,6 +165,7 @@ public class TestAnalyzers extends BaseT
// unpaired trail surrogate
assertAnalyzesTo(a, "AbaC\uDC16AdaBa",
new String [] { "abac\uDC16adaba" });
+ a.close();
}
/**
@@ -179,9 +186,9 @@ public class TestAnalyzers extends BaseT
// unpaired trail surrogate
assertAnalyzesTo(a, "AbaC\uDC16AdaBa",
new String [] { "ABAC\uDC16ADABA" });
+ a.close();
}
-
/**
* Test that LowercaseFilter handles the lowercasing correctly if the term
* buffer has a trailing surrogate character leftover and the current term in
@@ -223,17 +230,20 @@ public class TestAnalyzers extends BaseT
/** blast some random strings through the analyzer */
public void testRandomStrings() throws Exception {
- checkRandomData(random(), new WhitespaceAnalyzer(), 1000*RANDOM_MULTIPLIER);
- checkRandomData(random(), new SimpleAnalyzer(), 1000*RANDOM_MULTIPLIER);
- checkRandomData(random(), new StopAnalyzer(), 1000*RANDOM_MULTIPLIER);
+ Analyzer analyzers[] = new Analyzer[] { new WhitespaceAnalyzer(), new SimpleAnalyzer(), new StopAnalyzer() };
+ for (Analyzer analyzer : analyzers) {
+ checkRandomData(random(), analyzer, 1000*RANDOM_MULTIPLIER);
+ }
+ IOUtils.close(analyzers);
}
/** blast some random large strings through the analyzer */
public void testRandomHugeStrings() throws Exception {
- Random random = random();
- checkRandomData(random, new WhitespaceAnalyzer(), 100*RANDOM_MULTIPLIER, 8192);
- checkRandomData(random, new SimpleAnalyzer(), 100*RANDOM_MULTIPLIER, 8192);
- checkRandomData(random, new StopAnalyzer(), 100*RANDOM_MULTIPLIER, 8192);
+ Analyzer analyzers[] = new Analyzer[] { new WhitespaceAnalyzer(), new SimpleAnalyzer(), new StopAnalyzer() };
+ for (Analyzer analyzer : analyzers) {
+ checkRandomData(random(), analyzer, 100*RANDOM_MULTIPLIER, 8192);
+ }
+ IOUtils.close(analyzers);
}
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestBugInSomething.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestBugInSomething.java?rev=1664404&r1=1664403&r2=1664404&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestBugInSomething.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestBugInSomething.java Thu Mar 5 16:45:02 2015
@@ -75,6 +75,7 @@ public class TestBugInSomething extends
}
};
checkAnalysisConsistency(random(), a, false, "wmgddzunizdomqyj");
+ a.close();
}
CharFilter wrappedStream = new CharFilter(new StringReader("bogus")) {
@@ -261,6 +262,7 @@ public class TestBugInSomething extends
}
};
checkRandomData(random(), analyzer, 2000);
+ analyzer.close();
}
public void testCuriousWikipediaString() throws Exception {
@@ -285,5 +287,6 @@ public class TestBugInSomething extends
}
};
checkAnalysisConsistency(random(), a, false, "B\u28c3\ue0f8[ \ud800\udfc2 </p> jb");
+ a.close();
}
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestDuelingAnalyzers.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestDuelingAnalyzers.java?rev=1664404&r1=1664403&r2=1664404&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestDuelingAnalyzers.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestDuelingAnalyzers.java Thu Mar 5 16:45:02 2015
@@ -30,6 +30,7 @@ import org.apache.lucene.analysis.Tokeni
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.lucene.analysis.tokenattributes.OffsetAttribute;
import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute;
+import org.apache.lucene.util.IOUtils;
import org.apache.lucene.util.TestUtil;
import org.apache.lucene.util.automaton.Operations;
import org.apache.lucene.util.automaton.CharacterRunAutomaton;
@@ -78,6 +79,7 @@ public class TestDuelingAnalyzers extend
assertEquals(s, left.tokenStream("foo", newStringReader(s)),
right.tokenStream("foo", newStringReader(s)));
}
+ IOUtils.close(left, right);
}
// not so useful since it's all one token?!
@@ -99,6 +101,7 @@ public class TestDuelingAnalyzers extend
assertEquals(s, left.tokenStream("foo", newStringReader(s)),
right.tokenStream("foo", newStringReader(s)));
}
+ IOUtils.close(left, right);
}
public void testLetterHtmlish() throws Exception {
@@ -116,6 +119,7 @@ public class TestDuelingAnalyzers extend
assertEquals(s, left.tokenStream("foo", newStringReader(s)),
right.tokenStream("foo", newStringReader(s)));
}
+ IOUtils.close(left, right);
}
public void testLetterHtmlishHuge() throws Exception {
@@ -136,6 +140,7 @@ public class TestDuelingAnalyzers extend
assertEquals(s, left.tokenStream("foo", newStringReader(s)),
right.tokenStream("foo", newStringReader(s)));
}
+ IOUtils.close(left, right);
}
public void testLetterUnicode() throws Exception {
@@ -153,6 +158,7 @@ public class TestDuelingAnalyzers extend
assertEquals(s, left.tokenStream("foo", newStringReader(s)),
right.tokenStream("foo", newStringReader(s)));
}
+ IOUtils.close(left, right);
}
public void testLetterUnicodeHuge() throws Exception {
@@ -173,6 +179,7 @@ public class TestDuelingAnalyzers extend
assertEquals(s, left.tokenStream("foo", newStringReader(s)),
right.tokenStream("foo", newStringReader(s)));
}
+ IOUtils.close(left, right);
}
// we only check a few core attributes here.
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestFactories.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestFactories.java?rev=1664404&r1=1664403&r2=1664404&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestFactories.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestFactories.java Thu Mar 5 16:45:02 2015
@@ -46,6 +46,8 @@ import org.apache.lucene.util.Version;
// TODO: move this, TestRandomChains, and TestAllAnalyzersHaveFactories
// to an integration test module that sucks in all analysis modules.
// currently the only way to do this is via eclipse etc (LUCENE-3974)
+
+// TODO: fix this to use CustomAnalyzer instead of its own FactoryAnalyzer
public class TestFactories extends BaseTokenStreamTestCase {
public void test() throws IOException {
for (String tokenizer : TokenizerFactory.availableTokenizers()) {
@@ -77,7 +79,9 @@ public class TestFactories extends BaseT
// beast it just a little, it shouldnt throw exceptions:
// (it should have thrown them in initialize)
- checkRandomData(random(), new FactoryAnalyzer(factory, null, null), 20, 20, false, false);
+ Analyzer a = new FactoryAnalyzer(factory, null, null);
+ checkRandomData(random(), a, 20, 20, false, false);
+ a.close();
}
}
@@ -97,7 +101,9 @@ public class TestFactories extends BaseT
// beast it just a little, it shouldnt throw exceptions:
// (it should have thrown them in initialize)
- checkRandomData(random(), new FactoryAnalyzer(assertingTokenizer, factory, null), 20, 20, false, false);
+ Analyzer a = new FactoryAnalyzer(assertingTokenizer, factory, null);
+ checkRandomData(random(), a, 20, 20, false, false);
+ a.close();
}
}
@@ -117,7 +123,9 @@ public class TestFactories extends BaseT
// beast it just a little, it shouldnt throw exceptions:
// (it should have thrown them in initialize)
- checkRandomData(random(), new FactoryAnalyzer(assertingTokenizer, null, factory), 20, 20, false, false);
+ Analyzer a = new FactoryAnalyzer(assertingTokenizer, null, factory);
+ checkRandomData(random(), a, 20, 20, false, false);
+ a.close();
}
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordAnalyzer.java?rev=1664404&r1=1664403&r2=1664404&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordAnalyzer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordAnalyzer.java Thu Mar 5 16:45:02 2015
@@ -19,6 +19,7 @@ package org.apache.lucene.analysis.core;
import java.io.StringReader;
+import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.BaseTokenStreamTestCase;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.tokenattributes.OffsetAttribute;
@@ -33,23 +34,24 @@ import org.apache.lucene.index.IndexWrit
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.MultiFields;
import org.apache.lucene.search.DocIdSetIterator;
-import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.RAMDirectory;
import org.apache.lucene.util.BytesRef;
+import org.apache.lucene.util.IOUtils;
import org.apache.lucene.util.TestUtil;
public class TestKeywordAnalyzer extends BaseTokenStreamTestCase {
private Directory directory;
- private IndexSearcher searcher;
private IndexReader reader;
+ private Analyzer analyzer;
@Override
public void setUp() throws Exception {
super.setUp();
directory = newDirectory();
- IndexWriter writer = new IndexWriter(directory, new IndexWriterConfig(new SimpleAnalyzer()));
+ analyzer = new SimpleAnalyzer();
+ IndexWriter writer = new IndexWriter(directory, new IndexWriterConfig(analyzer));
Document doc = new Document();
doc.add(new StringField("partnum", "Q36", Field.Store.YES));
@@ -59,13 +61,11 @@ public class TestKeywordAnalyzer extends
writer.close();
reader = DirectoryReader.open(directory);
- searcher = newSearcher(reader);
}
@Override
public void tearDown() throws Exception {
- reader.close();
- directory.close();
+ IOUtils.close(analyzer, reader, directory);
super.tearDown();
}
@@ -86,7 +86,8 @@ public class TestKeywordAnalyzer extends
public void testMutipleDocument() throws Exception {
RAMDirectory dir = new RAMDirectory();
- IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(new KeywordAnalyzer()));
+ Analyzer analyzer = new KeywordAnalyzer();
+ IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(analyzer));
Document doc = new Document();
doc.add(new TextField("partnum", "Q36", Field.Store.YES));
writer.addDocument(doc);
@@ -112,11 +113,13 @@ public class TestKeywordAnalyzer extends
null,
0);
assertTrue(td.nextDoc() != DocIdSetIterator.NO_MORE_DOCS);
+ analyzer.close();
}
// LUCENE-1441
public void testOffsets() throws Exception {
- try (TokenStream stream = new KeywordAnalyzer().tokenStream("field", new StringReader("abcd"))) {
+ try (Analyzer analyzer = new KeywordAnalyzer();
+ TokenStream stream = analyzer.tokenStream("field", new StringReader("abcd"))) {
OffsetAttribute offsetAtt = stream.addAttribute(OffsetAttribute.class);
stream.reset();
assertTrue(stream.incrementToken());
@@ -129,6 +132,8 @@ public class TestKeywordAnalyzer extends
/** blast some random strings through the analyzer */
public void testRandomStrings() throws Exception {
- checkRandomData(random(), new KeywordAnalyzer(), 1000*RANDOM_MULTIPLIER);
+ Analyzer analyzer = new KeywordAnalyzer();
+ checkRandomData(random(), analyzer, 1000*RANDOM_MULTIPLIER);
+ analyzer.close();
}
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java?rev=1664404&r1=1664403&r2=1664404&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java Thu Mar 5 16:45:02 2015
@@ -901,16 +901,17 @@ public class TestRandomChains extends Ba
int numIterations = TEST_NIGHTLY ? atLeast(20) : 3;
Random random = random();
for (int i = 0; i < numIterations; i++) {
- MockRandomAnalyzer a = new MockRandomAnalyzer(random.nextLong());
- if (VERBOSE) {
- System.out.println("Creating random analyzer:" + a);
- }
- try {
- checkRandomData(random, a, 500*RANDOM_MULTIPLIER, 20, false,
- false /* We already validate our own offsets... */);
- } catch (Throwable e) {
- System.err.println("Exception from random analyzer: " + a);
- throw e;
+ try (MockRandomAnalyzer a = new MockRandomAnalyzer(random.nextLong())) {
+ if (VERBOSE) {
+ System.out.println("Creating random analyzer:" + a);
+ }
+ try {
+ checkRandomData(random, a, 500*RANDOM_MULTIPLIER, 20, false,
+ false /* We already validate our own offsets... */);
+ } catch (Throwable e) {
+ System.err.println("Exception from random analyzer: " + a);
+ throw e;
+ }
}
}
}
@@ -920,16 +921,17 @@ public class TestRandomChains extends Ba
int numIterations = TEST_NIGHTLY ? atLeast(20) : 3;
Random random = random();
for (int i = 0; i < numIterations; i++) {
- MockRandomAnalyzer a = new MockRandomAnalyzer(random.nextLong());
- if (VERBOSE) {
- System.out.println("Creating random analyzer:" + a);
- }
- try {
- checkRandomData(random, a, 50*RANDOM_MULTIPLIER, 80, false,
- false /* We already validate our own offsets... */);
- } catch (Throwable e) {
- System.err.println("Exception from random analyzer: " + a);
- throw e;
+ try (MockRandomAnalyzer a = new MockRandomAnalyzer(random.nextLong())) {
+ if (VERBOSE) {
+ System.out.println("Creating random analyzer:" + a);
+ }
+ try {
+ checkRandomData(random, a, 50*RANDOM_MULTIPLIER, 80, false,
+ false /* We already validate our own offsets... */);
+ } catch (Throwable e) {
+ System.err.println("Exception from random analyzer: " + a);
+ throw e;
+ }
}
}
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStopAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStopAnalyzer.java?rev=1664404&r1=1664403&r2=1664404&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStopAnalyzer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStopAnalyzer.java Thu Mar 5 16:45:02 2015
@@ -30,7 +30,7 @@ import java.util.HashSet;
public class TestStopAnalyzer extends BaseTokenStreamTestCase {
- private StopAnalyzer stop = new StopAnalyzer();
+ private StopAnalyzer stop;
private Set<Object> inValidTokens = new HashSet<>();
@Override
@@ -41,6 +41,13 @@ public class TestStopAnalyzer extends Ba
while(it.hasNext()) {
inValidTokens.add(it.next());
}
+ stop = new StopAnalyzer();
+ }
+
+ @Override
+ public void tearDown() throws Exception {
+ stop.close();
+ super.tearDown();
}
public void testDefaults() throws IOException {
@@ -71,6 +78,7 @@ public class TestStopAnalyzer extends Ba
}
stream.end();
}
+ newStop.close();
}
public void testStopListPositions() throws IOException {
@@ -92,6 +100,7 @@ public class TestStopAnalyzer extends Ba
}
stream.end();
}
+ newStop.close();
}
}
Modified: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/custom/TestCustomAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/custom/TestCustomAnalyzer.java?rev=1664404&r1=1664403&r2=1664404&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/custom/TestCustomAnalyzer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/custom/TestCustomAnalyzer.java Thu Mar 5 16:45:02 2015
@@ -62,6 +62,7 @@ public class TestCustomAnalyzer extends
assertAnalyzesTo(a, "föó bär FÃà BAR",
new String[] { "foo", "föó", "bar", "bär", "foo", "föö", "bar" },
new int[] { 1, 0, 1, 0, 1, 0, 1});
+ a.close();
}
public void testHtmlStripClassicFolding() throws Exception {
@@ -93,6 +94,7 @@ public class TestCustomAnalyzer extends
assertAnalyzesTo(a, "<p><b>föó</b> bär FÃà BAR</p>",
new String[] { "foo", "föó", "bar", "bär", "foo", "föö", "bar" },
new int[] { 1, 0, 1, 0, 1, 0, 1});
+ a.close();
}
public void testStopWordsFromClasspath() throws Exception {
@@ -114,6 +116,7 @@ public class TestCustomAnalyzer extends
assertSame(Version.LATEST, a.getVersion());
assertAnalyzesTo(a, "foo Foo Bar", new String[0]);
+ a.close();
}
public void testStopWordsFromClasspathWithMap() throws Exception {
@@ -141,6 +144,7 @@ public class TestCustomAnalyzer extends
} catch (IllegalArgumentException | UnsupportedOperationException e) {
// pass
}
+ a.close();
}
public void testStopWordsFromFile() throws Exception {
@@ -152,6 +156,7 @@ public class TestCustomAnalyzer extends
"format", "wordset")
.build();
assertAnalyzesTo(a, "foo Foo Bar", new String[0]);
+ a.close();
}
public void testStopWordsFromFileAbsolute() throws Exception {
@@ -163,6 +168,7 @@ public class TestCustomAnalyzer extends
"format", "wordset")
.build();
assertAnalyzesTo(a, "foo Foo Bar", new String[0]);
+ a.close();
}
// Now test misconfigurations:
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=1664404&r1=1664403&r2=1664404&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 Thu Mar 5 16:45:02 2015
@@ -18,6 +18,7 @@ package org.apache.lucene.analysis.cz;
*/
import java.io.IOException;
+
import org.apache.lucene.analysis.BaseTokenStreamTestCase;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.util.CharArraySet;
@@ -31,15 +32,24 @@ import org.apache.lucene.analysis.util.C
*/
public class TestCzechAnalyzer extends BaseTokenStreamTestCase {
+ /** This test fails with NPE when the
+ * stopwords file is missing in classpath */
+ public void testResourcesAvailable() {
+ new CzechAnalyzer().close();
+ }
+
public void testStopWord() throws Exception {
- assertAnalyzesTo(new CzechAnalyzer(), "Pokud mluvime o volnem",
+ Analyzer analyzer = new CzechAnalyzer();
+ assertAnalyzesTo(analyzer, "Pokud mluvime o volnem",
new String[] { "mluvim", "voln" });
+ analyzer.close();
}
public void testReusableTokenStream() throws Exception {
Analyzer analyzer = new CzechAnalyzer();
assertAnalyzesTo(analyzer, "Pokud mluvime o volnem", new String[] { "mluvim", "voln" });
assertAnalyzesTo(analyzer, "Äeská Republika", new String[] { "Äesk", "republik" });
+ analyzer.close();
}
public void testWithStemExclusionSet() throws IOException{
@@ -47,10 +57,13 @@ public class TestCzechAnalyzer extends B
set.add("hole");
CzechAnalyzer cz = new CzechAnalyzer(CharArraySet.EMPTY_SET, set);
assertAnalyzesTo(cz, "hole desek", new String[] {"hole", "desk"});
+ cz.close();
}
/** blast some random strings through the analyzer */
public void testRandomStrings() throws Exception {
- checkRandomData(random(), new CzechAnalyzer(), 1000*RANDOM_MULTIPLIER);
+ Analyzer analyzer = new CzechAnalyzer();
+ checkRandomData(random(), analyzer, 1000*RANDOM_MULTIPLIER);
+ analyzer.close();
}
}
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=1664404&r1=1664403&r2=1664404&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 Thu Mar 5 16:45:02 2015
@@ -18,7 +18,6 @@ package org.apache.lucene.analysis.cz;
*/
import java.io.IOException;
-import java.io.Reader;
import java.io.StringReader;
import org.apache.lucene.analysis.Analyzer;
@@ -103,6 +102,8 @@ public class TestCzechStemmer extends Ba
assertAnalyzesTo(cz, "soudcům", new String[] { "soudk" });
assertAnalyzesTo(cz, "soudcÃch", new String[] { "soudk" });
assertAnalyzesTo(cz, "soudcem", new String[] { "soudk" });
+
+ cz.close();
}
/**
@@ -147,6 +148,8 @@ public class TestCzechStemmer extends Ba
assertAnalyzesTo(cz, "ženách", new String[] { "žn" });
assertAnalyzesTo(cz, "ženou", new String[] { "žn" });
assertAnalyzesTo(cz, "ženami", new String[] { "žn" });
+
+ cz.close();
}
/**
@@ -189,7 +192,9 @@ public class TestCzechStemmer extends Ba
assertAnalyzesTo(cz, "stavenÃ", new String[] { "stavn" });
assertAnalyzesTo(cz, "stavenÃm", new String[] { "stavn" });
assertAnalyzesTo(cz, "stavenÃch", new String[] { "stavn" });
- assertAnalyzesTo(cz, "stavenÃmi", new String[] { "stavn" });
+ assertAnalyzesTo(cz, "stavenÃmi", new String[] { "stavn" });
+
+ cz.close();
}
/**
@@ -218,6 +223,8 @@ public class TestCzechStemmer extends Ba
assertAnalyzesTo(cz, "jarnÃmu", new String[] { "jarn" });
assertAnalyzesTo(cz, "jarnÃm", new String[] { "jarn" });
assertAnalyzesTo(cz, "jarnÃmi", new String[] { "jarn" });
+
+ cz.close();
}
/**
@@ -227,6 +234,7 @@ public class TestCzechStemmer extends Ba
CzechAnalyzer cz = new CzechAnalyzer();
assertAnalyzesTo(cz, "Karlův", new String[] { "karl" });
assertAnalyzesTo(cz, "jazykový", new String[] { "jazyk" });
+ cz.close();
}
/**
@@ -267,6 +275,8 @@ public class TestCzechStemmer extends Ba
/* rewrite of e* -> * */
assertAnalyzesTo(cz, "deska", new String[] { "desk" });
assertAnalyzesTo(cz, "desek", new String[] { "desk" });
+
+ cz.close();
}
/**
@@ -276,6 +286,7 @@ public class TestCzechStemmer extends Ba
CzechAnalyzer cz = new CzechAnalyzer();
assertAnalyzesTo(cz, "e", new String[] { "e" });
assertAnalyzesTo(cz, "zi", new String[] { "zi" });
+ cz.close();
}
public void testWithKeywordAttribute() throws IOException {
@@ -297,6 +308,7 @@ public class TestCzechStemmer extends Ba
}
};
checkOneTerm(a, "", "");
+ a.close();
}
}
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=1664404&r1=1664403&r2=1664404&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 Thu Mar 5 16:45:02 2015
@@ -27,7 +27,7 @@ public class TestDanishAnalyzer extends
/** This test fails with NPE when the
* stopwords file is missing in classpath */
public void testResourcesAvailable() {
- new DanishAnalyzer();
+ new DanishAnalyzer().close();
}
/** test stopwords and stemming */
@@ -38,6 +38,7 @@ public class TestDanishAnalyzer extends
checkOneTerm(a, "undersøgelse", "undersøg");
// stopword
assertAnalyzesTo(a, "på", new String[] {});
+ a.close();
}
/** test use of exclusion set */
@@ -47,10 +48,13 @@ public class TestDanishAnalyzer extends
DanishAnalyzer.getDefaultStopSet(), exclusionSet);
checkOneTerm(a, "undersøgelse", "undersøgelse");
checkOneTerm(a, "undersøg", "undersøg");
+ a.close();
}
/** blast some random strings through the analyzer */
public void testRandomStrings() throws Exception {
- checkRandomData(random(), new DanishAnalyzer(), 1000*RANDOM_MULTIPLIER);
+ Analyzer analyzer = new DanishAnalyzer();
+ checkRandomData(random(), analyzer, 1000*RANDOM_MULTIPLIER);
+ analyzer.close();
}
}