You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2016/02/24 07:12:15 UTC
[08/53] [abbrv] lucene-solr git commit: LUCENE-7037: Switch all
exceptions tests to expectThrows()
LUCENE-7037: Switch all exceptions tests to expectThrows()
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/189e985b
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/189e985b
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/189e985b
Branch: refs/heads/apiv2
Commit: 189e985b5c14c5c19799b7bdfd040874b94ba18c
Parents: c4d3179
Author: Robert Muir <rm...@apache.org>
Authored: Fri Feb 19 12:07:07 2016 -0500
Committer: Robert Muir <rm...@apache.org>
Committed: Fri Feb 19 12:07:47 2016 -0500
----------------------------------------------------------------------
.../lucene/analysis/ar/TestArabicFilters.java | 24 +-
.../bg/TestBulgarianStemFilterFactory.java | 8 +-
.../br/TestBrazilianStemFilterFactory.java | 8 +-
.../TestHTMLStripCharFilterFactory.java | 8 +-
.../TestMappingCharFilterFactory.java | 33 +-
.../cjk/TestCJKBigramFilterFactory.java | 7 +-
.../analysis/cjk/TestCJKWidthFilterFactory.java | 8 +-
.../TestSoraniNormalizationFilterFactory.java | 8 +-
.../ckb/TestSoraniStemFilterFactory.java | 8 +-
.../TestCommonGramsFilterFactory.java | 8 +-
.../TestCommonGramsQueryFilterFactory.java | 8 +-
...ictionaryCompoundWordTokenFilterFactory.java | 8 +-
...phenationCompoundWordTokenFilterFactory.java | 8 +-
.../analysis/core/TestBugInSomething.java | 80 ++---
.../core/TestDecimalDigitFilterFactory.java | 8 +-
.../analysis/core/TestStopFilterFactory.java | 36 +-
.../core/TestTypeTokenFilterFactory.java | 16 +-
.../analysis/custom/TestCustomAnalyzer.java | 87 ++---
.../analysis/cz/TestCzechStemFilterFactory.java | 8 +-
.../de/TestGermanLightStemFilterFactory.java | 8 +-
.../de/TestGermanMinimalStemFilterFactory.java | 8 +-
.../TestGermanNormalizationFilterFactory.java | 8 +-
.../de/TestGermanStemFilterFactory.java | 8 +-
.../el/TestGreekLowerCaseFilterFactory.java | 8 +-
.../analysis/el/TestGreekStemFilterFactory.java | 8 +-
.../en/TestEnglishMinimalStemFilterFactory.java | 8 +-
.../analysis/en/TestKStemFilterFactory.java | 8 +-
.../en/TestPorterStemFilterFactory.java | 8 +-
.../es/TestSpanishLightStemFilterFactory.java | 8 +-
.../TestPersianNormalizationFilterFactory.java | 8 +-
.../fi/TestFinnishLightStemFilterFactory.java | 8 +-
.../fr/TestFrenchLightStemFilterFactory.java | 8 +-
.../fr/TestFrenchMinimalStemFilterFactory.java | 8 +-
.../ga/TestIrishLowerCaseFilterFactory.java | 8 +-
.../TestGalicianMinimalStemFilterFactory.java | 8 +-
.../gl/TestGalicianStemFilterFactory.java | 8 +-
.../lucene/analysis/hi/TestHindiFilters.java | 24 +-
.../hu/TestHungarianLightStemFilterFactory.java | 8 +-
.../analysis/hunspell/TestDictionary.java | 18 +-
.../hunspell/TestHunspellStemFilterFactory.java | 8 +-
.../id/TestIndonesianStemFilterFactory.java | 8 +-
.../it/TestItalianLightStemFilterFactory.java | 8 +-
.../lv/TestLatvianStemFilterFactory.java | 8 +-
.../DateRecognizerFilterFactoryTest.java | 7 +-
.../TestCapitalizationFilterFactory.java | 18 +-
.../TestCodepointCountFilterFactory.java | 16 +-
.../TestFingerprintFilterFactory.java | 8 +-
.../miscellaneous/TestKeepFilterFactory.java | 8 +-
.../TestKeywordMarkerFilterFactory.java | 8 +-
.../miscellaneous/TestLengthFilterFactory.java | 16 +-
.../TestLimitTokenCountFilterFactory.java | 18 +-
.../TestLimitTokenOffsetFilterFactory.java | 18 +-
.../TestLimitTokenPositionFilterFactory.java | 18 +-
.../TestRemoveDuplicatesTokenFilterFactory.java | 8 +-
.../TestScandinavianFoldingFilterFactory.java | 8 +-
...tScandinavianNormalizationFilterFactory.java | 8 +-
.../TestStemmerOverrideFilterFactory.java | 8 +-
.../miscellaneous/TestTrimFilterFactory.java | 8 +-
.../TestTruncateTokenFilterFactory.java | 16 +-
.../ngram/EdgeNGramTokenFilterTest.java | 24 +-
.../analysis/ngram/EdgeNGramTokenizerTest.java | 24 +-
.../analysis/ngram/NGramTokenFilterTest.java | 16 +-
.../analysis/ngram/NGramTokenizerTest.java | 17 +-
.../lucene/analysis/ngram/TestNGramFilters.java | 32 +-
.../no/TestNorwegianLightStemFilterFactory.java | 8 +-
.../TestNorwegianMinimalStemFilterFactory.java | 8 +-
.../TestPatternReplaceCharFilterFactory.java | 8 +-
.../TestPatternReplaceFilterFactory.java | 8 +-
.../pattern/TestPatternTokenizerFactory.java | 8 +-
.../TestDelimitedPayloadTokenFilterFactory.java | 8 +-
.../TestPortugueseLightStemFilterFactory.java | 8 +-
.../TestPortugueseMinimalStemFilterFactory.java | 8 +-
.../pt/TestPortugueseStemFilterFactory.java | 8 +-
.../reverse/TestReverseStringFilterFactory.java | 8 +-
.../ru/TestRussianLightStemFilterFactory.java | 8 +-
.../shingle/TestShingleFilterFactory.java | 8 +-
.../TestSnowballPorterFilterFactory.java | 8 +-
.../TestSerbianNormalizationFilterFactory.java | 8 +-
.../standard/TestStandardFactories.java | 64 ++--
.../TestUAX29URLEmailTokenizerFactory.java | 18 +-
.../sv/TestSwedishLightStemFilterFactory.java | 8 +-
.../analysis/synonym/TestSolrSynonymParser.java | 35 +-
.../synonym/TestSynonymFilterFactory.java | 34 +-
.../analysis/synonym/TestSynonymMapFilter.java | 9 +-
.../analysis/th/TestThaiTokenizerFactory.java | 8 +-
.../tr/TestApostropheFilterFactory.java | 8 +-
.../tr/TestTurkishLowerCaseFilterFactory.java | 8 +-
.../analysis/util/TestAnalysisSPILoader.java | 84 ++---
.../analysis/util/TestCharArrayIterator.java | 7 +-
.../lucene/analysis/util/TestCharArrayMap.java | 10 +-
.../lucene/analysis/util/TestCharArraySet.java | 26 +-
.../analysis/util/TestCharacterUtils.java | 22 +-
.../analysis/util/TestElisionFilterFactory.java | 8 +-
.../util/TestFilesystemResourceLoader.java | 17 +-
.../TestWikipediaTokenizerFactory.java | 8 +-
.../icu/TestICUFoldingFilterFactory.java | 8 +-
.../TestICUNormalizer2CharFilterFactory.java | 8 +-
.../icu/TestICUNormalizer2FilterFactory.java | 8 +-
.../icu/TestICUTransformFilterFactory.java | 8 +-
.../icu/segmentation/TestCharArrayIterator.java | 7 +-
.../segmentation/TestICUTokenizerFactory.java | 8 +-
.../ja/TestJapaneseBaseFormFilterFactory.java | 8 +-
...tJapaneseIterationMarkCharFilterFactory.java | 8 +-
.../TestJapaneseKatakanaStemFilterFactory.java | 8 +-
.../ja/TestJapaneseNumberFilterFactory.java | 8 +-
...stJapanesePartOfSpeechStopFilterFactory.java | 8 +-
.../TestJapaneseReadingFormFilterFactory.java | 8 +-
.../ja/TestJapaneseTokenizerFactory.java | 8 +-
.../morfologik/TestMorfologikFilterFactory.java | 16 +-
.../phonetic/TestBeiderMorseFilterFactory.java | 8 +-
.../TestDaitchMokotoffSoundexFilterFactory.java | 8 +-
.../TestDoubleMetaphoneFilterFactory.java | 8 +-
.../phonetic/TestPhoneticFilterFactory.java | 32 +-
.../smart/TestHMMChineseTokenizerFactory.java | 8 +-
.../TestStempelPolishStemFilterFactory.java | 8 +-
.../uima/ae/OverridingParamsAEProviderTest.java | 14 +-
.../lucene/index/TestMaxPositionInOldIndex.java | 22 +-
.../benchmark/byTask/TestPerfTasksLogic.java | 10 +-
.../byTask/feeds/EnwikiContentSourceTest.java | 7 +-
.../byTask/feeds/LineDocSourceTest.java | 7 +-
.../byTask/feeds/TrecContentSourceTest.java | 8 +-
.../byTask/tasks/alt/AltPackageTaskTest.java | 7 +-
.../codecs/autoprefix/TestAutoPrefixTerms.java | 23 +-
.../lucene/analysis/TestCachingTokenFilter.java | 8 +-
.../lucene/analysis/TestNumericTokenStream.java | 31 +-
.../TestCharTermAttributeImpl.java | 38 +--
.../lucene50/TestBlockPostingsFormat.java | 7 +-
...cene50StoredFieldsFormatHighCompression.java | 14 +-
.../apache/lucene/document/TestDateTools.java | 22 +-
.../apache/lucene/document/TestDocument.java | 40 +--
.../org/apache/lucene/document/TestField.java | 84 ++---
.../org/apache/lucene/index/TestAddIndexes.java | 38 +--
.../index/TestBinaryDocValuesUpdates.java | 14 +-
.../org/apache/lucene/index/TestCodecUtil.java | 119 +++----
.../index/TestConcurrentMergeScheduler.java | 28 +-
.../index/TestCrashCausesCorruptIndex.java | 10 +-
.../lucene/index/TestDirectoryReader.java | 14 +-
.../lucene/index/TestDirectoryReaderReopen.java | 24 +-
.../index/TestDocInverterPerFieldErrorInfo.java | 12 +-
.../org/apache/lucene/index/TestDocValues.java | 115 +++----
.../lucene/index/TestDocValuesIndexing.java | 327 ++++++++-----------
.../lucene/index/TestExceedMaxTermLength.java | 26 +-
.../index/TestExitableDirectoryReader.java | 16 +-
.../org/apache/lucene/index/TestIndexInput.java | 18 +-
.../lucene/index/TestIndexReaderClose.java | 22 +-
.../apache/lucene/index/TestIndexWriter.java | 125 ++++---
.../lucene/index/TestIndexWriterCommit.java | 17 +-
.../lucene/index/TestIndexWriterConfig.java | 77 ++---
.../lucene/index/TestIndexWriterDelete.java | 23 +-
.../lucene/index/TestIndexWriterExceptions.java | 230 ++++++-------
.../lucene/index/TestIndexWriterFromReader.java | 49 ++-
.../lucene/index/TestIndexWriterMaxDocs.java | 208 +++++-------
.../index/TestIndexWriterMergePolicy.java | 7 +-
.../lucene/index/TestIndexWriterOnDiskFull.java | 28 +-
.../lucene/index/TestIndexWriterReader.java | 18 +-
.../index/TestIndexWriterWithThreads.java | 16 +-
.../apache/lucene/index/TestMaxPosition.java | 7 +-
.../index/TestNumericDocValuesUpdates.java | 14 +-
.../org/apache/lucene/index/TestOmitTf.java | 16 +-
.../index/TestParallelCompositeReader.java | 71 ++--
.../lucene/index/TestParallelLeafReader.java | 31 +-
.../lucene/index/TestPayloadsOnVectors.java | 9 +-
.../TestPersistentSnapshotDeletionPolicy.java | 9 +-
.../apache/lucene/index/TestPointValues.java | 310 ++++++++----------
.../lucene/index/TestPostingsOffsets.java | 34 +-
.../apache/lucene/index/TestSegmentReader.java | 22 +-
.../index/TestSnapshotDeletionPolicy.java | 9 +-
.../lucene/index/TestTermVectorsReader.java | 191 ++++++-----
.../lucene/index/TestTermVectorsWriter.java | 19 +-
.../lucene/index/TestTieredMergePolicy.java | 21 +-
.../lucene/search/MultiCollectorTest.java | 14 +-
.../apache/lucene/search/TestBooleanQuery.java | 7 +-
.../lucene/search/TestCachingCollector.java | 7 +-
.../TestControlledRealTimeReopenThread.java | 8 +-
.../apache/lucene/search/TestFuzzyQuery.java | 51 ++-
.../apache/lucene/search/TestIndexSearcher.java | 11 +-
.../lucene/search/TestMultiCollector.java | 7 +-
.../lucene/search/TestMultiPhraseQuery.java | 14 +-
.../search/TestMultiTermQueryRewrites.java | 8 +-
.../apache/lucene/search/TestPhraseQuery.java | 21 +-
.../apache/lucene/search/TestPointQueries.java | 14 +-
.../lucene/search/TestSearcherManager.java | 43 +--
.../apache/lucene/search/TestSynonymQuery.java | 5 +-
.../apache/lucene/search/TestTermScorer.java | 11 +-
.../search/TestTimeLimitingCollector.java | 25 +-
.../search/similarities/TestBM25Similarity.java | 49 ++-
.../lucene/search/spans/TestSpanNearQuery.java | 29 +-
.../lucene/search/spans/TestSpanNotQuery.java | 17 +-
.../lucene/search/spans/TestSpanOrQuery.java | 8 +-
.../lucene/search/spans/TestSpanTermQuery.java | 9 +-
.../lucene/store/TestBufferedIndexInput.java | 28 +-
.../org/apache/lucene/store/TestDirectory.java | 14 +-
.../lucene/store/TestFileSwitchDirectory.java | 8 +-
.../org/apache/lucene/store/TestMultiMMap.java | 73 ++---
.../lucene/store/TestNativeFSLockFactory.java | 33 +-
.../apache/lucene/store/TestRAMDirectory.java | 7 +-
.../lucene/store/TestSimpleFSLockFactory.java | 10 +-
.../store/TestSingleInstanceLockFactory.java | 12 +-
.../org/apache/lucene/util/TestArrayUtil.java | 71 ++--
.../apache/lucene/util/TestAttributeSource.java | 22 +-
.../org/apache/lucene/util/TestCharsRef.java | 42 +--
.../apache/lucene/util/TestFilterIterator.java | 14 +-
.../org/apache/lucene/util/TestIOUtils.java | 7 +-
.../lucene/util/TestLegacyNumericUtils.java | 20 +-
.../apache/lucene/util/TestNamedSPILoader.java | 5 +-
.../apache/lucene/util/TestOfflineSorter.java | 18 +-
.../apache/lucene/util/TestPriorityQueue.java | 36 +-
.../org/apache/lucene/util/TestUnicodeUtil.java | 8 +-
.../org/apache/lucene/util/TestVersion.java | 147 +++------
.../apache/lucene/util/TestVirtualMethod.java | 34 +-
.../apache/lucene/util/TestWeakIdentityMap.java | 6 +-
.../automaton/FiniteStringsIteratorTest.java | 8 +-
.../LimitedFiniteStringsIteratorTest.java | 14 +-
.../lucene/util/automaton/TestAutomaton.java | 7 +-
.../lucene/util/automaton/TestRegExp.java | 32 +-
.../org/apache/lucene/util/bkd/TestBKD.java | 23 +-
.../lucene/util/packed/TestDirectPacked.java | 9 +-
.../lucene/util/packed/TestPackedInts.java | 21 +-
.../expressions/TestExpressionValidation.java | 56 ++--
.../expressions/js/TestCustomFunctions.java | 123 +++----
.../expressions/js/TestJavascriptCompiler.java | 116 +++----
.../facet/range/TestRangeFacetCounts.java | 29 +-
.../sortedset/TestSortedSetDocValuesFacets.java | 7 +-
.../lucene/facet/taxonomy/TestFacetLabel.java | 134 +++-----
.../taxonomy/TestSearcherTaxonomyManager.java | 7 +-
.../facet/taxonomy/TestTaxonomyCombined.java | 24 +-
.../taxonomy/TestTaxonomyFacetAssociations.java | 37 +--
.../facet/taxonomy/TestTaxonomyFacetCounts.java | 46 +--
.../TestTaxonomyFacetSumValueSource.java | 14 +-
.../directory/TestDirectoryTaxonomyReader.java | 8 +-
.../directory/TestDirectoryTaxonomyWriter.java | 19 +-
.../TestPostingsHighlighter.java | 14 +-
.../SimpleFragListBuilderTest.java | 9 +-
.../lucene/search/join/TestBlockJoin.java | 8 +-
.../search/join/TestBlockJoinValidation.java | 35 +-
.../lucene/index/memory/TestMemoryIndex.java | 18 +-
.../lucene/index/SortingLeafReaderTest.java | 8 +-
.../lucene/index/TestSortingMergePolicy.java | 8 +-
.../lucene/uninverting/TestFieldCache.java | 70 ++--
.../lucene/uninverting/TestFieldCacheSort.java | 5 +-
.../lucene/queries/CommonTermsQueryTest.java | 22 +-
.../analyzing/TestAnalyzingQueryParser.java | 59 +---
.../classic/TestMultiFieldQueryParser.java | 50 ++-
.../queryparser/classic/TestQueryParser.java | 23 +-
.../complexPhrase/TestComplexPhraseQuery.java | 9 +-
.../ext/TestExtendableQueryParser.java | 6 +-
.../lucene/queryparser/ext/TestExtensions.java | 8 +-
.../precedence/TestPrecedenceQueryParser.java | 21 +-
.../flexible/spans/TestSpanQueryParser.java | 71 ++--
.../standard/TestMultiFieldQPHelper.java | 50 ++-
.../flexible/standard/TestQPHelper.java | 47 +--
.../flexible/standard/TestStandardQP.java | 12 +-
.../IndexAndTaxonomyRevisionTest.java | 16 +-
.../lucene/replicator/IndexRevisionTest.java | 32 +-
.../lucene/replicator/LocalReplicatorTest.java | 37 +--
.../idversion/TestIDVersionPostingsFormat.java | 82 ++---
.../sandbox/queries/TestSlowFuzzyQuery.java | 19 +-
.../lucene/search/TestTermAutomatonQuery.java | 14 +-
.../geopoint/search/TestGeoPointQuery.java | 23 +-
.../spatial/query/SpatialArgsParserTest.java | 16 +-
.../lucene/search/spell/TestSpellChecker.java | 46 +--
.../analyzing/AnalyzingInfixSuggesterTest.java | 16 +-
.../analyzing/AnalyzingSuggesterTest.java | 15 +-
.../analyzing/TestFreeTextSuggester.java | 24 +-
.../analyzing/TestSuggestStopFilterFactory.java | 38 +--
.../suggest/document/TestContextQuery.java | 16 +-
.../document/TestContextSuggestField.java | 43 +--
.../suggest/document/TestSuggestField.java | 40 +--
.../search/suggest/fst/BytesRefSortersTest.java | 8 +-
.../index/BaseCompoundFormatTestCase.java | 68 ++--
.../index/BaseFieldInfoFormatTestCase.java | 53 +--
.../index/BaseSegmentInfoFormatTestCase.java | 71 ++--
.../apache/lucene/index/BaseTestCheckIndex.java | 9 +-
.../java/org/apache/lucene/index/DocHelper.java | 6 +-
.../lucene/index/RandomPostingsTester.java | 7 +-
.../lucene/store/BaseDirectoryTestCase.java | 177 ++++------
.../lucene/store/BaseLockFactoryTestCase.java | 13 +-
277 files changed, 2787 insertions(+), 4626 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/189e985b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicFilters.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicFilters.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicFilters.java
index 7bc9abc..eb2018f 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicFilters.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicFilters.java
@@ -61,25 +61,19 @@ public class TestArabicFilters extends BaseTokenStreamFactoryTestCase {
/** Test that bogus arguments result in exception */
public void testBogusArguments() throws Exception {
- try {
+ IllegalArgumentException expected = expectThrows(IllegalArgumentException.class, () -> {
tokenFilterFactory("ArabicNormalization", "bogusArg", "bogusValue");
- fail();
- } catch (IllegalArgumentException expected) {
- assertTrue(expected.getMessage().contains("Unknown parameters"));
- }
+ });
+ assertTrue(expected.getMessage().contains("Unknown parameters"));
- try {
+ expected = expectThrows(IllegalArgumentException.class, () -> {
tokenFilterFactory("Arabicstem", "bogusArg", "bogusValue");
- fail();
- } catch (IllegalArgumentException expected) {
- assertTrue(expected.getMessage().contains("Unknown parameters"));
- }
+ });
+ assertTrue(expected.getMessage().contains("Unknown parameters"));
- try {
+ expected = expectThrows(IllegalArgumentException.class, () -> {
charFilterFactory("Persian", "bogusArg", "bogusValue");
- fail();
- } catch (IllegalArgumentException expected) {
- assertTrue(expected.getMessage().contains("Unknown parameters"));
- }
+ });
+ assertTrue(expected.getMessage().contains("Unknown parameters"));
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/189e985b/lucene/analysis/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianStemFilterFactory.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianStemFilterFactory.java
index 7edd86b..4b19c94 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianStemFilterFactory.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianStemFilterFactory.java
@@ -41,11 +41,9 @@ public class TestBulgarianStemFilterFactory extends BaseTokenStreamFactoryTestCa
/** Test that bogus arguments result in exception */
public void testBogusArguments() throws Exception {
- try {
+ IllegalArgumentException expected = expectThrows(IllegalArgumentException.class, () -> {
tokenFilterFactory("BulgarianStem", "bogusArg", "bogusValue");
- fail();
- } catch (IllegalArgumentException expected) {
- assertTrue(expected.getMessage().contains("Unknown parameters"));
- }
+ });
+ assertTrue(expected.getMessage().contains("Unknown parameters"));
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/189e985b/lucene/analysis/common/src/test/org/apache/lucene/analysis/br/TestBrazilianStemFilterFactory.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/br/TestBrazilianStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/br/TestBrazilianStemFilterFactory.java
index b325797..af47bd2 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/br/TestBrazilianStemFilterFactory.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/br/TestBrazilianStemFilterFactory.java
@@ -42,11 +42,9 @@ public class TestBrazilianStemFilterFactory extends BaseTokenStreamFactoryTestCa
/** Test that bogus arguments result in exception */
public void testBogusArguments() throws Exception {
- try {
+ IllegalArgumentException expected = expectThrows(IllegalArgumentException.class, () -> {
tokenFilterFactory("BrazilianStem", "bogusArg", "bogusValue");
- fail();
- } catch (IllegalArgumentException expected) {
- assertTrue(expected.getMessage().contains("Unknown parameters"));
- }
+ });
+ assertTrue(expected.getMessage().contains("Unknown parameters"));
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/189e985b/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestHTMLStripCharFilterFactory.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestHTMLStripCharFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestHTMLStripCharFilterFactory.java
index f3a0b71..75b3e87 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestHTMLStripCharFilterFactory.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestHTMLStripCharFilterFactory.java
@@ -104,11 +104,9 @@ public class TestHTMLStripCharFilterFactory extends BaseTokenStreamFactoryTestCa
/** Test that bogus arguments result in exception */
public void testBogusArguments() throws Exception {
- try {
+ IllegalArgumentException expected = expectThrows(IllegalArgumentException.class, () -> {
charFilterFactory("HTMLStrip", "bogusArg", "bogusValue");
- fail();
- } catch (IllegalArgumentException expected) {
- assertTrue(expected.getMessage().contains("Unknown parameters"));
- }
+ });
+ assertTrue(expected.getMessage().contains("Unknown parameters"));
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/189e985b/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestMappingCharFilterFactory.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestMappingCharFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestMappingCharFilterFactory.java
index b1c730f..e24089c 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestMappingCharFilterFactory.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestMappingCharFilterFactory.java
@@ -24,11 +24,9 @@ public class TestMappingCharFilterFactory extends BaseTokenStreamFactoryTestCase
MappingCharFilterFactory f = (MappingCharFilterFactory)charFilterFactory("Mapping");
- try {
- f.parseString( "\\" );
- fail( "escape character cannot be alone." );
- }
- catch (IllegalArgumentException expected) {}
+ expectThrows(IllegalArgumentException.class, () -> {
+ f.parseString("\\");
+ });
assertEquals( "unexpected escaped characters",
"\\\"\n\t\r\b\f", f.parseString( "\\\\\\\"\\n\\t\\r\\b\\f" ) );
@@ -37,26 +35,21 @@ public class TestMappingCharFilterFactory extends BaseTokenStreamFactoryTestCase
assertEquals( "unexpected escaped characters",
"AB", f.parseString( "\\u0041\\u0042" ) );
- try {
- f.parseString( "\\u000" );
- fail( "invalid length check." );
- }
- catch (IllegalArgumentException expected) {}
+ expectThrows(IllegalArgumentException.class, () -> {
+ f.parseString("\\u000");
+ });
- try {
- f.parseString( "\\u123x" );
- fail( "invalid hex number check." );
- }
- catch( NumberFormatException expected ){}
+ // invalid hex number
+ expectThrows(NumberFormatException.class, () -> {
+ f.parseString("\\u123x");
+ });
}
/** Test that bogus arguments result in exception */
public void testBogusArguments() throws Exception {
- try {
+ IllegalArgumentException expected = expectThrows(IllegalArgumentException.class, () -> {
charFilterFactory("Mapping", "bogusArg", "bogusValue");
- fail();
- } catch (IllegalArgumentException expected) {
- assertTrue(expected.getMessage().contains("Unknown parameters"));
- }
+ });
+ assertTrue(expected.getMessage().contains("Unknown parameters"));
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/189e985b/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKBigramFilterFactory.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKBigramFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKBigramFilterFactory.java
index 6828d51..a917e0c 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKBigramFilterFactory.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKBigramFilterFactory.java
@@ -60,11 +60,8 @@ public class TestCJKBigramFilterFactory extends BaseTokenStreamFactoryTestCase {
/** Test that bogus arguments result in exception */
public void testBogusArguments() throws Exception {
- try {
+ IllegalArgumentException expected = expectThrows(IllegalArgumentException.class, () -> {
tokenFilterFactory("CJKBigram", "bogusArg", "bogusValue");
- fail();
- } catch (IllegalArgumentException expected) {
- assertTrue(expected.getMessage().contains("Unknown parameters"));
- }
+ });
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/189e985b/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKWidthFilterFactory.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKWidthFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKWidthFilterFactory.java
index c9e8088..d4882a9 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKWidthFilterFactory.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKWidthFilterFactory.java
@@ -37,11 +37,9 @@ public class TestCJKWidthFilterFactory extends BaseTokenStreamFactoryTestCase {
/** Test that bogus arguments result in exception */
public void testBogusArguments() throws Exception {
- try {
+ IllegalArgumentException expected = expectThrows(IllegalArgumentException.class, () -> {
tokenFilterFactory("CJKWidth", "bogusArg", "bogusValue");
- fail();
- } catch (IllegalArgumentException expected) {
- assertTrue(expected.getMessage().contains("Unknown parameters"));
- }
+ });
+ assertTrue(expected.getMessage().contains("Unknown parameters"));
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/189e985b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniNormalizationFilterFactory.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniNormalizationFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniNormalizationFilterFactory.java
index b1027b2..510b83c 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniNormalizationFilterFactory.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniNormalizationFilterFactory.java
@@ -38,11 +38,9 @@ public class TestSoraniNormalizationFilterFactory extends BaseTokenStreamFactory
/** Test that bogus arguments result in exception */
public void testBogusArguments() throws Exception {
- try {
+ IllegalArgumentException expected = expectThrows(IllegalArgumentException.class, () -> {
tokenFilterFactory("SoraniNormalization", "bogusArg", "bogusValue");
- fail();
- } catch (IllegalArgumentException expected) {
- assertTrue(expected.getMessage().contains("Unknown parameters"));
- }
+ });
+ assertTrue(expected.getMessage().contains("Unknown parameters"));
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/189e985b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniStemFilterFactory.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniStemFilterFactory.java
index 384ea9e..1c4b162 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniStemFilterFactory.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniStemFilterFactory.java
@@ -40,11 +40,9 @@ public class TestSoraniStemFilterFactory extends BaseTokenStreamFactoryTestCase
/** Test that bogus arguments result in exception */
public void testBogusArguments() throws Exception {
- try {
+ IllegalArgumentException expected = expectThrows(IllegalArgumentException.class, () -> {
tokenFilterFactory("SoraniStem", "bogusArg", "bogusValue");
- fail();
- } catch (IllegalArgumentException expected) {
- assertTrue(expected.getMessage().contains("Unknown parameters"));
- }
+ });
+ assertTrue(expected.getMessage().contains("Unknown parameters"));
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/189e985b/lucene/analysis/common/src/test/org/apache/lucene/analysis/commongrams/TestCommonGramsFilterFactory.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/commongrams/TestCommonGramsFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/commongrams/TestCommonGramsFilterFactory.java
index e1838b4..98c351e 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/commongrams/TestCommonGramsFilterFactory.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/commongrams/TestCommonGramsFilterFactory.java
@@ -92,11 +92,9 @@ public class TestCommonGramsFilterFactory extends BaseTokenStreamFactoryTestCase
/** Test that bogus arguments result in exception */
public void testBogusArguments() throws Exception {
- try {
+ IllegalArgumentException expected = expectThrows(IllegalArgumentException.class, () -> {
tokenFilterFactory("CommonGrams", "bogusArg", "bogusValue");
- fail();
- } catch (IllegalArgumentException expected) {
- assertTrue(expected.getMessage().contains("Unknown parameters"));
- }
+ });
+ assertTrue(expected.getMessage().contains("Unknown parameters"));
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/189e985b/lucene/analysis/common/src/test/org/apache/lucene/analysis/commongrams/TestCommonGramsQueryFilterFactory.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/commongrams/TestCommonGramsQueryFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/commongrams/TestCommonGramsQueryFilterFactory.java
index 8ed2e40..7c826a9 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/commongrams/TestCommonGramsQueryFilterFactory.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/commongrams/TestCommonGramsQueryFilterFactory.java
@@ -91,11 +91,9 @@ public class TestCommonGramsQueryFilterFactory extends BaseTokenStreamFactoryTes
/** Test that bogus arguments result in exception */
public void testBogusArguments() throws Exception {
- try {
+ IllegalArgumentException expected = expectThrows(IllegalArgumentException.class, () -> {
tokenFilterFactory("CommonGramsQuery", "bogusArg", "bogusValue");
- fail();
- } catch (IllegalArgumentException expected) {
- assertTrue(expected.getMessage().contains("Unknown parameters"));
- }
+ });
+ assertTrue(expected.getMessage().contains("Unknown parameters"));
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/189e985b/lucene/analysis/common/src/test/org/apache/lucene/analysis/compound/TestDictionaryCompoundWordTokenFilterFactory.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/compound/TestDictionaryCompoundWordTokenFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/compound/TestDictionaryCompoundWordTokenFilterFactory.java
index 76532aa..8862519 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/compound/TestDictionaryCompoundWordTokenFilterFactory.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/compound/TestDictionaryCompoundWordTokenFilterFactory.java
@@ -44,13 +44,11 @@ public class TestDictionaryCompoundWordTokenFilterFactory extends BaseTokenStrea
/** Test that bogus arguments result in exception */
public void testBogusArguments() throws Exception {
- try {
+ IllegalArgumentException expected = expectThrows(IllegalArgumentException.class, () -> {
tokenFilterFactory("DictionaryCompoundWord",
"dictionary", "compoundDictionary.txt",
"bogusArg", "bogusValue");
- fail();
- } catch (IllegalArgumentException expected) {
- assertTrue(expected.getMessage().contains("Unknown parameters"));
- }
+ });
+ assertTrue(expected.getMessage().contains("Unknown parameters"));
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/189e985b/lucene/analysis/common/src/test/org/apache/lucene/analysis/compound/TestHyphenationCompoundWordTokenFilterFactory.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/compound/TestHyphenationCompoundWordTokenFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/compound/TestHyphenationCompoundWordTokenFilterFactory.java
index 31f65d3..0039e20 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/compound/TestHyphenationCompoundWordTokenFilterFactory.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/compound/TestHyphenationCompoundWordTokenFilterFactory.java
@@ -67,13 +67,11 @@ public class TestHyphenationCompoundWordTokenFilterFactory extends BaseTokenStre
/** Test that bogus arguments result in exception */
public void testBogusArguments() throws Exception {
- try {
+ IllegalArgumentException expected = expectThrows(IllegalArgumentException.class, () -> {
tokenFilterFactory("HyphenationCompoundWord",
"hyphenator", "da_UTF8.xml",
"bogusArg", "bogusValue");
- fail();
- } catch (IllegalArgumentException expected) {
- assertTrue(expected.getMessage().contains("Unknown parameters"));
- }
+ });
+ assertTrue(expected.getMessage().contains("Unknown parameters"));
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/189e985b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestBugInSomething.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestBugInSomething.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestBugInSomething.java
index e69d5b8..783811a 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestBugInSomething.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestBugInSomething.java
@@ -138,75 +138,55 @@ public class TestBugInSomething extends BaseTokenStreamTestCase {
public void testWrapping() throws Exception {
CharFilter cs = new TestRandomChains.CheckThatYouDidntReadAnythingReaderWrapper(wrappedStream);
- try {
+ Exception expected = expectThrows(Exception.class, () -> {
cs.mark(1);
- fail();
- } catch (Exception e) {
- assertEquals("mark(int)", e.getMessage());
- }
+ });
+ assertEquals("mark(int)", expected.getMessage());
- try {
+ expected = expectThrows(Exception.class, () -> {
cs.markSupported();
- fail();
- } catch (Exception e) {
- assertEquals("markSupported()", e.getMessage());
- }
+ });
+ assertEquals("markSupported()", expected.getMessage());
- try {
+ expected = expectThrows(Exception.class, () -> {
cs.read();
- fail();
- } catch (Exception e) {
- assertEquals("read()", e.getMessage());
- }
+ });
+ assertEquals("read()", expected.getMessage());
- try {
+ expected = expectThrows(Exception.class, () -> {
cs.read(new char[0]);
- fail();
- } catch (Exception e) {
- assertEquals("read(char[])", e.getMessage());
- }
+ });
+ assertEquals("read(char[])", expected.getMessage());
- try {
+ expected = expectThrows(Exception.class, () -> {
cs.read(CharBuffer.wrap(new char[0]));
- fail();
- } catch (Exception e) {
- assertEquals("read(CharBuffer)", e.getMessage());
- }
+ });
+ assertEquals("read(CharBuffer)", expected.getMessage());
- try {
+ expected = expectThrows(Exception.class, () -> {
cs.reset();
- fail();
- } catch (Exception e) {
- assertEquals("reset()", e.getMessage());
- }
+ });
+ assertEquals("reset()", expected.getMessage());
- try {
+ expected = expectThrows(Exception.class, () -> {
cs.skip(1);
- fail();
- } catch (Exception e) {
- assertEquals("skip(long)", e.getMessage());
- }
+ });
+ assertEquals("skip(long)", expected.getMessage());
- try {
+ expected = expectThrows(Exception.class, () -> {
cs.correctOffset(1);
- fail();
- } catch (Exception e) {
- assertEquals("correct(int)", e.getMessage());
- }
+ });
+ assertEquals("correct(int)", expected.getMessage());
- try {
+ expected = expectThrows(Exception.class, () -> {
cs.close();
- fail();
- } catch (Exception e) {
- assertEquals("close()", e.getMessage());
- }
+ });
+ assertEquals("close()", expected.getMessage());
- try {
+ expected = expectThrows(Exception.class, () -> {
cs.read(new char[0], 0, 0);
- fail();
- } catch (Exception e) {
- assertEquals("read(char[], int, int)", e.getMessage());
- }
+ });
+ assertEquals("read(char[], int, int)", expected.getMessage());
}
// todo: test framework?
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/189e985b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestDecimalDigitFilterFactory.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestDecimalDigitFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestDecimalDigitFilterFactory.java
index 112f009..8a484d4 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestDecimalDigitFilterFactory.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestDecimalDigitFilterFactory.java
@@ -40,11 +40,9 @@ public class TestDecimalDigitFilterFactory extends BaseTokenStreamFactoryTestCas
/** Test that bogus arguments result in exception */
public void testBogusArguments() throws Exception {
- try {
+ IllegalArgumentException expected = expectThrows(IllegalArgumentException.class, () -> {
tokenFilterFactory("DecimalDigit", "bogusArg", "bogusValue");
- fail();
- } catch (IllegalArgumentException expected) {
- assertTrue(expected.getMessage().contains("Unknown parameters"));
- }
+ });
+ assertTrue(expected.getMessage().contains("Unknown parameters"));
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/189e985b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStopFilterFactory.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStopFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStopFilterFactory.java
index 1d0aa8a..9fca6b9 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStopFilterFactory.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStopFilterFactory.java
@@ -66,37 +66,33 @@ public class TestStopFilterFactory extends BaseTokenStreamFactoryTestCase {
/** Test that bogus arguments result in exception */
public void testBogusArguments() throws Exception {
- try {
+ IllegalArgumentException expected = expectThrows(IllegalArgumentException.class, () -> {
tokenFilterFactory("Stop", "bogusArg", "bogusValue");
- fail();
- } catch (IllegalArgumentException expected) {
- assertTrue(expected.getMessage().contains("Unknown parameters"));
- }
+ });
+ assertTrue(expected.getMessage().contains("Unknown parameters"));
}
/** Test that bogus arguments result in exception */
public void testBogusFormats() throws Exception {
- try {
+ IllegalArgumentException expected = expectThrows(IllegalArgumentException.class, () -> {
tokenFilterFactory("Stop",
"words", "stop-snowball.txt",
"format", "bogus");
- fail();
- } catch (IllegalArgumentException expected) {
- String msg = expected.getMessage();
- assertTrue(msg, msg.contains("Unknown"));
- assertTrue(msg, msg.contains("format"));
- assertTrue(msg, msg.contains("bogus"));
- }
- try {
+ });
+ String msg = expected.getMessage();
+ assertTrue(msg, msg.contains("Unknown"));
+ assertTrue(msg, msg.contains("format"));
+ assertTrue(msg, msg.contains("bogus"));
+
+ expected = expectThrows(IllegalArgumentException.class, () -> {
tokenFilterFactory("Stop",
// implicit default words file
"format", "bogus");
fail();
- } catch (IllegalArgumentException expected) {
- String msg = expected.getMessage();
- assertTrue(msg, msg.contains("can not be specified"));
- assertTrue(msg, msg.contains("format"));
- assertTrue(msg, msg.contains("bogus"));
- }
+ });
+ msg = expected.getMessage();
+ assertTrue(msg, msg.contains("can not be specified"));
+ assertTrue(msg, msg.contains("format"));
+ assertTrue(msg, msg.contains("bogus"));
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/189e985b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestTypeTokenFilterFactory.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestTypeTokenFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestTypeTokenFilterFactory.java
index f7a1f62..0cfa575 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestTypeTokenFilterFactory.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestTypeTokenFilterFactory.java
@@ -59,23 +59,19 @@ public class TestTypeTokenFilterFactory extends BaseTokenStreamFactoryTestCase {
}
public void testMissingTypesParameter() throws Exception {
- try {
+ // not supplying 'types' parameter should cause an IllegalArgumentException
+ expectThrows(IllegalArgumentException.class, () -> {
tokenFilterFactory("Type");
- fail("not supplying 'types' parameter should cause an IllegalArgumentException");
- } catch (IllegalArgumentException e) {
- // everything ok
- }
+ });
}
/** Test that bogus arguments result in exception */
public void testBogusArguments() throws Exception {
- try {
+ IllegalArgumentException expected = expectThrows(IllegalArgumentException.class, () -> {
tokenFilterFactory("Type",
"types", "stoptypes-1.txt",
"bogusArg", "bogusValue");
- fail();
- } catch (IllegalArgumentException expected) {
- assertTrue(expected.getMessage().contains("Unknown parameters"));
- }
+ });
+ assertTrue(expected.getMessage().contains("Unknown parameters"));
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/189e985b/lucene/analysis/common/src/test/org/apache/lucene/analysis/custom/TestCustomAnalyzer.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/custom/TestCustomAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/custom/TestCustomAnalyzer.java
index 86088c0..af11927 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/custom/TestCustomAnalyzer.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/custom/TestCustomAnalyzer.java
@@ -203,15 +203,12 @@ public class TestCustomAnalyzer extends BaseTokenStreamTestCase {
assertAnalyzesTo(a, "foo Foo Bar", new String[0]);
// try with unmodifiableMap, should fail
- try {
+ expectThrows(UnsupportedOperationException.class, () -> {
CustomAnalyzer.builder()
.withTokenizer("whitespace")
.addTokenFilter("stop", stopConfigImmutable)
.build();
- fail();
- } catch (UnsupportedOperationException e) {
- // pass
- }
+ });
a.close();
}
@@ -242,133 +239,101 @@ public class TestCustomAnalyzer extends BaseTokenStreamTestCase {
// Now test misconfigurations:
public void testIncorrectOrder() throws Exception {
- try {
+ expectThrows(IllegalStateException.class, () -> {
CustomAnalyzer.builder()
.addCharFilter("htmlstrip")
.withDefaultMatchVersion(Version.LATEST)
.withTokenizer("whitespace")
.build();
- fail();
- } catch (IllegalStateException e) {
- // pass
- }
+ });
}
public void testMissingSPI() throws Exception {
- try {
+ IllegalArgumentException expected = expectThrows(IllegalArgumentException.class, () -> {
CustomAnalyzer.builder()
.withTokenizer("foobar_nonexistent")
.build();
- fail();
- } catch (IllegalArgumentException e) {
- assertTrue(e.getMessage().contains("SPI"));
- assertTrue(e.getMessage().contains("does not exist"));
- }
+ });
+ assertTrue(expected.getMessage().contains("SPI"));
+ assertTrue(expected.getMessage().contains("does not exist"));
}
public void testSetTokenizerTwice() throws Exception {
- try {
+ expectThrows(AlreadySetException.class, () -> {
CustomAnalyzer.builder()
.withTokenizer("whitespace")
.withTokenizer(StandardTokenizerFactory.class)
.build();
- fail();
- } catch (AlreadySetException e) {
- // pass
- }
+ });
}
public void testSetMatchVersionTwice() throws Exception {
- try {
+ expectThrows(AlreadySetException.class, () -> {
CustomAnalyzer.builder()
.withDefaultMatchVersion(Version.LATEST)
.withDefaultMatchVersion(Version.LATEST)
.withTokenizer("standard")
.build();
- fail();
- } catch (AlreadySetException e) {
- // pass
- }
+ });
}
public void testSetPosIncTwice() throws Exception {
- try {
+ expectThrows(AlreadySetException.class, () -> {
CustomAnalyzer.builder()
.withPositionIncrementGap(2)
.withPositionIncrementGap(3)
.withTokenizer("standard")
.build();
- fail();
- } catch (AlreadySetException e) {
- // pass
- }
+ });
}
public void testSetOfsGapTwice() throws Exception {
- try {
+ expectThrows(AlreadySetException.class, () -> {
CustomAnalyzer.builder()
.withOffsetGap(2)
.withOffsetGap(3)
.withTokenizer("standard")
.build();
- fail();
- } catch (AlreadySetException e) {
- // pass
- }
+ });
}
public void testNoTokenizer() throws Exception {
- try {
+ expectThrows(IllegalStateException.class, () -> {
CustomAnalyzer.builder().build();
- fail();
- } catch (IllegalStateException e) {
- assertTrue(e.getMessage().equals("You have to set at least a tokenizer."));
- }
+ });
}
public void testNullTokenizer() throws Exception {
- try {
+ expectThrows(NullPointerException.class, () -> {
CustomAnalyzer.builder()
.withTokenizer((String) null)
.build();
- fail();
- } catch (NullPointerException e) {
- // pass
- }
+ });
}
public void testNullTokenizerFactory() throws Exception {
- try {
+ expectThrows(NullPointerException.class, () -> {
CustomAnalyzer.builder()
.withTokenizer((Class<TokenizerFactory>) null)
.build();
- fail();
- } catch (NullPointerException e) {
- // pass
- }
+ });
}
public void testNullParamKey() throws Exception {
- try {
+ expectThrows(NullPointerException.class, () -> {
CustomAnalyzer.builder()
.withTokenizer("whitespace", null, "foo")
.build();
- fail();
- } catch (NullPointerException e) {
- // pass
- }
+ });
}
public void testNullMatchVersion() throws Exception {
- try {
+ expectThrows(NullPointerException.class, () -> {
CustomAnalyzer.builder()
.withDefaultMatchVersion(null)
.withTokenizer("whitespace")
.build();
- fail();
- } catch (NullPointerException e) {
- // pass
- }
+ });
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/189e985b/lucene/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechStemFilterFactory.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechStemFilterFactory.java
index 81fbfc7..10a36ae 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechStemFilterFactory.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechStemFilterFactory.java
@@ -42,11 +42,9 @@ public class TestCzechStemFilterFactory extends BaseTokenStreamFactoryTestCase {
/** Test that bogus arguments result in exception */
public void testBogusArguments() throws Exception {
- try {
+ IllegalArgumentException expected = expectThrows(IllegalArgumentException.class, () -> {
tokenFilterFactory("CzechStem", "bogusArg", "bogusValue");
- fail();
- } catch (IllegalArgumentException expected) {
- assertTrue(expected.getMessage().contains("Unknown parameters"));
- }
+ });
+ assertTrue(expected.getMessage().contains("Unknown parameters"));
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/189e985b/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanLightStemFilterFactory.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanLightStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanLightStemFilterFactory.java
index 6d52e3b..5bf6ed0 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanLightStemFilterFactory.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanLightStemFilterFactory.java
@@ -37,11 +37,9 @@ public class TestGermanLightStemFilterFactory extends BaseTokenStreamFactoryTest
/** Test that bogus arguments result in exception */
public void testBogusArguments() throws Exception {
- try {
+ IllegalArgumentException expected = expectThrows(IllegalArgumentException.class, () -> {
tokenFilterFactory("GermanLightStem", "bogusArg", "bogusValue");
- fail();
- } catch (IllegalArgumentException expected) {
- assertTrue(expected.getMessage().contains("Unknown parameters"));
- }
+ });
+ assertTrue(expected.getMessage().contains("Unknown parameters"));
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/189e985b/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanMinimalStemFilterFactory.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanMinimalStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanMinimalStemFilterFactory.java
index e571cea..5c85894 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanMinimalStemFilterFactory.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanMinimalStemFilterFactory.java
@@ -39,11 +39,9 @@ public class TestGermanMinimalStemFilterFactory extends BaseTokenStreamFactoryTe
/** Test that bogus arguments result in exception */
public void testBogusArguments() throws Exception {
- try {
+ IllegalArgumentException expected = expectThrows(IllegalArgumentException.class, () -> {
tokenFilterFactory("GermanMinimalStem", "bogusArg", "bogusValue");
- fail();
- } catch (IllegalArgumentException expected) {
- assertTrue(expected.getMessage().contains("Unknown parameters"));
- }
+ });
+ assertTrue(expected.getMessage().contains("Unknown parameters"));
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/189e985b/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanNormalizationFilterFactory.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanNormalizationFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanNormalizationFilterFactory.java
index 02effb3..fd65746 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanNormalizationFilterFactory.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanNormalizationFilterFactory.java
@@ -39,11 +39,9 @@ public class TestGermanNormalizationFilterFactory extends BaseTokenStreamFactory
/** Test that bogus arguments result in exception */
public void testBogusArguments() throws Exception {
- try {
+ IllegalArgumentException expected = expectThrows(IllegalArgumentException.class, () -> {
tokenFilterFactory("GermanNormalization", "bogusArg", "bogusValue");
- fail();
- } catch (IllegalArgumentException expected) {
- assertTrue(expected.getMessage().contains("Unknown parameters"));
- }
+ });
+ assertTrue(expected.getMessage().contains("Unknown parameters"));
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/189e985b/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanStemFilterFactory.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanStemFilterFactory.java
index 1383ec0..952283a 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanStemFilterFactory.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanStemFilterFactory.java
@@ -42,11 +42,9 @@ public class TestGermanStemFilterFactory extends BaseTokenStreamFactoryTestCase
/** Test that bogus arguments result in exception */
public void testBogusArguments() throws Exception {
- try {
+ IllegalArgumentException expected = expectThrows(IllegalArgumentException.class, () -> {
tokenFilterFactory("GermanStem", "bogusArg", "bogusValue");
- fail();
- } catch (IllegalArgumentException expected) {
- assertTrue(expected.getMessage().contains("Unknown parameters"));
- }
+ });
+ assertTrue(expected.getMessage().contains("Unknown parameters"));
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/189e985b/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/TestGreekLowerCaseFilterFactory.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/TestGreekLowerCaseFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/TestGreekLowerCaseFilterFactory.java
index 85d516d..cedc9ab 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/TestGreekLowerCaseFilterFactory.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/TestGreekLowerCaseFilterFactory.java
@@ -40,11 +40,9 @@ public class TestGreekLowerCaseFilterFactory extends BaseTokenStreamFactoryTestC
/** Test that bogus arguments result in exception */
public void testBogusArguments() throws Exception {
- try {
+ IllegalArgumentException expected = expectThrows(IllegalArgumentException.class, () -> {
tokenFilterFactory("GreekLowerCase", "bogusArg", "bogusValue");
- fail();
- } catch (IllegalArgumentException expected) {
- assertTrue(expected.getMessage().contains("Unknown parameters"));
- }
+ });
+ assertTrue(expected.getMessage().contains("Unknown parameters"));
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/189e985b/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/TestGreekStemFilterFactory.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/TestGreekStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/TestGreekStemFilterFactory.java
index 75d7c4c..13830e9 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/TestGreekStemFilterFactory.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/TestGreekStemFilterFactory.java
@@ -38,11 +38,9 @@ public class TestGreekStemFilterFactory extends BaseTokenStreamFactoryTestCase {
/** Test that bogus arguments result in exception */
public void testBogusArguments() throws Exception {
- try {
+ IllegalArgumentException expected = expectThrows(IllegalArgumentException.class, () -> {
tokenFilterFactory("GreekStem", "bogusArg", "bogusValue");
- fail();
- } catch (IllegalArgumentException expected) {
- assertTrue(expected.getMessage().contains("Unknown parameters"));
- }
+ });
+ assertTrue(expected.getMessage().contains("Unknown parameters"));
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/189e985b/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestEnglishMinimalStemFilterFactory.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestEnglishMinimalStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestEnglishMinimalStemFilterFactory.java
index 547a127..e3dc81d 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestEnglishMinimalStemFilterFactory.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestEnglishMinimalStemFilterFactory.java
@@ -37,11 +37,9 @@ public class TestEnglishMinimalStemFilterFactory extends BaseTokenStreamFactoryT
/** Test that bogus arguments result in exception */
public void testBogusArguments() throws Exception {
- try {
+ IllegalArgumentException expected = expectThrows(IllegalArgumentException.class, () -> {
tokenFilterFactory("EnglishMinimalStem", "bogusArg", "bogusValue");
- fail();
- } catch (IllegalArgumentException expected) {
- assertTrue(expected.getMessage().contains("Unknown parameters"));
- }
+ });
+ assertTrue(expected.getMessage().contains("Unknown parameters"));
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/189e985b/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestKStemFilterFactory.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestKStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestKStemFilterFactory.java
index acefd6c..79fa7cf 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestKStemFilterFactory.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestKStemFilterFactory.java
@@ -37,11 +37,9 @@ public class TestKStemFilterFactory extends BaseTokenStreamFactoryTestCase {
/** Test that bogus arguments result in exception */
public void testBogusArguments() throws Exception {
- try {
+ IllegalArgumentException expected = expectThrows(IllegalArgumentException.class, () -> {
tokenFilterFactory("KStem", "bogusArg", "bogusValue");
- fail();
- } catch (IllegalArgumentException expected) {
- assertTrue(expected.getMessage().contains("Unknown parameters"));
- }
+ });
+ assertTrue(expected.getMessage().contains("Unknown parameters"));
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/189e985b/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestPorterStemFilterFactory.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestPorterStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestPorterStemFilterFactory.java
index dabb39c..a7739b2 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestPorterStemFilterFactory.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestPorterStemFilterFactory.java
@@ -40,11 +40,9 @@ public class TestPorterStemFilterFactory extends BaseTokenStreamFactoryTestCase
/** Test that bogus arguments result in exception */
public void testBogusArguments() throws Exception {
- try {
+ IllegalArgumentException expected = expectThrows(IllegalArgumentException.class, () -> {
tokenFilterFactory("PorterStem", "bogusArg", "bogusValue");
- fail();
- } catch (IllegalArgumentException expected) {
- assertTrue(expected.getMessage().contains("Unknown parameters"));
- }
+ });
+ assertTrue(expected.getMessage().contains("Unknown parameters"));
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/189e985b/lucene/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishLightStemFilterFactory.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishLightStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishLightStemFilterFactory.java
index f75b5b0..1e038e2 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishLightStemFilterFactory.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishLightStemFilterFactory.java
@@ -39,11 +39,9 @@ public class TestSpanishLightStemFilterFactory extends BaseTokenStreamFactoryTes
/** Test that bogus arguments result in exception */
public void testBogusArguments() throws Exception {
- try {
+ IllegalArgumentException expected = expectThrows(IllegalArgumentException.class, () -> {
tokenFilterFactory("SpanishLightStem", "bogusArg", "bogusValue");
- fail();
- } catch (IllegalArgumentException expected) {
- assertTrue(expected.getMessage().contains("Unknown parameters"));
- }
+ });
+ assertTrue(expected.getMessage().contains("Unknown parameters"));
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/189e985b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianNormalizationFilterFactory.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianNormalizationFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianNormalizationFilterFactory.java
index 0479c00..5bffb71 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianNormalizationFilterFactory.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianNormalizationFilterFactory.java
@@ -40,11 +40,9 @@ public class TestPersianNormalizationFilterFactory extends BaseTokenStreamFactor
/** Test that bogus arguments result in exception */
public void testBogusArguments() throws Exception {
- try {
+ IllegalArgumentException expected = expectThrows(IllegalArgumentException.class, () -> {
tokenFilterFactory("PersianNormalization", "bogusArg", "bogusValue");
- fail();
- } catch (IllegalArgumentException expected) {
- assertTrue(expected.getMessage().contains("Unknown parameters"));
- }
+ });
+ assertTrue(expected.getMessage().contains("Unknown parameters"));
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/189e985b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fi/TestFinnishLightStemFilterFactory.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/fi/TestFinnishLightStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fi/TestFinnishLightStemFilterFactory.java
index 852e35b..a433c95 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/fi/TestFinnishLightStemFilterFactory.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fi/TestFinnishLightStemFilterFactory.java
@@ -39,11 +39,9 @@ public class TestFinnishLightStemFilterFactory extends BaseTokenStreamFactoryTes
/** Test that bogus arguments result in exception */
public void testBogusArguments() throws Exception {
- try {
+ IllegalArgumentException expected = expectThrows(IllegalArgumentException.class, () -> {
tokenFilterFactory("FinnishLightStem", "bogusArg", "bogusValue");
- fail();
- } catch (IllegalArgumentException expected) {
- assertTrue(expected.getMessage().contains("Unknown parameters"));
- }
+ });
+ assertTrue(expected.getMessage().contains("Unknown parameters"));
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/189e985b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchLightStemFilterFactory.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchLightStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchLightStemFilterFactory.java
index cb57376..15a2b96 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchLightStemFilterFactory.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchLightStemFilterFactory.java
@@ -37,11 +37,9 @@ public class TestFrenchLightStemFilterFactory extends BaseTokenStreamFactoryTest
/** Test that bogus arguments result in exception */
public void testBogusArguments() throws Exception {
- try {
+ IllegalArgumentException expected = expectThrows(IllegalArgumentException.class, () -> {
tokenFilterFactory("FrenchLightStem", "bogusArg", "bogusValue");
- fail();
- } catch (IllegalArgumentException expected) {
- assertTrue(expected.getMessage().contains("Unknown parameters"));
- }
+ });
+ assertTrue(expected.getMessage().contains("Unknown parameters"));
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/189e985b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchMinimalStemFilterFactory.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchMinimalStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchMinimalStemFilterFactory.java
index d5790b6..6cd399b 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchMinimalStemFilterFactory.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchMinimalStemFilterFactory.java
@@ -37,11 +37,9 @@ public class TestFrenchMinimalStemFilterFactory extends BaseTokenStreamFactoryTe
/** Test that bogus arguments result in exception */
public void testBogusArguments() throws Exception {
- try {
+ IllegalArgumentException expected = expectThrows(IllegalArgumentException.class, () -> {
tokenFilterFactory("FrenchMinimalStem", "bogusArg", "bogusValue");
- fail();
- } catch (IllegalArgumentException expected) {
- assertTrue(expected.getMessage().contains("Unknown parameters"));
- }
+ });
+ assertTrue(expected.getMessage().contains("Unknown parameters"));
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/189e985b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ga/TestIrishLowerCaseFilterFactory.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ga/TestIrishLowerCaseFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ga/TestIrishLowerCaseFilterFactory.java
index d5d96bf..2014936 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ga/TestIrishLowerCaseFilterFactory.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ga/TestIrishLowerCaseFilterFactory.java
@@ -37,11 +37,9 @@ public class TestIrishLowerCaseFilterFactory extends BaseTokenStreamFactoryTestC
/** Test that bogus arguments result in exception */
public void testBogusArguments() throws Exception {
- try {
+ IllegalArgumentException expected = expectThrows(IllegalArgumentException.class, () -> {
tokenFilterFactory("IrishLowerCase", "bogusArg", "bogusValue");
- fail();
- } catch (IllegalArgumentException expected) {
- assertTrue(expected.getMessage().contains("Unknown parameters"));
- }
+ });
+ assertTrue(expected.getMessage().contains("Unknown parameters"));
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/189e985b/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianMinimalStemFilterFactory.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianMinimalStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianMinimalStemFilterFactory.java
index 4fb75bd..ddc60f0 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianMinimalStemFilterFactory.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianMinimalStemFilterFactory.java
@@ -37,11 +37,9 @@ public class TestGalicianMinimalStemFilterFactory extends BaseTokenStreamFactory
/** Test that bogus arguments result in exception */
public void testBogusArguments() throws Exception {
- try {
+ IllegalArgumentException expected = expectThrows(IllegalArgumentException.class, () -> {
tokenFilterFactory("GalicianMinimalStem", "bogusArg", "bogusValue");
- fail();
- } catch (IllegalArgumentException expected) {
- assertTrue(expected.getMessage().contains("Unknown parameters"));
- }
+ });
+ assertTrue(expected.getMessage().contains("Unknown parameters"));
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/189e985b/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianStemFilterFactory.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianStemFilterFactory.java
index ef3242e..e02fc5c 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianStemFilterFactory.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianStemFilterFactory.java
@@ -37,11 +37,9 @@ public class TestGalicianStemFilterFactory extends BaseTokenStreamFactoryTestCas
/** Test that bogus arguments result in exception */
public void testBogusArguments() throws Exception {
- try {
+ IllegalArgumentException expected = expectThrows(IllegalArgumentException.class, () -> {
tokenFilterFactory("GalicianStem", "bogusArg", "bogusValue");
- fail();
- } catch (IllegalArgumentException expected) {
- assertTrue(expected.getMessage().contains("Unknown parameters"));
- }
+ });
+ assertTrue(expected.getMessage().contains("Unknown parameters"));
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/189e985b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiFilters.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiFilters.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiFilters.java
index bdf4087..8caf700 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiFilters.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiFilters.java
@@ -64,25 +64,19 @@ public class TestHindiFilters extends BaseTokenStreamFactoryTestCase {
/** Test that bogus arguments result in exception */
public void testBogusArguments() throws Exception {
- try {
+ IllegalArgumentException expected = expectThrows(IllegalArgumentException.class, () -> {
tokenFilterFactory("IndicNormalization", "bogusArg", "bogusValue");
- fail();
- } catch (IllegalArgumentException expected) {
- assertTrue(expected.getMessage().contains("Unknown parameters"));
- }
+ });
+ assertTrue(expected.getMessage().contains("Unknown parameters"));
- try {
+ expected = expectThrows(IllegalArgumentException.class, () -> {
tokenFilterFactory("HindiNormalization", "bogusArg", "bogusValue");
- fail();
- } catch (IllegalArgumentException expected) {
- assertTrue(expected.getMessage().contains("Unknown parameters"));
- }
+ });
+ assertTrue(expected.getMessage().contains("Unknown parameters"));
- try {
+ expected = expectThrows(IllegalArgumentException.class, () -> {
tokenFilterFactory("HindiStem", "bogusArg", "bogusValue");
- fail();
- } catch (IllegalArgumentException expected) {
- assertTrue(expected.getMessage().contains("Unknown parameters"));
- }
+ });
+ assertTrue(expected.getMessage().contains("Unknown parameters"));
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/189e985b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianLightStemFilterFactory.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianLightStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianLightStemFilterFactory.java
index 53a1832..b595067 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianLightStemFilterFactory.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianLightStemFilterFactory.java
@@ -37,11 +37,9 @@ public class TestHungarianLightStemFilterFactory extends BaseTokenStreamFactoryT
/** Test that bogus arguments result in exception */
public void testBogusArguments() throws Exception {
- try {
+ IllegalArgumentException expected = expectThrows(IllegalArgumentException.class, () -> {
tokenFilterFactory("HungarianLightStem", "bogusArg", "bogusValue");
- fail();
- } catch (IllegalArgumentException expected) {
- assertTrue(expected.getMessage().contains("Unknown parameters"));
- }
+ });
+ assertTrue(expected.getMessage().contains("Unknown parameters"));
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/189e985b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestDictionary.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestDictionary.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestDictionary.java
index 455a111..4f04407 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestDictionary.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestDictionary.java
@@ -131,13 +131,11 @@ public class TestDictionary extends LuceneTestCase {
InputStream dictStream = getClass().getResourceAsStream("simple.dic");
Directory tempDir = getDirectory();
- try {
+ ParseException expected = expectThrows(ParseException.class, () -> {
new Dictionary(tempDir, "dictionary", affixStream, dictStream);
- fail("didn't get expected exception");
- } catch (ParseException expected) {
- assertTrue(expected.getMessage().startsWith("The affix file contains a rule with less than four elements"));
- assertEquals(24, expected.getErrorOffset());
- }
+ });
+ assertTrue(expected.getMessage().startsWith("The affix file contains a rule with less than four elements"));
+ assertEquals(24, expected.getErrorOffset());
affixStream.close();
dictStream.close();
@@ -150,12 +148,10 @@ public class TestDictionary extends LuceneTestCase {
InputStream dictStream = getClass().getResourceAsStream("simple.dic");
Directory tempDir = getDirectory();
- try {
+ Exception expected = expectThrows(Exception.class, () -> {
new Dictionary(tempDir, "dictionary", affixStream, dictStream);
- fail("didn't get expected exception");
- } catch (Exception expected) {
- assertTrue(expected.getMessage().startsWith("expected only one flag"));
- }
+ });
+ assertTrue(expected.getMessage().startsWith("expected only one flag"));
affixStream.close();
dictStream.close();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/189e985b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestHunspellStemFilterFactory.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestHunspellStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestHunspellStemFilterFactory.java
index 77a5d34..7c44552 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestHunspellStemFilterFactory.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestHunspellStemFilterFactory.java
@@ -38,13 +38,11 @@ public class TestHunspellStemFilterFactory extends BaseTokenStreamFactoryTestCas
/** Test that bogus arguments result in exception */
public void testBogusArguments() throws Exception {
- try {
+ IllegalArgumentException expected = expectThrows(IllegalArgumentException.class, () -> {
tokenFilterFactory("HunspellStem",
"dictionary", "simple.dic",
"bogusArg", "bogusValue");
- fail();
- } catch (IllegalArgumentException expected) {
- assertTrue(expected.getMessage().contains("Unknown parameters"));
- }
+ });
+ assertTrue(expected.getMessage().contains("Unknown parameters"));
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/189e985b/lucene/analysis/common/src/test/org/apache/lucene/analysis/id/TestIndonesianStemFilterFactory.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/id/TestIndonesianStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/id/TestIndonesianStemFilterFactory.java
index 5b5c11c..ad382ec 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/id/TestIndonesianStemFilterFactory.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/id/TestIndonesianStemFilterFactory.java
@@ -53,11 +53,9 @@ public class TestIndonesianStemFilterFactory extends BaseTokenStreamFactoryTestC
/** Test that bogus arguments result in exception */
public void testBogusArguments() throws Exception {
- try {
+ IllegalArgumentException expected = expectThrows(IllegalArgumentException.class, () -> {
tokenFilterFactory("IndonesianStem", "bogusArg", "bogusValue");
- fail();
- } catch (IllegalArgumentException expected) {
- assertTrue(expected.getMessage().contains("Unknown parameters"));
- }
+ });
+ assertTrue(expected.getMessage().contains("Unknown parameters"));
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/189e985b/lucene/analysis/common/src/test/org/apache/lucene/analysis/it/TestItalianLightStemFilterFactory.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/it/TestItalianLightStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/it/TestItalianLightStemFilterFactory.java
index c809f61..a9d763f 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/it/TestItalianLightStemFilterFactory.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/it/TestItalianLightStemFilterFactory.java
@@ -37,11 +37,9 @@ public class TestItalianLightStemFilterFactory extends BaseTokenStreamFactoryTes
/** Test that bogus arguments result in exception */
public void testBogusArguments() throws Exception {
- try {
+ IllegalArgumentException expected = expectThrows(IllegalArgumentException.class, () -> {
tokenFilterFactory("ItalianLightStem", "bogusArg", "bogusValue");
- fail();
- } catch (IllegalArgumentException expected) {
- assertTrue(expected.getMessage().contains("Unknown parameters"));
- }
+ });
+ assertTrue(expected.getMessage().contains("Unknown parameters"));
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/189e985b/lucene/analysis/common/src/test/org/apache/lucene/analysis/lv/TestLatvianStemFilterFactory.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/lv/TestLatvianStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/lv/TestLatvianStemFilterFactory.java
index fd0220d..8ccdbaf 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/lv/TestLatvianStemFilterFactory.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/lv/TestLatvianStemFilterFactory.java
@@ -39,11 +39,9 @@ public class TestLatvianStemFilterFactory extends BaseTokenStreamFactoryTestCase
/** Test that bogus arguments result in exception */
public void testBogusArguments() throws Exception {
- try {
+ IllegalArgumentException expected = expectThrows(IllegalArgumentException.class, () -> {
tokenFilterFactory("LatvianStem", "bogusArg", "bogusValue");
- fail();
- } catch (IllegalArgumentException expected) {
- assertTrue(expected.getMessage().contains("Unknown parameters"));
- }
+ });
+ assertTrue(expected.getMessage().contains("Unknown parameters"));
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/189e985b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/DateRecognizerFilterFactoryTest.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/DateRecognizerFilterFactoryTest.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/DateRecognizerFilterFactoryTest.java
index 8d15e18..739f78f 100755
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/DateRecognizerFilterFactoryTest.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/DateRecognizerFilterFactoryTest.java
@@ -24,14 +24,11 @@ import org.apache.lucene.analysis.BaseTokenStreamTestCase;
public class DateRecognizerFilterFactoryTest extends BaseTokenStreamTestCase {
public void testBadLanguageTagThrowsException() {
- try {
+ expectThrows(Exception.class, () -> {
final Map<String,String> args = new HashMap<>();
args.put(DateRecognizerFilterFactory.LOCALE, "en_US");
new DateRecognizerFilterFactory(args);
- fail("Bad language tag should have thrown an exception");
- } catch (Exception e) {
- // expected;
- }
+ });
}
public void testGoodLocaleParsesWell() {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/189e985b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestCapitalizationFilterFactory.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestCapitalizationFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestCapitalizationFilterFactory.java
index 3581c08..1a4f726 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestCapitalizationFilterFactory.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestCapitalizationFilterFactory.java
@@ -264,12 +264,10 @@ public class TestCapitalizationFilterFactory extends BaseTokenStreamFactoryTestC
/** Test that bogus arguments result in exception */
public void testBogusArguments() throws Exception {
- try {
+ IllegalArgumentException expected = expectThrows(IllegalArgumentException.class, () -> {
tokenFilterFactory("Capitalization", "bogusArg", "bogusValue");
- fail();
- } catch (IllegalArgumentException expected) {
- assertTrue(expected.getMessage().contains("Unknown parameters"));
- }
+ });
+ assertTrue(expected.getMessage().contains("Unknown parameters"));
}
/**
@@ -277,7 +275,7 @@ public class TestCapitalizationFilterFactory extends BaseTokenStreamFactoryTestC
*/
public void testInvalidArguments() throws Exception {
for (final String arg : new String[]{"minWordLength", "maxTokenLength", "maxWordCount"}) {
- try {
+ IllegalArgumentException expected = expectThrows(IllegalArgumentException.class, () -> {
Reader reader = new StringReader("foo foobar super-duper-trooper");
TokenStream stream = whitespaceMockTokenizer(reader);
@@ -287,11 +285,9 @@ public class TestCapitalizationFilterFactory extends BaseTokenStreamFactoryTestC
arg, "-3",
"okPrefix", "McK",
"forceFirstLetter", "true").create(stream);
- fail();
- } catch (IllegalArgumentException expected) {
- assertTrue(expected.getMessage().contains(arg + " must be greater than or equal to zero")
- || expected.getMessage().contains(arg + " must be greater than zero"));
- }
+ });
+ assertTrue(expected.getMessage().contains(arg + " must be greater than or equal to zero") ||
+ expected.getMessage().contains(arg + " must be greater than zero"));
}
}
}