You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucenenet.apache.org by ni...@apache.org on 2020/07/15 02:29:56 UTC
[lucenenet] branch master updated (081edee -> e17221f)
This is an automated email from the ASF dual-hosted git repository.
nightowl888 pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/lucenenet.git.
from 081edee Removed NuGet.config file
new f297f00 Removed miscellaneous .NET Core 1.x/.NET Standard 1.x support from projects that were previously missed
new d79d273 Removed unused dependencies for .NET Framework
new bbb2b32 Fixed up Microsoft.Extension.Configuration references
new 2bd7ab6 Lucene.Net.Codecs.SimpleText: Using decimal is 30% faster than using BigInteger for add and subtract
new 18dfe36 Lucene.Net.TestFramework.Util.LuceneTestCase: Completed implementation of Nightly, Weekly, AwaitsFix, and Slow attributes.
new f8256b5 Applied the Slow and Nightly attributes to all tests that they apply to
new e017bda azure-pipelines.yml: Removed NuGet caching, as it doesn't account for when dependencies change
new b78efb0 azure-pipelines.yml: Cleaned up unused variable PublishedArtifactZipFileName
new cee19c3 Added NuGet.config to work around build pipeline caching issues
new 3cda476 LICENSE.txt, NOTICE.txt: Updated copyright info
new fc22230 azure-pipelines.yml: Added build features for the test framework's system properties
new 03aa984 Lucene.Net.TestFramework: Added logging of system properties so we can see how they are configured in CI
new 61c31185 publish-test-results.yml: View files in test environment after artifacts are downloaded
new e17221f BREAKING: Lucene.Net.TestFramework: Refactored LuceneTestCase to correctly load static system properties after the LuceneTestFrameworkIntializer sets the configuration factory. Renamed most public static fields and made them into static properties.
The 14 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
LICENSE.txt | 2 +-
Lucene.Net.sln | 1 +
NOTICE.txt | 2 +-
.../site/lucenetemplate/web.config => NuGet.config | 13 +-
azure-pipelines.yml | 113 +++---
build/Dependencies.props | 14 +-
build/azure-templates/publish-test-binaries.yml | 38 ++
build/azure-templates/publish-test-results.yml | 2 +-
build/azure-templates/run-tests-on-os.yml | 2 -
.../Lucene.Net.Analysis.Common.csproj | 2 -
.../Lucene.Net.Analysis.Kuromoji.csproj | 5 -
.../Lucene.Net.Analysis.Morfologik.csproj | 5 -
.../Lucene.Net.Analysis.OpenNLP.csproj | 7 +-
.../Lucene.Net.Analysis.Phonetic.csproj | 5 -
.../Lucene.Net.Analysis.SmartCn.csproj | 5 -
.../Lucene.Net.Analysis.Stempel.csproj | 5 -
.../Lucene.Net.Benchmark.csproj | 11 -
.../Lucene.Net.Classification.csproj | 5 -
src/Lucene.Net.Codecs/Lucene.Net.Codecs.csproj | 6 -
.../SimpleText/SimpleTextDocValuesReader.cs | 17 +-
.../SimpleText/SimpleTextDocValuesWriter.cs | 15 +-
src/Lucene.Net.Demo/Lucene.Net.Demo.csproj | 5 -
.../Lucene.Net.Expressions.csproj | 5 -
src/Lucene.Net.Facet/Lucene.Net.Facet.csproj | 5 -
src/Lucene.Net.Grouping/Lucene.Net.Grouping.csproj | 5 -
.../Lucene.Net.Highlighter.csproj | 5 -
src/Lucene.Net.Join/Lucene.Net.Join.csproj | 5 -
src/Lucene.Net.Memory/Lucene.Net.Memory.csproj | 5 -
src/Lucene.Net.Misc/Lucene.Net.Misc.csproj | 5 -
src/Lucene.Net.Queries/Lucene.Net.Queries.csproj | 5 -
.../Lucene.Net.QueryParser.csproj | 2 -
.../Lucene.Net.Replicator.csproj | 2 -
src/Lucene.Net.Sandbox/Lucene.Net.Sandbox.csproj | 5 -
src/Lucene.Net.Spatial/Lucene.Net.Spatial.csproj | 5 -
src/Lucene.Net.Suggest/Lucene.Net.Suggest.csproj | 5 -
.../Analysis/BaseTokenStreamTestCase.cs | 12 +-
.../Analysis/MockAnalyzer.cs | 2 +-
.../Codecs/Lucene3x/PreFlexRWPostingsFormat.cs | 2 +-
.../Codecs/Lucene3x/PreFlexRWTermVectorsFormat.cs | 2 +-
.../Codecs/MockRandom/MockRandomPostingsFormat.cs | 40 +-
.../Index/BasePostingsFormatTestCase.cs | 76 ++--
.../Index/BaseStoredFieldsFormatTestCase.cs | 13 +-
.../Index/RandomIndexWriter.cs | 12 +-
.../Index/ThreadedIndexingAndSearchingTestCase.cs | 54 +--
.../Lucene.Net.TestFramework.csproj | 15 +-
.../Search/ShardSearchingTestBase.cs | 4 +-
.../Store/MockDirectoryWrapper.cs | 22 +-
.../Support/Attributes/LongRunningTestAttribute.cs | 40 --
.../Configuration/ConfigurationSettingTestCase.cs | 48 ++-
src/Lucene.Net.TestFramework/Util/Fst/FSTTester.cs | 68 ++--
src/Lucene.Net.TestFramework/Util/LineFileDocs.cs | 10 +-
.../Util/LuceneTestCase.cs | 405 +++++++++++++++------
.../Util/TestRuleSetupAndRestoreClassEnv.cs | 70 ++--
src/Lucene.Net.TestFramework/Util/TestUtil.cs | 8 +-
.../Analysis/Ar/TestArabicAnalyzer.cs | 2 +-
.../Analysis/Bg/TestBulgarianAnalyzer.cs | 2 +-
.../Analysis/Br/TestBrazilianStemmer.cs | 2 +-
.../Analysis/Ca/TestCatalanAnalyzer.cs | 2 +-
.../CharFilters/HTMLStripCharFilterTest.cs | 4 +-
.../Analysis/CharFilters/TestMappingCharFilter.cs | 16 +-
.../Analysis/Cjk/TestCJKAnalyzer.cs | 4 +-
.../Analysis/Cjk/TestCJKBigramFilter.cs | 4 +-
.../Analysis/Cjk/TestCJKTokenizer.cs | 2 +-
.../Analysis/Cjk/TestCJKWidthFilter.cs | 2 +-
.../Analysis/Ckb/TestSoraniAnalyzer.cs | 2 +-
.../Analysis/Cn/TestChineseTokenizer.cs | 2 +-
.../Analysis/Commongrams/CommonGramsFilterTest.cs | 4 +-
.../Compound/TestCompoundWordTokenFilter.cs | 4 +-
.../Analysis/Core/TestAnalyzers.cs | 16 +-
.../Analysis/Core/TestBugInSomething.cs | 4 +-
.../Analysis/Core/TestClassicAnalyzer.cs | 4 +-
.../Analysis/Core/TestFactories.cs | 4 +-
.../Analysis/Core/TestKeywordAnalyzer.cs | 2 +-
.../Analysis/Core/TestRandomChains.cs | 23 +-
.../Analysis/Core/TestStandardAnalyzer.cs | 6 +-
.../Analysis/Core/TestStopFilter.cs | 2 +-
.../Analysis/Core/TestTypeTokenFilter.cs | 2 +-
.../Analysis/Core/TestUAX29URLEmailAnalyzer.cs | 2 +-
.../Analysis/Core/TestUAX29URLEmailTokenizer.cs | 4 +-
.../Analysis/Cz/TestCzechAnalyzer.cs | 2 +-
.../Analysis/Da/TestDanishAnalyzer.cs | 2 +-
.../Analysis/De/TestGermanAnalyzer.cs | 2 +-
.../Analysis/De/TestGermanLightStemFilter.cs | 2 +-
.../Analysis/De/TestGermanMinimalStemFilter.cs | 2 +-
.../Analysis/De/TestGermanNormalizationFilter.cs | 2 +-
.../Analysis/De/TestGermanStemFilter.cs | 2 +-
.../Analysis/El/GreekAnalyzerTest.cs | 2 +-
.../Analysis/En/TestEnglishAnalyzer.cs | 2 +-
.../Analysis/En/TestEnglishMinimalStemFilter.cs | 2 +-
.../Analysis/En/TestKStemmer.cs | 2 +-
.../Analysis/En/TestPorterStemFilter.cs | 2 +-
.../Analysis/Es/TestSpanishAnalyzer.cs | 2 +-
.../Analysis/Es/TestSpanishLightStemFilter.cs | 2 +-
.../Analysis/Eu/TestBasqueAnalyzer.cs | 2 +-
.../Analysis/Fa/TestPersianAnalyzer.cs | 2 +-
.../Analysis/Fa/TestPersianCharFilter.cs | 2 +-
.../Analysis/Fi/TestFinnishAnalyzer.cs | 2 +-
.../Analysis/Fi/TestFinnishLightStemFilter.cs | 2 +-
.../Analysis/Fr/TestFrenchAnalyzer.cs | 2 +-
.../Analysis/Fr/TestFrenchLightStemFilter.cs | 2 +-
.../Analysis/Fr/TestFrenchMinimalStemFilter.cs | 2 +-
.../Analysis/Ga/TestIrishAnalyzer.cs | 2 +-
.../Analysis/Gl/TestGalicianAnalyzer.cs | 2 +-
.../Analysis/Gl/TestGalicianMinimalStemFilter.cs | 2 +-
.../Analysis/Hi/TestHindiAnalyzer.cs | 2 +-
.../Analysis/Hu/TestHungarianAnalyzer.cs | 2 +-
.../Analysis/Hunspell/TestHunspellStemFilter.cs | 2 +-
.../Analysis/Hy/TestArmenianAnalyzer.cs | 2 +-
.../Analysis/Id/TestIndonesianAnalyzer.cs | 2 +-
.../Analysis/It/TestItalianAnalyzer.cs | 2 +-
.../Analysis/It/TestItalianLightStemFilter.cs | 2 +-
.../Analysis/Lv/TestLatvianAnalyzer.cs | 2 +-
.../Analysis/Miscellaneous/PatternAnalyzerTest.cs | 2 +-
.../Miscellaneous/TestASCIIFoldingFilter.cs | 2 +-
.../Miscellaneous/TestCapitalizationFilter.cs | 2 +-
.../Miscellaneous/TestHyphenatedWordsFilter.cs | 2 +-
.../Analysis/Miscellaneous/TestKeepWordFilter.cs | 2 +-
.../TestRemoveDuplicatesTokenFilter.cs | 4 +-
.../Miscellaneous/TestScandinavianFoldingFilter.cs | 2 +-
.../TestScandinavianNormalizationFilter.cs | 2 +-
.../Analysis/Miscellaneous/TestTrimFilter.cs | 4 +-
.../Miscellaneous/TestWordDelimiterFilter.cs | 8 +-
.../Analysis/NGram/EdgeNGramTokenFilterTest.cs | 7 +-
.../Analysis/NGram/EdgeNGramTokenizerTest.cs | 14 +-
.../Analysis/NGram/NGramTokenFilterTest.cs | 5 +-
.../Analysis/NGram/NGramTokenizerTest.cs | 11 +-
.../Analysis/Nl/TestDutchStemmer.cs | 2 +-
.../Analysis/No/TestNorwegianAnalyzer.cs | 2 +-
.../Analysis/No/TestNorwegianLightStemFilter.cs | 2 +-
.../Analysis/No/TestNorwegianMinimalStemFilter.cs | 2 +-
.../Analysis/Path/TestPathHierarchyTokenizer.cs | 4 +-
.../Path/TestReversePathHierarchyTokenizer.cs | 4 +-
.../Pattern/TestPatternCaptureGroupTokenFilter.cs | 2 +-
.../Pattern/TestPatternReplaceCharFilter.cs | 8 +-
.../Analysis/Pattern/TestPatternReplaceFilter.cs | 4 +-
.../Analysis/Pattern/TestPatternTokenizer.cs | 4 +-
.../Analysis/Pt/TestPortugueseAnalyzer.cs | 2 +-
.../Analysis/Pt/TestPortugueseLightStemFilter.cs | 2 +-
.../Analysis/Pt/TestPortugueseMinimalStemFilter.cs | 2 +-
.../Analysis/Pt/TestPortugueseStemFilter.cs | 2 +-
.../Analysis/Reverse/TestReverseStringFilter.cs | 2 +-
.../Analysis/Ro/TestRomanianAnalyzer.cs | 2 +-
.../Analysis/Ru/TestRussianAnalyzer.cs | 2 +-
.../Analysis/Ru/TestRussianLightStemFilter.cs | 2 +-
.../Analysis/Shingle/ShingleFilterTest.cs | 7 +-
.../Analysis/Snowball/TestSnowball.cs | 5 +-
.../Analysis/Snowball/TestSnowballVocab.cs | 6 +-
.../Analysis/Sv/TestSwedishAnalyzer.cs | 2 +-
.../Analysis/Sv/TestSwedishLightStemFilter.cs | 2 +-
.../Analysis/Synonym/TestSynonymMapFilter.cs | 20 +-
.../Analysis/Th/TestThaiAnalyzer.cs | 4 +-
.../Analysis/Tr/TestTurkishAnalyzer.cs | 2 +-
.../Analysis/Util/TestCharArrayMap.cs | 2 +-
.../Analysis/Util/TestCharTokenizers.cs | 6 +-
.../Analysis/Util/TestRollingCharBuffer.cs | 20 +-
.../Analysis/Util/TestSegmentingTokenizerBase.cs | 4 +-
.../Analysis/Wikipedia/WikipediaTokenizerTest.cs | 4 +-
.../Analysis/Icu/Segmentation/TestICUTokenizer.cs | 6 +-
.../Icu/Segmentation/TestICUTokenizerCJK.cs | 4 +-
.../Analysis/Icu/TestICUFoldingFilter.cs | 2 +-
.../Analysis/Icu/TestICUNormalizer2CharFilter.cs | 29 +-
.../Analysis/Icu/TestICUNormalizer2Filter.cs | 2 +-
.../Analysis/Icu/TestICUTransformFilter.cs | 2 +-
.../Collation/TestICUCollationKeyAnalyzer.cs | 2 +-
.../Dict/TestTokenInfoDictionary.cs | 2 +-
.../TestExtendedMode.cs | 5 +-
.../TestJapaneseAnalyzer.cs | 3 +-
.../TestJapaneseIterationMarkCharFilter.cs | 4 +-
.../TestJapaneseKatakanaStemFilter.cs | 2 +-
.../TestJapaneseReadingFormFilter.cs | 4 +-
.../TestJapaneseTokenizer.cs | 27 +-
.../TestSearchMode.cs | 2 +-
.../Morfologik/TestMorfologikAnalyzer.cs | 2 +-
.../Uk/TestUkrainianAnalyzer.cs | 2 +-
.../DoubleMetaphoneFilterTest.cs | 4 +-
.../Language/Bm/CacheSubSequencePerformanceTest.cs | 8 +-
.../Language/Bm/PhoneticEnginePerformanceTest.cs | 9 +-
.../TestBeiderMorseFilter.cs | 2 +-
.../TestPhoneticFilter.cs | 8 +-
.../TestSmartChineseAnalyzer.cs | 8 +-
.../Pl/TestPolishAnalyzer.cs | 2 +-
.../BenchmarkTestCase.cs | 2 +-
.../ByTask/TestPerfTasksLogic.cs | 3 +-
.../Quality/TestQualityRun.cs | 4 +-
.../Pulsing/Test10KPulsings.cs | 4 +-
.../SimpleText/TestSimpleTextPostingsFormat.cs | 1 +
src/Lucene.Net.Tests.Facet/FacetTestCase.cs | 2 +-
.../Range/TestRangeFacetCounts.cs | 26 +-
.../SortedSet/TestSortedSetDocValuesFacets.cs | 2 +-
.../Taxonomy/Directory/TestAddTaxonomy.cs | 1 +
.../Directory/TestConcurrentFacetedIndexing.cs | 2 +-
.../Directory/TestDirectoryTaxonomyWriter.cs | 5 +-
.../Taxonomy/TestSearcherTaxonomyManager.cs | 23 +-
.../Taxonomy/TestTaxonomyCombined.cs | 4 +-
.../Taxonomy/TestTaxonomyFacetCounts.cs | 2 +-
.../Taxonomy/TestTaxonomyFacetSumValueSource.cs | 4 +-
.../Taxonomy/WriterCache/TestCharBlockArray.cs | 6 +-
.../WriterCache/TestCompactLabelToOrdinal.cs | 8 +-
src/Lucene.Net.Tests.Facet/TestDrillSideways.cs | 46 +--
.../AllGroupHeadsCollectorTest.cs | 18 +-
.../AllGroupsCollectorTest.cs | 2 +-
.../DistinctValuesCollectorTest.cs | 6 +-
.../GroupFacetCollectorTest.cs | 16 +-
src/Lucene.Net.Tests.Grouping/TestGrouping.cs | 52 +--
.../Highlight/Custom/HighlightCustomQueryTest.cs | 4 +-
.../Highlight/HighlighterTest.cs | 62 ++--
.../TestPostingsHighlighterRanking.cs | 1 +
.../VectorHighlight/SimpleFragListBuilderTest.cs | 2 +-
.../VectorHighlight/SimpleFragmentsBuilderTest.cs | 4 +-
src/Lucene.Net.Tests.Join/TestBlockJoin.cs | 30 +-
src/Lucene.Net.Tests.Join/TestJoinUtil.cs | 26 +-
.../Index/Memory/MemoryIndexTest.cs | 11 +-
.../Index/Sorter/IndexSortingTest.cs | 2 +-
.../Index/Sorter/SorterTestBase.cs | 4 +-
.../Index/Sorter/SortingAtomicReaderTest.cs | 4 +-
src/Lucene.Net.Tests.Misc/Util/Fst/TestFSTsMisc.cs | 6 +-
.../Function/FunctionTestSetup.cs | 8 +-
.../Spans/TestSpanQueryParserSimpleSample.cs | 4 +-
.../Flexible/Standard/TestNumericQueryParser.cs | 8 +-
.../Flexible/Standard/TestQPHelper.cs | 2 +-
.../Util/QueryParserTestBase.cs | 2 +-
src/Lucene.Net.Tests.QueryParser/Xml/TestParser.cs | 6 +-
.../IndexAndTaxonomyReplicationClientTest.cs | 5 +-
.../IndexReplicationClientTest.cs | 6 +-
.../Queries/TestSlowFuzzyQuery2.cs | 4 +-
.../Spell/TestWordBreakSpellChecker.cs | 4 +-
.../Analyzing/AnalyzingInfixSuggesterTest.cs | 20 +-
.../Suggest/Analyzing/AnalyzingSuggesterTest.cs | 12 +-
.../Suggest/Analyzing/FuzzySuggesterTest.cs | 26 +-
.../Suggest/Analyzing/TestFreeTextSuggester.cs | 42 +--
.../Analysis/TestLookaheadTokenFilter.cs | 8 +-
.../Analysis/TestMockAnalyzer.cs | 2 +-
.../Configuration/TestConfigurationSettings.cs | 24 +-
.../Configuration/TestSystemProperties.cs | 22 +-
.../Lucene.Net.Tests.TestFramework.csproj | 8 +-
.../Lucene.Net.Tests._E-I.csproj | 1 +
.../Analysis/TestGraphTokenizers.cs | 41 +--
.../Analysis/TestLookaheadTokenFilter.cs | 11 +-
src/Lucene.Net.Tests/Analysis/TestMockAnalyzer.cs | 4 +-
.../Codecs/Lucene3x/TestSurrogates.cs | 32 +-
.../Codecs/Lucene41/TestBlockPostingsFormat3.cs | 4 +-
.../Codecs/PerField/TestPerFieldPostingsFormat2.cs | 12 +-
src/Lucene.Net.Tests/Index/Test2BPositions.cs | 2 +-
src/Lucene.Net.Tests/Index/Test2BPostings.cs | 4 +-
src/Lucene.Net.Tests/Index/Test4GBStoredFields.cs | 8 +-
src/Lucene.Net.Tests/Index/TestAddIndexes.cs | 33 +-
src/Lucene.Net.Tests/Index/TestAtomicUpdate.cs | 1 +
.../Index/TestBackwardsCompatibility.cs | 24 +-
.../Index/TestBackwardsCompatibility3x.cs | 22 +-
src/Lucene.Net.Tests/Index/TestBagOfPositions.cs | 7 +-
src/Lucene.Net.Tests/Index/TestBagOfPostings.cs | 6 +-
.../Index/TestBinaryDocValuesUpdates.cs | 3 +-
src/Lucene.Net.Tests/Index/TestCheckIndex.cs | 2 +-
src/Lucene.Net.Tests/Index/TestCodecs.cs | 10 +-
.../Index/TestConcurrentMergeScheduler.cs | 12 +-
.../Index/TestCrashCausesCorruptIndex.cs | 2 +-
src/Lucene.Net.Tests/Index/TestDeletionPolicy.cs | 8 +-
.../Index/TestDirectoryReaderReopen.cs | 2 +-
src/Lucene.Net.Tests/Index/TestDoc.cs | 6 +-
src/Lucene.Net.Tests/Index/TestDocTermOrds.cs | 34 +-
.../Index/TestDocValuesWithThreads.cs | 6 +-
.../Index/TestDocumentsWriterDeleteQueue.cs | 9 +-
.../Index/TestDocumentsWriterStallControl.cs | 2 +-
.../Index/TestFlushByRamOrCountsPolicy.cs | 7 +-
.../Index/TestForceMergeForever.cs | 2 +-
src/Lucene.Net.Tests/Index/TestIndexInput.cs | 2 +-
src/Lucene.Net.Tests/Index/TestIndexWriter.cs | 19 +-
.../Index/TestIndexWriterCommit.cs | 4 +-
.../Index/TestIndexWriterConfig.cs | 2 +-
.../Index/TestIndexWriterDelete.cs | 50 +--
.../Index/TestIndexWriterExceptions.cs | 56 ++-
.../Index/TestIndexWriterForceMerge.cs | 8 +-
.../Index/TestIndexWriterMerging.cs | 11 +-
.../Index/TestIndexWriterNRTIsCurrent.cs | 6 +-
.../Index/TestIndexWriterOnDiskFull.cs | 46 +--
.../Index/TestIndexWriterOutOfFileDescriptors.cs | 14 +-
.../Index/TestIndexWriterReader.cs | 18 +-
.../Index/TestIndexWriterUnicode.cs | 5 +-
.../Index/TestIndexWriterWithThreads.cs | 25 +-
src/Lucene.Net.Tests/Index/TestIndexableField.cs | 6 +-
src/Lucene.Net.Tests/Index/TestIntBlockPool.cs | 3 +-
src/Lucene.Net.Tests/Index/TestLongPostings.cs | 28 +-
src/Lucene.Net.Tests/Index/TestMixedCodecs.cs | 4 +-
.../Index/TestMixedDocValuesUpdates.cs | 4 +-
src/Lucene.Net.Tests/Index/TestMultiFields.cs | 14 +-
.../Index/TestNRTReaderWithThreads.cs | 6 +-
src/Lucene.Net.Tests/Index/TestNRTThreads.cs | 9 +-
src/Lucene.Net.Tests/Index/TestNeverDelete.cs | 2 +-
src/Lucene.Net.Tests/Index/TestNorms.cs | 1 +
.../Index/TestNumericDocValuesUpdates.cs | 4 +-
.../Index/TestParallelReaderEmptyIndex.cs | 4 +-
src/Lucene.Net.Tests/Index/TestRollingUpdates.cs | 12 +-
src/Lucene.Net.Tests/Index/TestSegmentMerger.cs | 2 +-
src/Lucene.Net.Tests/Index/TestStressAdvance.cs | 20 +-
src/Lucene.Net.Tests/Index/TestStressIndexing.cs | 1 +
src/Lucene.Net.Tests/Index/TestStressIndexing2.cs | 16 +-
src/Lucene.Net.Tests/Index/TestStressNRT.cs | 37 +-
src/Lucene.Net.Tests/Index/TestSumDocFreq.cs | 2 +-
src/Lucene.Net.Tests/Index/TestTermdocPerf.cs | 9 +-
src/Lucene.Net.Tests/Index/TestTermsEnum.cs | 54 +--
src/Lucene.Net.Tests/Index/TestTermsEnum2.cs | 2 +-
.../Index/TestTieredMergePolicy.cs | 10 +-
.../Search/Payloads/TestPayloadNearQuery.cs | 2 +-
.../Search/Spans/TestPayloadSpans.cs | 8 +-
src/Lucene.Net.Tests/Search/TestAutomatonQuery.cs | 2 +-
src/Lucene.Net.Tests/Search/TestBoolean2.cs | 4 +-
src/Lucene.Net.Tests/Search/TestBooleanQuery.cs | 12 +-
.../Search/TestControlledRealTimeReopenThread.cs | 31 +-
.../Search/TestCustomSearcherSort.cs | 2 +-
src/Lucene.Net.Tests/Search/TestDocBoost.cs | 2 +-
.../Search/TestDocTermOrdsRangeFilter.cs | 2 +-
.../Search/TestDocTermOrdsRewriteMethod.cs | 4 +-
src/Lucene.Net.Tests/Search/TestFieldCache.cs | 4 +-
src/Lucene.Net.Tests/Search/TestLiveFieldValues.cs | 4 +-
.../Search/TestMultiPhraseQuery.cs | 4 +-
.../Search/TestMultiTermConstantScore.cs | 6 +-
.../Search/TestMultiTermQueryRewrites.cs | 4 +-
.../Search/TestNumericRangeQuery32.cs | 2 +-
.../Search/TestNumericRangeQuery64.cs | 2 +-
.../Search/TestPositionIncrement.cs | 6 +-
src/Lucene.Net.Tests/Search/TestPrefixRandom.cs | 2 +-
src/Lucene.Net.Tests/Search/TestRegexpRandom2.cs | 6 +-
src/Lucene.Net.Tests/Search/TestScorerPerf.cs | 6 +-
src/Lucene.Net.Tests/Search/TestSearchAfter.cs | 4 +-
.../Search/TestSearchWithThreads.cs | 4 +-
src/Lucene.Net.Tests/Search/TestSearcherManager.cs | 19 +-
src/Lucene.Net.Tests/Search/TestShardSearching.cs | 22 +-
src/Lucene.Net.Tests/Search/TestSortRandom.cs | 14 +-
src/Lucene.Net.Tests/Search/TestTopDocsMerge.cs | 2 +-
src/Lucene.Net.Tests/Search/TestWildcard.cs | 8 +-
src/Lucene.Net.Tests/Search/TestWildcardRandom.cs | 4 +-
src/Lucene.Net.Tests/Store/TestCopyBytes.cs | 5 +-
src/Lucene.Net.Tests/Store/TestDirectory.cs | 9 +-
src/Lucene.Net.Tests/Store/TestHugeRamFile.cs | 4 +-
src/Lucene.Net.Tests/Store/TestLockFactory.cs | 9 +-
src/Lucene.Net.Tests/Store/TestMultiMMap.cs | 2 +
.../Store/TestNRTCachingDirectory.cs | 2 +-
.../Support/Index/TestTaskMergeScheduler.cs | 2 +-
src/Lucene.Net.Tests/Support/TestWeakDictionary.cs | 9 +-
.../Support/TestWeakDictionaryBehavior.cs | 6 +-
src/Lucene.Net.Tests/TestExternalCodecs.cs | 12 +-
src/Lucene.Net.Tests/TestMergeSchedulerExternal.cs | 2 +-
src/Lucene.Net.Tests/TestSearch.cs | 2 +-
src/Lucene.Net.Tests/TestSearchForDuplicates.cs | 4 +-
.../Util/Automaton/TestCompiledAutomaton.cs | 10 +-
src/Lucene.Net.Tests/Util/Fst/TestBytesStore.cs | 40 +-
src/Lucene.Net.Tests/Util/Fst/TestFSTs.cs | 47 +--
.../Util/Packed/TestEliasFanoSequence.cs | 6 +-
src/Lucene.Net.Tests/Util/Packed/TestPackedInts.cs | 13 +-
.../Util/StressRamUsageEstimator.cs | 4 +-
src/Lucene.Net.Tests/Util/TestArrayUtil.cs | 8 +-
src/Lucene.Net.Tests/Util/TestBroadWord.cs | 3 +-
src/Lucene.Net.Tests/Util/TestFixedBitSet.cs | 6 +-
src/Lucene.Net.Tests/Util/TestLongBitSet.cs | 6 +-
src/Lucene.Net.Tests/Util/TestNumericUtils.cs | 5 +-
src/Lucene.Net.Tests/Util/TestOfflineSorter.cs | 8 +-
src/Lucene.Net.Tests/Util/TestOpenBitSet.cs | 2 +-
src/Lucene.Net.Tests/Util/TestPagedBytes.cs | 13 +-
src/Lucene.Net.Tests/Util/TestPriorityQueue.cs | 2 +-
src/Lucene.Net.Tests/Util/TestRollingBuffer.cs | 6 +-
src/Lucene.Net.Tests/Util/TestWeakIdentityMap.cs | 4 +-
src/Lucene.Net/Lucene.Net.csproj | 5 -
src/Lucene.Net/Support/Util/Properties.cs | 19 +-
src/Lucene.Net/Support/Util/SystemProperties.cs | 2 +-
src/dotnet/Lucene.Net.ICU/Lucene.Net.ICU.csproj | 5 -
.../Lucene.Net.Replicator.AspNetCore.csproj | 6 -
.../Lucene.Net.Tests.ICU.csproj | 2 -
.../Lucene.Net.Tests.Cli.csproj | 3 -
368 files changed, 1903 insertions(+), 1794 deletions(-)
copy websites/site/lucenetemplate/web.config => NuGet.config (78%)
create mode 100644 build/azure-templates/publish-test-binaries.yml
delete mode 100644 src/Lucene.Net.TestFramework/Support/Attributes/LongRunningTestAttribute.cs
[lucenenet] 04/14: Lucene.Net.Codecs.SimpleText: Using decimal is
30% faster than using BigInteger for add and subtract
Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nightowl888 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucenenet.git
commit 2bd7ab608d0b7124a48823b72355c0764ca95432
Author: Shad Storhaug <sh...@shadstorhaug.com>
AuthorDate: Mon Jul 13 03:45:55 2020 +0700
Lucene.Net.Codecs.SimpleText: Using decimal is 30% faster than using BigInteger for add and subtract
---
src/Lucene.Net.Codecs/Lucene.Net.Codecs.csproj | 4 ----
.../SimpleText/SimpleTextDocValuesReader.cs | 17 ++++-------------
.../SimpleText/SimpleTextDocValuesWriter.cs | 15 ++++++---------
3 files changed, 10 insertions(+), 26 deletions(-)
diff --git a/src/Lucene.Net.Codecs/Lucene.Net.Codecs.csproj b/src/Lucene.Net.Codecs/Lucene.Net.Codecs.csproj
index ff19d8d..6a5a819 100644
--- a/src/Lucene.Net.Codecs/Lucene.Net.Codecs.csproj
+++ b/src/Lucene.Net.Codecs/Lucene.Net.Codecs.csproj
@@ -38,8 +38,4 @@
<ProjectReference Include="..\Lucene.Net\Lucene.Net.csproj" />
</ItemGroup>
- <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
- <Reference Include="System.Numerics" />
- </ItemGroup>
-
</Project>
diff --git a/src/Lucene.Net.Codecs/SimpleText/SimpleTextDocValuesReader.cs b/src/Lucene.Net.Codecs/SimpleText/SimpleTextDocValuesReader.cs
index 7bc497b..a5a1086 100644
--- a/src/Lucene.Net.Codecs/SimpleText/SimpleTextDocValuesReader.cs
+++ b/src/Lucene.Net.Codecs/SimpleText/SimpleTextDocValuesReader.cs
@@ -4,7 +4,6 @@ using System.Collections.Generic;
using System.Diagnostics;
using System.Globalization;
using System.IO;
-using System.Numerics;
using System.Text;
namespace Lucene.Net.Codecs.SimpleText
@@ -182,20 +181,12 @@ namespace Lucene.Net.Codecs.SimpleText
_input.Seek(_field.DataStartFilePointer + (1 + _field.Pattern.Length + 2) * docId);
SimpleTextUtil.ReadLine(_input, _scratch);
-
- decimal bd;
- try
- {
- // LUCNENENET: .NET doesn't have a way to specify a pattern with decimal, but all of the standard ones are built in.
- bd = decimal.Parse(_scratch.Utf8ToString(), NumberStyles.Float, CultureInfo.InvariantCulture);
- }
- catch (FormatException ex)
- {
- throw new CorruptIndexException("failed to parse long value (resource=" + _input + ")", ex);
- }
+ // LUCNENENET: .NET doesn't have a way to specify a pattern with decimal, but all of the standard ones are built in.
+ if (!decimal.TryParse(_scratch.Utf8ToString(), NumberStyles.Float, CultureInfo.InvariantCulture, out decimal bd))
+ throw new CorruptIndexException("failed to parse long value (resource=" + _input + ")");
SimpleTextUtil.ReadLine(_input, _scratch); // read the line telling us if its real or not
- return (long)BigInteger.Add(new BigInteger(_field.MinValue), new BigInteger(bd));
+ return (long)((decimal)_field.MinValue + bd); // LUCENENET specific - use decimal rather than BigInteger
}
catch (IOException ioe)
{
diff --git a/src/Lucene.Net.Codecs/SimpleText/SimpleTextDocValuesWriter.cs b/src/Lucene.Net.Codecs/SimpleText/SimpleTextDocValuesWriter.cs
index bc0c966..1c544ea 100644
--- a/src/Lucene.Net.Codecs/SimpleText/SimpleTextDocValuesWriter.cs
+++ b/src/Lucene.Net.Codecs/SimpleText/SimpleTextDocValuesWriter.cs
@@ -2,7 +2,6 @@
using System.Collections.Generic;
using System.Diagnostics;
using System.Globalization;
-using System.Numerics;
using System.Text;
using JCG = J2N.Collections.Generic;
@@ -97,22 +96,20 @@ namespace Lucene.Net.Codecs.SimpleText
SimpleTextUtil.WriteNewline(data);
// build up our fixed-width "simple text packed ints" format
- BigInteger maxBig = maxValue;
- BigInteger minBig = minValue;
- var diffBig = BigInteger.Subtract(maxBig, minBig);
+ var diffBig = (decimal)maxValue - (decimal)minValue; // LUCENENET specific - use decimal rather than BigInteger
var maxBytesPerValue = diffBig.ToString(CultureInfo.InvariantCulture).Length;
var sb = new StringBuilder();
for (var i = 0; i < maxBytesPerValue; i++)
sb.Append('0');
-
+
+ var patternString = sb.ToString(); // LUCENENET specific - only get the string once
+
// write our pattern to the .dat
SimpleTextUtil.Write(data, PATTERN);
- SimpleTextUtil.Write(data, sb.ToString(), scratch);
+ SimpleTextUtil.Write(data, patternString, scratch);
SimpleTextUtil.WriteNewline(data);
- var patternString = sb.ToString();
-
int numDocsWritten = 0;
// second pass to write the values
@@ -122,7 +119,7 @@ namespace Lucene.Net.Codecs.SimpleText
Debug.Assert(value >= minValue);
- var delta = BigInteger.Subtract(value, minValue);
+ var delta = (decimal)value - (decimal)minValue; // LUCENENET specific - use decimal rather than BigInteger
string s = delta.ToString(patternString, CultureInfo.InvariantCulture);
Debug.Assert(s.Length == patternString.Length);
SimpleTextUtil.Write(data, s, scratch);
[lucenenet] 10/14: LICENSE.txt, NOTICE.txt: Updated copyright info
Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nightowl888 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucenenet.git
commit 3cda476f8526f0092f8a05fb2f26951637ec0bd9
Author: Shad Storhaug <sh...@shadstorhaug.com>
AuthorDate: Tue Jul 14 04:04:41 2020 +0700
LICENSE.txt, NOTICE.txt: Updated copyright info
---
LICENSE.txt | 2 +-
NOTICE.txt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/LICENSE.txt b/LICENSE.txt
index d2e4797..4e6f9af 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -187,7 +187,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.
- Copyright [yyyy] [name of copyright owner]
+ Copyright 2020 Apache Lucene.NET
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/NOTICE.txt b/NOTICE.txt
index 0dc79fb..2f159d6 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -1,5 +1,5 @@
Apache Lucene.Net
-Copyright 2006-2017 The Apache Software Foundation
+Copyright 2006-2020 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
[lucenenet] 08/14: azure-pipelines.yml: Cleaned up unused variable
PublishedArtifactZipFileName
Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nightowl888 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucenenet.git
commit b78efb08295be48b099d7d3523a2ae84b159279d
Author: Shad Storhaug <sh...@shadstorhaug.com>
AuthorDate: Mon Jul 13 22:33:29 2020 +0700
azure-pipelines.yml: Cleaned up unused variable PublishedArtifactZipFileName
---
azure-pipelines.yml | 5 -----
build/azure-templates/run-tests-on-os.yml | 2 --
2 files changed, 7 deletions(-)
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 2e7628e..af14c19 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -69,8 +69,6 @@ variables:
value: '$(Build.ArtifactStagingDirectory)/$(BinaryArtifactName)'
- name: NuGetArtifactDirectory # NuGet binaries directory
value: '$(Build.ArtifactStagingDirectory)/$(NuGetArtifactName)'
-- name: PublishedArtifactZipFileName
- value: 'published.zip'
stages:
- stage: Build_Stage
@@ -273,7 +271,6 @@ stages:
osName: $(osName)
framework: 'netcoreapp3.1'
testResultsArtifactName: '$(TestResultsArtifactName)'
- publishedArtifactZipFileName: '$(PublishedArtifactZipFileName)'
maximumParallelJobs: $(maximumParallelJobs)
maximumAllowedFailures: $(maximumAllowedFailures)
@@ -305,7 +302,6 @@ stages:
osName: $(osName)
framework: 'netcoreapp2.1'
testResultsArtifactName: '$(TestResultsArtifactName)'
- publishedArtifactZipFileName: '$(PublishedArtifactZipFileName)'
maximumParallelJobs: $(maximumParallelJobs)
maximumAllowedFailures: $(maximumAllowedFailures)
@@ -320,7 +316,6 @@ stages:
osName: 'Windows'
framework: 'net48'
testResultsArtifactName: '$(TestResultsArtifactName)'
- publishedArtifactZipFileName: '$(PublishedArtifactZipFileName)'
maximumParallelJobs: 7
maximumAllowedFailures: 4 # Maximum allowed failures for a successful build
diff --git a/build/azure-templates/run-tests-on-os.yml b/build/azure-templates/run-tests-on-os.yml
index 56118b7..1308f7c 100644
--- a/build/azure-templates/run-tests-on-os.yml
+++ b/build/azure-templates/run-tests-on-os.yml
@@ -27,7 +27,6 @@ parameters:
vsTestPlatform: 'x64' # Target platform architecture used for test execution. Valid values are x86, x64, and ARM.
testBinaryFilesPattern: '\.*\.Tests\.?[^\\/]*?\.?[^\\/]*?.dll$' # The regex pattern (within $(System.DefaultWorkingDirectory)/**/<TargetFramework>/) where to look for test .dll files, so they can be distinguished from other .dll file types.
testResultsFileName: 'TestResults.trx' # The name of the file (not path) of the test results. Default 'TestResults.trx'.
- publishedArtifactZipFileName: 'published.zip' # The name of the zip file (within the Azure DevOps build artifact binaryArtifactName) where the published test binaries can be extracted from. Default 'published.zip'.
maximumParallelJobs: 8
maximumAllowedFailures: 0
where: '' # A test filter expression, as defined by dotnet vstest
@@ -49,7 +48,6 @@ steps:
EnsureNotNullOrEmpty('${{ parameters.vsTestPlatform }}', 'vsTestPlatform')
EnsureNotNullOrEmpty('${{ parameters.testBinaryFilesPattern }}', 'testBinaryFilesPattern')
EnsureNotNullOrEmpty('${{ parameters.testResultsFileName }}', 'testResultsFileName')
- EnsureNotNullOrEmpty('${{ parameters.publishedArtifactZipFileName }}', 'publishedArtifactZipFileName')
EnsureNotNullOrEmpty('${{ parameters.maximumParallelJobs }}', 'maximumParallelJobs')
EnsureNotNullOrEmpty('${{ parameters.maximumAllowedFailures }}', 'maximumAllowedFailures')
displayName: 'Validate Template Parameters'
[lucenenet] 01/14: Removed miscellaneous .NET Core 1.x/.NET
Standard 1.x support from projects that were previously missed
Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nightowl888 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucenenet.git
commit f297f00489094b21d889d5ca71e636a394339613
Author: Shad Storhaug <sh...@shadstorhaug.com>
AuthorDate: Sun Jul 12 05:25:13 2020 +0700
Removed miscellaneous .NET Core 1.x/.NET Standard 1.x support from projects that were previously missed
---
.../Lucene.Net.Analysis.OpenNLP.csproj | 2 +-
src/Lucene.Net.Benchmark/Lucene.Net.Benchmark.csproj | 9 ---------
.../Lucene.Net.Replicator.AspNetCore.csproj | 1 -
src/dotnet/Lucene.Net.Tests.ICU/Lucene.Net.Tests.ICU.csproj | 2 --
.../tools/Lucene.Net.Tests.Cli/Lucene.Net.Tests.Cli.csproj | 3 ---
5 files changed, 1 insertion(+), 16 deletions(-)
diff --git a/src/Lucene.Net.Analysis.OpenNLP/Lucene.Net.Analysis.OpenNLP.csproj b/src/Lucene.Net.Analysis.OpenNLP/Lucene.Net.Analysis.OpenNLP.csproj
index ec20ad6..6e79a5e 100644
--- a/src/Lucene.Net.Analysis.OpenNLP/Lucene.Net.Analysis.OpenNLP.csproj
+++ b/src/Lucene.Net.Analysis.OpenNLP/Lucene.Net.Analysis.OpenNLP.csproj
@@ -24,7 +24,7 @@
<Import Project="$(SolutionDir)build/NuGet.props" />
<PropertyGroup>
- <!--<TargetFrameworks>netstandard2.0;netstandard1.6</TargetFrameworks>-->
+ <!--<TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>-->
<TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net451</TargetFrameworks>
<AssemblyTitle>Lucene.Net.Analysis.OpenNLP</AssemblyTitle>
diff --git a/src/Lucene.Net.Benchmark/Lucene.Net.Benchmark.csproj b/src/Lucene.Net.Benchmark/Lucene.Net.Benchmark.csproj
index 109c62e..6e8264e 100644
--- a/src/Lucene.Net.Benchmark/Lucene.Net.Benchmark.csproj
+++ b/src/Lucene.Net.Benchmark/Lucene.Net.Benchmark.csproj
@@ -59,15 +59,6 @@
<PackageReference Include="SharpZipLib" Version="$(SharpZipLibPackageVersion)" />
</ItemGroup>
- <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
- <!-- SharpZipLib.NETStandard is not strong named - we don't really care.
- Odds are very slim we will have any downloaders of the benchmark library on this
- platform and even slimmer that they will require strong naming.
- We would just drop support for .NET Standard 1.6 for this library if
- it didn't mean adding a special case to the build/tests. -->
- <NoWarn>$(NoWarn);8002</NoWarn>
- </PropertyGroup>
-
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
<PackageReference Include="SharpZipLib" Version="$(SharpZipLibPackageVersion)" />
<Reference Include="System" />
diff --git a/src/dotnet/Lucene.Net.Replicator.AspNetCore/Lucene.Net.Replicator.AspNetCore.csproj b/src/dotnet/Lucene.Net.Replicator.AspNetCore/Lucene.Net.Replicator.AspNetCore.csproj
index 27ca159..3cee344 100644
--- a/src/dotnet/Lucene.Net.Replicator.AspNetCore/Lucene.Net.Replicator.AspNetCore.csproj
+++ b/src/dotnet/Lucene.Net.Replicator.AspNetCore/Lucene.Net.Replicator.AspNetCore.csproj
@@ -27,7 +27,6 @@
<PropertyGroup>
<TargetFrameworks>netstandard2.1;netstandard2.0</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net451</TargetFrameworks>
- <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
<AssemblyTitle>Lucene.Net.Replicator.AspNetCore</AssemblyTitle>
<Description>AspNetCore integration of Lucene.Net.Replicator for the Lucene.Net full-text search engine library from The Apache Software Foundation.</Description>
diff --git a/src/dotnet/Lucene.Net.Tests.ICU/Lucene.Net.Tests.ICU.csproj b/src/dotnet/Lucene.Net.Tests.ICU/Lucene.Net.Tests.ICU.csproj
index 7b899ab..d62620d 100644
--- a/src/dotnet/Lucene.Net.Tests.ICU/Lucene.Net.Tests.ICU.csproj
+++ b/src/dotnet/Lucene.Net.Tests.ICU/Lucene.Net.Tests.ICU.csproj
@@ -26,8 +26,6 @@
<PropertyGroup>
<AssemblyTitle>Lucene.Net.Tests.ICU</AssemblyTitle>
<DefineConstants>$(DefineConstants);FEATURE_BREAKITERATOR</DefineConstants>
- <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
- <RuntimeIdentifiers>win7-x86;win7-x64</RuntimeIdentifiers>
</PropertyGroup>
<ItemGroup>
diff --git a/src/dotnet/tools/Lucene.Net.Tests.Cli/Lucene.Net.Tests.Cli.csproj b/src/dotnet/tools/Lucene.Net.Tests.Cli/Lucene.Net.Tests.Cli.csproj
index 061d382..bc83f0c 100644
--- a/src/dotnet/tools/Lucene.Net.Tests.Cli/Lucene.Net.Tests.Cli.csproj
+++ b/src/dotnet/tools/Lucene.Net.Tests.Cli/Lucene.Net.Tests.Cli.csproj
@@ -23,10 +23,7 @@
<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
-
<AssemblyTitle>Lucene.Net.Tests.Cli</AssemblyTitle>
- <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
- <RuntimeIdentifiers>win7-x86;win7-x64</RuntimeIdentifiers>
</PropertyGroup>
<ItemGroup>
[lucenenet] 12/14: Lucene.Net.TestFramework: Added logging of
system properties so we can see how they are configured in CI
Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nightowl888 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucenenet.git
commit 03aa984060c384501ebc61882c7297bc2250bd21
Author: Shad Storhaug <sh...@shadstorhaug.com>
AuthorDate: Tue Jul 14 08:57:07 2020 +0700
Lucene.Net.TestFramework: Added logging of system properties so we can see how they are configured in CI
---
src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs b/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
index c7e40af..85711d9 100644
--- a/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
@@ -754,6 +754,27 @@ namespace Lucene.Net.Util
Console.Write("Default Similarity: ");
Console.WriteLine(similarityName);
+
+ Console.Write("Nightly: ");
+ Console.WriteLine(TEST_NIGHTLY);
+
+ Console.Write("Weekly: ");
+ Console.WriteLine(TEST_WEEKLY);
+
+ Console.Write("Slow: ");
+ Console.WriteLine(TEST_SLOW);
+
+ Console.Write("Awaits Fix: ");
+ Console.WriteLine(TEST_AWAITSFIX);
+
+ Console.Write("Directory: ");
+ Console.WriteLine(TEST_DIRECTORY);
+
+ Console.Write("Verbose: ");
+ Console.WriteLine(VERBOSE);
+
+ Console.Write("Random Multiplier: ");
+ Console.WriteLine(RANDOM_MULTIPLIER);
}
/// <summary>
[lucenenet] 07/14: azure-pipelines.yml: Removed NuGet caching,
as it doesn't account for when dependencies change
Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nightowl888 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucenenet.git
commit e017bda153bb09e453b7bfee7f137c47386099d8
Author: Shad Storhaug <sh...@shadstorhaug.com>
AuthorDate: Mon Jul 13 22:22:14 2020 +0700
azure-pipelines.yml: Removed NuGet caching, as it doesn't account for when dependencies change
---
azure-pipelines.yml | 13 +------------
1 file changed, 1 insertion(+), 12 deletions(-)
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 1630f23..2e7628e 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -70,9 +70,7 @@ variables:
- name: NuGetArtifactDirectory # NuGet binaries directory
value: '$(Build.ArtifactStagingDirectory)/$(NuGetArtifactName)'
- name: PublishedArtifactZipFileName
- value: 'published.zip'
-- name: NUGET_PACKAGES
- value: $(Build.SourcesDirectory)\.nuget\packages
+ value: 'published.zip'
stages:
- stage: Build_Stage
@@ -96,15 +94,6 @@ stages:
displayName: 'Use .NET Core sdk 3.1.301'
inputs:
version: 3.1.301
-
- - task: Cache@2
- displayName: 'Cache NuGet packages'
- inputs:
- key: 'nuget | "$(Agent.OS)" | **/*.csproj'
- restoreKeys: |
- nuget | "$(Agent.OS)"
- nuget
- path: $(NUGET_PACKAGES)
- powershell: |
Import-Module "$(BuildDirectory)/psake.psm1"
[lucenenet] 14/14: BREAKING: Lucene.Net.TestFramework: Refactored
LuceneTestCase to correctly load static system properties after the
LuceneTestFrameworkIntializer sets the configuration factory. Renamed most
public static fields and made them into static properties.
Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nightowl888 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucenenet.git
commit e17221f966fe6c8f4981e7c18ecf7e3c2be06aee
Author: Shad Storhaug <sh...@shadstorhaug.com>
AuthorDate: Tue Jul 14 12:42:33 2020 +0700
BREAKING: Lucene.Net.TestFramework: Refactored LuceneTestCase to correctly load static system properties after the LuceneTestFrameworkIntializer sets the configuration factory. Renamed most public static fields and made them into static properties.
---
.../Analysis/BaseTokenStreamTestCase.cs | 12 +-
.../Analysis/MockAnalyzer.cs | 2 +-
.../Codecs/Lucene3x/PreFlexRWPostingsFormat.cs | 2 +-
.../Codecs/Lucene3x/PreFlexRWTermVectorsFormat.cs | 2 +-
.../Codecs/MockRandom/MockRandomPostingsFormat.cs | 40 ++--
.../Index/BasePostingsFormatTestCase.cs | 76 +++----
.../Index/BaseStoredFieldsFormatTestCase.cs | 12 +-
.../Index/RandomIndexWriter.cs | 12 +-
.../Index/ThreadedIndexingAndSearchingTestCase.cs | 54 ++---
.../Search/ShardSearchingTestBase.cs | 4 +-
.../Store/MockDirectoryWrapper.cs | 22 +-
.../Configuration/ConfigurationSettingTestCase.cs | 48 ++--
src/Lucene.Net.TestFramework/Util/Fst/FSTTester.cs | 68 +++---
src/Lucene.Net.TestFramework/Util/LineFileDocs.cs | 10 +-
.../Util/LuceneTestCase.cs | 250 +++++++++++++++------
.../Util/TestRuleSetupAndRestoreClassEnv.cs | 70 +++---
src/Lucene.Net.TestFramework/Util/TestUtil.cs | 8 +-
.../Analysis/Ar/TestArabicAnalyzer.cs | 2 +-
.../Analysis/Bg/TestBulgarianAnalyzer.cs | 2 +-
.../Analysis/Br/TestBrazilianStemmer.cs | 2 +-
.../Analysis/Ca/TestCatalanAnalyzer.cs | 2 +-
.../CharFilters/HTMLStripCharFilterTest.cs | 4 +-
.../Analysis/CharFilters/TestMappingCharFilter.cs | 16 +-
.../Analysis/Cjk/TestCJKAnalyzer.cs | 4 +-
.../Analysis/Cjk/TestCJKBigramFilter.cs | 4 +-
.../Analysis/Cjk/TestCJKTokenizer.cs | 2 +-
.../Analysis/Cjk/TestCJKWidthFilter.cs | 2 +-
.../Analysis/Ckb/TestSoraniAnalyzer.cs | 2 +-
.../Analysis/Cn/TestChineseTokenizer.cs | 2 +-
.../Analysis/Commongrams/CommonGramsFilterTest.cs | 4 +-
.../Compound/TestCompoundWordTokenFilter.cs | 4 +-
.../Analysis/Core/TestAnalyzers.cs | 12 +-
.../Analysis/Core/TestClassicAnalyzer.cs | 4 +-
.../Analysis/Core/TestKeywordAnalyzer.cs | 2 +-
.../Analysis/Core/TestRandomChains.cs | 12 +-
.../Analysis/Core/TestStandardAnalyzer.cs | 6 +-
.../Analysis/Core/TestStopFilter.cs | 2 +-
.../Analysis/Core/TestTypeTokenFilter.cs | 2 +-
.../Analysis/Core/TestUAX29URLEmailAnalyzer.cs | 2 +-
.../Analysis/Core/TestUAX29URLEmailTokenizer.cs | 4 +-
.../Analysis/Cz/TestCzechAnalyzer.cs | 2 +-
.../Analysis/Da/TestDanishAnalyzer.cs | 2 +-
.../Analysis/De/TestGermanAnalyzer.cs | 2 +-
.../Analysis/De/TestGermanLightStemFilter.cs | 2 +-
.../Analysis/De/TestGermanMinimalStemFilter.cs | 2 +-
.../Analysis/De/TestGermanNormalizationFilter.cs | 2 +-
.../Analysis/De/TestGermanStemFilter.cs | 2 +-
.../Analysis/El/GreekAnalyzerTest.cs | 2 +-
.../Analysis/En/TestEnglishAnalyzer.cs | 2 +-
.../Analysis/En/TestEnglishMinimalStemFilter.cs | 2 +-
.../Analysis/En/TestKStemmer.cs | 2 +-
.../Analysis/En/TestPorterStemFilter.cs | 2 +-
.../Analysis/Es/TestSpanishAnalyzer.cs | 2 +-
.../Analysis/Es/TestSpanishLightStemFilter.cs | 2 +-
.../Analysis/Eu/TestBasqueAnalyzer.cs | 2 +-
.../Analysis/Fa/TestPersianAnalyzer.cs | 2 +-
.../Analysis/Fa/TestPersianCharFilter.cs | 2 +-
.../Analysis/Fi/TestFinnishAnalyzer.cs | 2 +-
.../Analysis/Fi/TestFinnishLightStemFilter.cs | 2 +-
.../Analysis/Fr/TestFrenchAnalyzer.cs | 2 +-
.../Analysis/Fr/TestFrenchLightStemFilter.cs | 2 +-
.../Analysis/Fr/TestFrenchMinimalStemFilter.cs | 2 +-
.../Analysis/Ga/TestIrishAnalyzer.cs | 2 +-
.../Analysis/Gl/TestGalicianAnalyzer.cs | 2 +-
.../Analysis/Gl/TestGalicianMinimalStemFilter.cs | 2 +-
.../Analysis/Hi/TestHindiAnalyzer.cs | 2 +-
.../Analysis/Hu/TestHungarianAnalyzer.cs | 2 +-
.../Analysis/Hunspell/TestHunspellStemFilter.cs | 2 +-
.../Analysis/Hy/TestArmenianAnalyzer.cs | 2 +-
.../Analysis/Id/TestIndonesianAnalyzer.cs | 2 +-
.../Analysis/It/TestItalianAnalyzer.cs | 2 +-
.../Analysis/It/TestItalianLightStemFilter.cs | 2 +-
.../Analysis/Lv/TestLatvianAnalyzer.cs | 2 +-
.../Analysis/Miscellaneous/PatternAnalyzerTest.cs | 2 +-
.../Miscellaneous/TestASCIIFoldingFilter.cs | 2 +-
.../Miscellaneous/TestCapitalizationFilter.cs | 2 +-
.../Miscellaneous/TestHyphenatedWordsFilter.cs | 2 +-
.../Analysis/Miscellaneous/TestKeepWordFilter.cs | 2 +-
.../Miscellaneous/TestScandinavianFoldingFilter.cs | 2 +-
.../TestScandinavianNormalizationFilter.cs | 2 +-
.../Analysis/Miscellaneous/TestTrimFilter.cs | 4 +-
.../Miscellaneous/TestWordDelimiterFilter.cs | 4 +-
.../Analysis/NGram/EdgeNGramTokenFilterTest.cs | 4 +-
.../Analysis/NGram/EdgeNGramTokenizerTest.cs | 8 +-
.../Analysis/NGram/NGramTokenFilterTest.cs | 2 +-
.../Analysis/NGram/NGramTokenizerTest.cs | 4 +-
.../Analysis/Nl/TestDutchStemmer.cs | 2 +-
.../Analysis/No/TestNorwegianAnalyzer.cs | 2 +-
.../Analysis/No/TestNorwegianLightStemFilter.cs | 2 +-
.../Analysis/No/TestNorwegianMinimalStemFilter.cs | 2 +-
.../Analysis/Path/TestPathHierarchyTokenizer.cs | 4 +-
.../Path/TestReversePathHierarchyTokenizer.cs | 4 +-
.../Pattern/TestPatternCaptureGroupTokenFilter.cs | 2 +-
.../Pattern/TestPatternReplaceCharFilter.cs | 2 +-
.../Analysis/Pattern/TestPatternReplaceFilter.cs | 4 +-
.../Analysis/Pattern/TestPatternTokenizer.cs | 4 +-
.../Analysis/Pt/TestPortugueseAnalyzer.cs | 2 +-
.../Analysis/Pt/TestPortugueseLightStemFilter.cs | 2 +-
.../Analysis/Pt/TestPortugueseMinimalStemFilter.cs | 2 +-
.../Analysis/Pt/TestPortugueseStemFilter.cs | 2 +-
.../Analysis/Reverse/TestReverseStringFilter.cs | 2 +-
.../Analysis/Ro/TestRomanianAnalyzer.cs | 2 +-
.../Analysis/Ru/TestRussianAnalyzer.cs | 2 +-
.../Analysis/Ru/TestRussianLightStemFilter.cs | 2 +-
.../Analysis/Shingle/ShingleFilterTest.cs | 4 +-
.../Analysis/Snowball/TestSnowball.cs | 2 +-
.../Analysis/Snowball/TestSnowballVocab.cs | 2 +-
.../Analysis/Sv/TestSwedishAnalyzer.cs | 2 +-
.../Analysis/Sv/TestSwedishLightStemFilter.cs | 2 +-
.../Analysis/Synonym/TestSynonymMapFilter.cs | 20 +-
.../Analysis/Th/TestThaiAnalyzer.cs | 4 +-
.../Analysis/Tr/TestTurkishAnalyzer.cs | 2 +-
.../Analysis/Util/TestCharArrayMap.cs | 2 +-
.../Analysis/Util/TestCharTokenizers.cs | 6 +-
.../Analysis/Util/TestRollingCharBuffer.cs | 12 +-
.../Analysis/Util/TestSegmentingTokenizerBase.cs | 4 +-
.../Analysis/Wikipedia/WikipediaTokenizerTest.cs | 4 +-
.../Analysis/Icu/Segmentation/TestICUTokenizer.cs | 6 +-
.../Icu/Segmentation/TestICUTokenizerCJK.cs | 4 +-
.../Analysis/Icu/TestICUFoldingFilter.cs | 2 +-
.../Analysis/Icu/TestICUNormalizer2CharFilter.cs | 28 +--
.../Analysis/Icu/TestICUNormalizer2Filter.cs | 2 +-
.../Analysis/Icu/TestICUTransformFilter.cs | 2 +-
.../Collation/TestICUCollationKeyAnalyzer.cs | 2 +-
.../Dict/TestTokenInfoDictionary.cs | 2 +-
.../TestExtendedMode.cs | 4 +-
.../TestJapaneseAnalyzer.cs | 2 +-
.../TestJapaneseIterationMarkCharFilter.cs | 4 +-
.../TestJapaneseKatakanaStemFilter.cs | 2 +-
.../TestJapaneseReadingFormFilter.cs | 4 +-
.../TestJapaneseTokenizer.cs | 18 +-
.../TestSearchMode.cs | 2 +-
.../Morfologik/TestMorfologikAnalyzer.cs | 2 +-
.../Uk/TestUkrainianAnalyzer.cs | 2 +-
.../DoubleMetaphoneFilterTest.cs | 4 +-
.../TestBeiderMorseFilter.cs | 2 +-
.../TestPhoneticFilter.cs | 4 +-
.../TestSmartChineseAnalyzer.cs | 4 +-
.../Pl/TestPolishAnalyzer.cs | 2 +-
.../BenchmarkTestCase.cs | 2 +-
.../Quality/TestQualityRun.cs | 4 +-
src/Lucene.Net.Tests.Facet/FacetTestCase.cs | 2 +-
.../Range/TestRangeFacetCounts.cs | 26 +--
.../SortedSet/TestSortedSetDocValuesFacets.cs | 2 +-
.../Directory/TestConcurrentFacetedIndexing.cs | 2 +-
.../Directory/TestDirectoryTaxonomyWriter.cs | 4 +-
.../Taxonomy/TestSearcherTaxonomyManager.cs | 16 +-
.../Taxonomy/TestTaxonomyFacetCounts.cs | 2 +-
.../Taxonomy/TestTaxonomyFacetSumValueSource.cs | 4 +-
.../WriterCache/TestCompactLabelToOrdinal.cs | 8 +-
src/Lucene.Net.Tests.Facet/TestDrillSideways.cs | 46 ++--
.../AllGroupHeadsCollectorTest.cs | 18 +-
.../AllGroupsCollectorTest.cs | 2 +-
.../DistinctValuesCollectorTest.cs | 6 +-
.../GroupFacetCollectorTest.cs | 16 +-
src/Lucene.Net.Tests.Grouping/TestGrouping.cs | 52 ++---
.../Highlight/Custom/HighlightCustomQueryTest.cs | 4 +-
.../Highlight/HighlighterTest.cs | 62 ++---
.../VectorHighlight/SimpleFragListBuilderTest.cs | 2 +-
.../VectorHighlight/SimpleFragmentsBuilderTest.cs | 4 +-
src/Lucene.Net.Tests.Join/TestBlockJoin.cs | 30 +--
src/Lucene.Net.Tests.Join/TestJoinUtil.cs | 16 +-
.../Index/Memory/MemoryIndexTest.cs | 8 +-
.../Index/Sorter/IndexSortingTest.cs | 2 +-
.../Index/Sorter/SorterTestBase.cs | 4 +-
.../Index/Sorter/SortingAtomicReaderTest.cs | 4 +-
src/Lucene.Net.Tests.Misc/Util/Fst/TestFSTsMisc.cs | 6 +-
.../Function/FunctionTestSetup.cs | 8 +-
.../Spans/TestSpanQueryParserSimpleSample.cs | 4 +-
.../Flexible/Standard/TestNumericQueryParser.cs | 8 +-
.../Flexible/Standard/TestQPHelper.cs | 2 +-
.../Util/QueryParserTestBase.cs | 2 +-
src/Lucene.Net.Tests.QueryParser/Xml/TestParser.cs | 6 +-
.../IndexAndTaxonomyReplicationClientTest.cs | 4 +-
.../IndexReplicationClientTest.cs | 6 +-
.../Queries/TestSlowFuzzyQuery2.cs | 4 +-
.../Spell/TestWordBreakSpellChecker.cs | 4 +-
.../Analyzing/AnalyzingInfixSuggesterTest.cs | 16 +-
.../Suggest/Analyzing/AnalyzingSuggesterTest.cs | 12 +-
.../Suggest/Analyzing/FuzzySuggesterTest.cs | 22 +-
.../Suggest/Analyzing/TestFreeTextSuggester.cs | 42 ++--
.../Analysis/TestLookaheadTokenFilter.cs | 8 +-
.../Analysis/TestMockAnalyzer.cs | 2 +-
.../Configuration/TestConfigurationSettings.cs | 24 +-
.../Configuration/TestSystemProperties.cs | 22 +-
.../Analysis/TestGraphTokenizers.cs | 32 +--
.../Analysis/TestLookaheadTokenFilter.cs | 4 +-
.../Codecs/Lucene3x/TestSurrogates.cs | 32 +--
.../Codecs/PerField/TestPerFieldPostingsFormat2.cs | 12 +-
src/Lucene.Net.Tests/Index/Test2BPositions.cs | 2 +-
src/Lucene.Net.Tests/Index/Test2BPostings.cs | 2 +-
src/Lucene.Net.Tests/Index/Test4GBStoredFields.cs | 4 +-
src/Lucene.Net.Tests/Index/TestAddIndexes.cs | 32 +--
.../Index/TestBackwardsCompatibility.cs | 20 +-
.../Index/TestBackwardsCompatibility3x.cs | 22 +-
src/Lucene.Net.Tests/Index/TestBagOfPositions.cs | 6 +-
src/Lucene.Net.Tests/Index/TestBagOfPostings.cs | 6 +-
src/Lucene.Net.Tests/Index/TestCheckIndex.cs | 2 +-
src/Lucene.Net.Tests/Index/TestCodecs.cs | 10 +-
.../Index/TestConcurrentMergeScheduler.cs | 12 +-
.../Index/TestCrashCausesCorruptIndex.cs | 2 +-
src/Lucene.Net.Tests/Index/TestDeletionPolicy.cs | 8 +-
.../Index/TestDirectoryReaderReopen.cs | 2 +-
src/Lucene.Net.Tests/Index/TestDoc.cs | 6 +-
src/Lucene.Net.Tests/Index/TestDocTermOrds.cs | 34 +--
.../Index/TestDocValuesWithThreads.cs | 6 +-
.../Index/TestDocumentsWriterDeleteQueue.cs | 8 +-
.../Index/TestDocumentsWriterStallControl.cs | 2 +-
.../Index/TestFlushByRamOrCountsPolicy.cs | 6 +-
.../Index/TestForceMergeForever.cs | 2 +-
src/Lucene.Net.Tests/Index/TestIndexInput.cs | 2 +-
src/Lucene.Net.Tests/Index/TestIndexWriter.cs | 12 +-
.../Index/TestIndexWriterCommit.cs | 4 +-
.../Index/TestIndexWriterConfig.cs | 2 +-
.../Index/TestIndexWriterDelete.cs | 46 ++--
.../Index/TestIndexWriterExceptions.cs | 50 ++---
.../Index/TestIndexWriterForceMerge.cs | 8 +-
.../Index/TestIndexWriterMerging.cs | 4 +-
.../Index/TestIndexWriterNRTIsCurrent.cs | 6 +-
.../Index/TestIndexWriterOnDiskFull.cs | 46 ++--
.../Index/TestIndexWriterOutOfFileDescriptors.cs | 14 +-
.../Index/TestIndexWriterReader.cs | 10 +-
.../Index/TestIndexWriterWithThreads.cs | 24 +-
src/Lucene.Net.Tests/Index/TestIndexableField.cs | 6 +-
src/Lucene.Net.Tests/Index/TestLongPostings.cs | 28 +--
src/Lucene.Net.Tests/Index/TestMixedCodecs.cs | 4 +-
src/Lucene.Net.Tests/Index/TestMultiFields.cs | 14 +-
src/Lucene.Net.Tests/Index/TestNRTThreads.cs | 8 +-
src/Lucene.Net.Tests/Index/TestNeverDelete.cs | 2 +-
.../Index/TestParallelReaderEmptyIndex.cs | 4 +-
src/Lucene.Net.Tests/Index/TestRollingUpdates.cs | 12 +-
src/Lucene.Net.Tests/Index/TestSegmentMerger.cs | 2 +-
src/Lucene.Net.Tests/Index/TestStressAdvance.cs | 20 +-
src/Lucene.Net.Tests/Index/TestStressIndexing2.cs | 16 +-
src/Lucene.Net.Tests/Index/TestStressNRT.cs | 34 +--
src/Lucene.Net.Tests/Index/TestSumDocFreq.cs | 2 +-
src/Lucene.Net.Tests/Index/TestTermdocPerf.cs | 4 +-
src/Lucene.Net.Tests/Index/TestTermsEnum.cs | 54 ++---
src/Lucene.Net.Tests/Index/TestTermsEnum2.cs | 2 +-
.../Index/TestTieredMergePolicy.cs | 10 +-
.../Search/Payloads/TestPayloadNearQuery.cs | 2 +-
.../Search/Spans/TestPayloadSpans.cs | 8 +-
src/Lucene.Net.Tests/Search/TestAutomatonQuery.cs | 2 +-
src/Lucene.Net.Tests/Search/TestBoolean2.cs | 4 +-
src/Lucene.Net.Tests/Search/TestBooleanQuery.cs | 12 +-
.../Search/TestControlledRealTimeReopenThread.cs | 30 +--
.../Search/TestCustomSearcherSort.cs | 2 +-
src/Lucene.Net.Tests/Search/TestDocBoost.cs | 2 +-
.../Search/TestDocTermOrdsRangeFilter.cs | 2 +-
.../Search/TestDocTermOrdsRewriteMethod.cs | 4 +-
src/Lucene.Net.Tests/Search/TestFieldCache.cs | 4 +-
src/Lucene.Net.Tests/Search/TestLiveFieldValues.cs | 4 +-
.../Search/TestMultiPhraseQuery.cs | 4 +-
.../Search/TestMultiTermConstantScore.cs | 6 +-
.../Search/TestMultiTermQueryRewrites.cs | 4 +-
.../Search/TestNumericRangeQuery32.cs | 2 +-
.../Search/TestNumericRangeQuery64.cs | 2 +-
.../Search/TestPositionIncrement.cs | 6 +-
src/Lucene.Net.Tests/Search/TestPrefixRandom.cs | 2 +-
src/Lucene.Net.Tests/Search/TestRegexpRandom2.cs | 6 +-
src/Lucene.Net.Tests/Search/TestScorerPerf.cs | 6 +-
.../Search/TestSearchWithThreads.cs | 4 +-
src/Lucene.Net.Tests/Search/TestSearcherManager.cs | 18 +-
src/Lucene.Net.Tests/Search/TestShardSearching.cs | 22 +-
src/Lucene.Net.Tests/Search/TestSortRandom.cs | 14 +-
src/Lucene.Net.Tests/Search/TestTopDocsMerge.cs | 2 +-
src/Lucene.Net.Tests/Search/TestWildcard.cs | 8 +-
src/Lucene.Net.Tests/Search/TestWildcardRandom.cs | 4 +-
src/Lucene.Net.Tests/Store/TestCopyBytes.cs | 2 +-
src/Lucene.Net.Tests/Store/TestDirectory.cs | 2 +-
.../Store/TestNRTCachingDirectory.cs | 2 +-
.../Support/Index/TestTaskMergeScheduler.cs | 2 +-
src/Lucene.Net.Tests/TestExternalCodecs.cs | 12 +-
src/Lucene.Net.Tests/TestMergeSchedulerExternal.cs | 2 +-
src/Lucene.Net.Tests/TestSearch.cs | 2 +-
src/Lucene.Net.Tests/TestSearchForDuplicates.cs | 4 +-
.../Util/Automaton/TestCompiledAutomaton.cs | 10 +-
src/Lucene.Net.Tests/Util/Fst/TestBytesStore.cs | 36 +--
src/Lucene.Net.Tests/Util/Fst/TestFSTs.cs | 40 ++--
src/Lucene.Net.Tests/Util/Packed/TestPackedInts.cs | 6 +-
src/Lucene.Net.Tests/Util/TestArrayUtil.cs | 8 +-
src/Lucene.Net.Tests/Util/TestFixedBitSet.cs | 4 +-
src/Lucene.Net.Tests/Util/TestLongBitSet.cs | 4 +-
src/Lucene.Net.Tests/Util/TestPagedBytes.cs | 4 +-
src/Lucene.Net.Tests/Util/TestPriorityQueue.cs | 2 +-
src/Lucene.Net.Tests/Util/TestRollingBuffer.cs | 6 +-
src/Lucene.Net/Support/Util/Properties.cs | 19 +-
src/Lucene.Net/Support/Util/SystemProperties.cs | 2 +-
288 files changed, 1433 insertions(+), 1306 deletions(-)
diff --git a/src/Lucene.Net.TestFramework/Analysis/BaseTokenStreamTestCase.cs b/src/Lucene.Net.TestFramework/Analysis/BaseTokenStreamTestCase.cs
index e0f2eb0..859e90c 100644
--- a/src/Lucene.Net.TestFramework/Analysis/BaseTokenStreamTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Analysis/BaseTokenStreamTestCase.cs
@@ -1012,7 +1012,7 @@ namespace Lucene.Net.Analysis
private static void CheckAnalysisConsistency(Random random, Analyzer a, bool useCharFilter, string text, bool offsetsAreCorrect, Field field)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(Thread.CurrentThread.Name + ": NOTE: baseTokenStreamTestCase: get first token stream now text=" + text);
}
@@ -1110,7 +1110,7 @@ namespace Lucene.Net.Analysis
int evilness = random.Next(50);
if (evilness == 17)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(Thread.CurrentThread.Name + ": NOTE: baseTokenStreamTestCase: re-run analysis w/ exception");
}
@@ -1161,7 +1161,7 @@ namespace Lucene.Net.Analysis
{
// Only consume a subset of the tokens:
int numTokensToRead = random.Next(tokens.Count);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(Thread.CurrentThread.Name + ": NOTE: baseTokenStreamTestCase: re-run analysis, only consuming " + numTokensToRead + " of " + tokens.Count + " tokens");
}
@@ -1196,7 +1196,7 @@ namespace Lucene.Net.Analysis
// Final pass: verify clean tokenization matches
// results from first pass:
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(Thread.CurrentThread.Name + ": NOTE: baseTokenStreamTestCase: re-run analysis; " + tokens.Count + " tokens");
}
@@ -1206,7 +1206,7 @@ namespace Lucene.Net.Analysis
random = new Random((int)seed);
if (random.Next(30) == 7)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(Thread.CurrentThread.Name + ": NOTE: baseTokenStreamTestCase: using spoon-feed reader");
}
@@ -1252,7 +1252,7 @@ namespace Lucene.Net.Analysis
random = new Random((int)seed);
if (random.Next(30) == 7)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(Thread.CurrentThread.Name + ": NOTE: baseTokenStreamTestCase: indexing using spoon-feed reader");
}
diff --git a/src/Lucene.Net.TestFramework/Analysis/MockAnalyzer.cs b/src/Lucene.Net.TestFramework/Analysis/MockAnalyzer.cs
index 499c8de..e5f5214 100644
--- a/src/Lucene.Net.TestFramework/Analysis/MockAnalyzer.cs
+++ b/src/Lucene.Net.TestFramework/Analysis/MockAnalyzer.cs
@@ -129,7 +129,7 @@ namespace Lucene.Net.Analysis
break;
}
}
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
if (val == int.MaxValue)
{
diff --git a/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWPostingsFormat.cs b/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWPostingsFormat.cs
index 0e992d6..126b86e 100644
--- a/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWPostingsFormat.cs
+++ b/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWPostingsFormat.cs
@@ -72,7 +72,7 @@ namespace Lucene.Net.Codecs.Lucene3x
if (StackTraceHelper.DoesStackTraceContainMethod("Merge"))
{
unicodeSortOrder = false;
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine("NOTE: PreFlexRW codec: forcing legacy UTF16 term sort order");
}
diff --git a/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWTermVectorsFormat.cs b/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWTermVectorsFormat.cs
index a3c0e15..bcc5ca3 100644
--- a/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWTermVectorsFormat.cs
+++ b/src/Lucene.Net.TestFramework/Codecs/Lucene3x/PreFlexRWTermVectorsFormat.cs
@@ -57,7 +57,7 @@ namespace Lucene.Net.Codecs.Lucene3x
if (StackTraceHelper.DoesStackTraceContainMethod("Merge"))
{
unicodeSortOrder = false;
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine("NOTE: PreFlexRW codec: forcing legacy UTF16 vector term sort order");
}
diff --git a/src/Lucene.Net.TestFramework/Codecs/MockRandom/MockRandomPostingsFormat.cs b/src/Lucene.Net.TestFramework/Codecs/MockRandom/MockRandomPostingsFormat.cs
index 8122618..ab3e43c 100644
--- a/src/Lucene.Net.TestFramework/Codecs/MockRandom/MockRandomPostingsFormat.cs
+++ b/src/Lucene.Net.TestFramework/Codecs/MockRandom/MockRandomPostingsFormat.cs
@@ -97,7 +97,7 @@ namespace Lucene.Net.Codecs.MockRandom
// Must only use extension, because IW.addIndexes can
// rename segment!
Int32StreamFactory f = delegates[(Math.Abs(salt ^ GetExtension(fileName).GetHashCode())) % delegates.size()];
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine("MockRandomCodec: read using int factory " + f + " from fileName=" + fileName);
}
@@ -107,7 +107,7 @@ namespace Lucene.Net.Codecs.MockRandom
public override Int32IndexOutput CreateOutput(Directory dir, string fileName, IOContext context)
{
Int32StreamFactory f = delegates[(Math.Abs(salt ^ GetExtension(fileName).GetHashCode())) % delegates.size()];
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine("MockRandomCodec: write using int factory " + f + " to fileName=" + fileName);
}
@@ -151,14 +151,14 @@ namespace Lucene.Net.Codecs.MockRandom
// (the skipInterval is written into postings header)
int skipInterval = TestUtil.NextInt32(seedRandom, minSkipInterval, 10);
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine("MockRandomCodec: skipInterval=" + skipInterval);
}
long seed = seedRandom.nextLong();
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine("MockRandomCodec: writing to seg=" + state.SegmentInfo.Name + " formatID=" + state.SegmentSuffix + " seed=" + seed);
}
@@ -185,7 +185,7 @@ namespace Lucene.Net.Codecs.MockRandom
}
else
{
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine("MockRandomCodec: writing Standard postings");
}
@@ -196,7 +196,7 @@ namespace Lucene.Net.Codecs.MockRandom
if (random.nextBoolean())
{
int totTFCutoff = TestUtil.NextInt32(random, 1, 20);
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine("MockRandomCodec: writing pulsing postings with totTFCutoff=" + totTFCutoff);
}
@@ -242,7 +242,7 @@ namespace Lucene.Net.Codecs.MockRandom
{
// Use BlockTree terms dict
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine("MockRandomCodec: writing BlockTree terms dict");
}
@@ -269,7 +269,7 @@ namespace Lucene.Net.Codecs.MockRandom
else
{
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine("MockRandomCodec: writing Block terms dict");
}
@@ -282,7 +282,7 @@ namespace Lucene.Net.Codecs.MockRandom
if (random.nextBoolean())
{
state.TermIndexInterval = TestUtil.NextInt32(random, 1, 100);
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine("MockRandomCodec: fixed-gap terms index (tii=" + state.TermIndexInterval + ")");
}
@@ -296,7 +296,7 @@ namespace Lucene.Net.Codecs.MockRandom
{
int tii = TestUtil.NextInt32(random, 1, 100);
selector = new VariableGapTermsIndexWriter.EveryNTermSelector(tii);
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine("MockRandomCodec: variable-gap terms index (tii=" + tii + ")");
}
@@ -311,7 +311,7 @@ namespace Lucene.Net.Codecs.MockRandom
{
int seed2 = random.Next();
int gap = TestUtil.NextInt32(random, 2, 40);
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine("MockRandomCodec: random-gap terms index (max gap=" + gap + ")");
}
@@ -375,7 +375,7 @@ namespace Lucene.Net.Codecs.MockRandom
string seedFileName = IndexFileNames.SegmentFileName(state.SegmentInfo.Name, state.SegmentSuffix, SEED_EXT);
IndexInput @in = state.Directory.OpenInput(seedFileName, state.Context);
long seed = @in.ReadInt64();
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine("MockRandomCodec: reading from seg=" + state.SegmentInfo.Name + " formatID=" + state.SegmentSuffix + " seed=" + seed);
}
@@ -384,7 +384,7 @@ namespace Lucene.Net.Codecs.MockRandom
Random random = new Random((int)seed);
int readBufferSize = TestUtil.NextInt32(random, 1, 4096);
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine("MockRandomCodec: readBufferSize=" + readBufferSize);
}
@@ -393,7 +393,7 @@ namespace Lucene.Net.Codecs.MockRandom
if (random.nextBoolean())
{
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine("MockRandomCodec: reading Sep postings");
}
@@ -402,7 +402,7 @@ namespace Lucene.Net.Codecs.MockRandom
}
else
{
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine("MockRandomCodec: reading Standard postings");
}
@@ -412,7 +412,7 @@ namespace Lucene.Net.Codecs.MockRandom
if (random.nextBoolean())
{
int totTFCutoff = TestUtil.NextInt32(random, 1, 20);
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine("MockRandomCodec: reading pulsing postings with totTFCutoff=" + totTFCutoff);
}
@@ -456,7 +456,7 @@ namespace Lucene.Net.Codecs.MockRandom
else if (t1 == 2)
{
// Use BlockTree terms dict
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine("MockRandomCodec: reading BlockTree terms dict");
}
@@ -484,7 +484,7 @@ namespace Lucene.Net.Codecs.MockRandom
else
{
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine("MockRandomCodec: reading Block terms dict");
}
@@ -504,7 +504,7 @@ namespace Lucene.Net.Codecs.MockRandom
{
// if termsIndexDivisor is set to -1, we should not touch it. It means a
// test explicitly instructed not to load the terms index.
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine("MockRandomCodec: fixed-gap terms index (divisor=" + state.TermsIndexDivisor + ")");
}
@@ -526,7 +526,7 @@ namespace Lucene.Net.Codecs.MockRandom
{
random.NextInt64();
}
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine("MockRandomCodec: variable-gap terms index (divisor=" + state.TermsIndexDivisor + ")");
}
diff --git a/src/Lucene.Net.TestFramework/Index/BasePostingsFormatTestCase.cs b/src/Lucene.Net.TestFramework/Index/BasePostingsFormatTestCase.cs
index edd6c12..f3f2791 100644
--- a/src/Lucene.Net.TestFramework/Index/BasePostingsFormatTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Index/BasePostingsFormatTestCase.cs
@@ -338,18 +338,18 @@ namespace Lucene.Net.Index
int minDocFreq, maxDocFreq;
if (term.StartsWith("big_", StringComparison.Ordinal))
{
- minDocFreq = RANDOM_MULTIPLIER * 50000;
- maxDocFreq = RANDOM_MULTIPLIER * 70000;
+ minDocFreq = RandomMultiplier * 50000;
+ maxDocFreq = RandomMultiplier * 70000;
}
else if (term.StartsWith("medium_", StringComparison.Ordinal))
{
- minDocFreq = RANDOM_MULTIPLIER * 3000;
- maxDocFreq = RANDOM_MULTIPLIER * 6000;
+ minDocFreq = RandomMultiplier * 3000;
+ maxDocFreq = RandomMultiplier * 6000;
}
else if (term.StartsWith("low_", StringComparison.Ordinal))
{
- minDocFreq = RANDOM_MULTIPLIER;
- maxDocFreq = RANDOM_MULTIPLIER * 40;
+ minDocFreq = RandomMultiplier;
+ maxDocFreq = RandomMultiplier * 40;
}
else
{
@@ -395,7 +395,7 @@ namespace Lucene.Net.Index
fields = new JCG.SortedDictionary<string, JCG.SortedDictionary<BytesRef, long>>(StringComparer.Ordinal);
int numFields = TestUtil.NextInt32(Random, 1, 5);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: " + numFields + " fields");
}
@@ -439,7 +439,7 @@ namespace Lucene.Net.Index
}
seenTerms.Add(term);
- if (TEST_NIGHTLY && termUpto == 0 && fieldUpto == 1)
+ if (TestNightly && termUpto == 0 && fieldUpto == 1)
{
// Make 1 big term:
term = "big_" + term;
@@ -501,7 +501,7 @@ namespace Lucene.Net.Index
}
}
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: done init postings; " + allTerms.Count + " total terms, across " + fieldInfos.Count + " fields");
}
@@ -542,7 +542,7 @@ namespace Lucene.Net.Index
SegmentInfo segmentInfo = new SegmentInfo(dir, Constants.LUCENE_MAIN_VERSION, "_0", maxDoc, false, codec, null);
int maxIndexOption = Array.IndexOf(ALL_INDEX_OPTIONS, maxAllowed);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("\nTEST: now build index");
}
@@ -596,7 +596,7 @@ namespace Lucene.Net.Index
IndexOptions indexOptions = fieldInfo.IndexOptions;
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("field=" + field + " indexOtions=" + indexOptions);
}
@@ -614,7 +614,7 @@ namespace Lucene.Net.Index
{
BytesRef term = termEnt.Key;
SeedPostings postings = GetSeedPostings(term.Utf8ToString(), termEnt.Value, false, maxAllowed);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" term=" + field + ":" + term.Utf8ToString() + " docFreq=" + postings.DocFreq + " seed=" + termEnt.Value);
}
@@ -625,7 +625,7 @@ namespace Lucene.Net.Index
while ((docID = postings.NextDoc()) != DocsEnum.NO_MORE_DOCS)
{
int freq = postings.Freq;
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" " + postings.Upto + ": docID=" + docID + " freq=" + postings.freq);
}
@@ -639,7 +639,7 @@ namespace Lucene.Net.Index
int pos = postings.NextPosition();
BytesRef payload = postings.GetPayload();
- if (VERBOSE)
+ if (Verbose)
{
if (doPayloads)
{
@@ -673,7 +673,7 @@ namespace Lucene.Net.Index
}
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: after indexing: files=");
foreach (string file in dir.ListAll())
@@ -710,7 +710,7 @@ namespace Lucene.Net.Index
bool alwaysTestMax)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" verifyEnum: options=" + options + " maxTestOptions=" + maxTestOptions);
}
@@ -725,7 +725,7 @@ namespace Lucene.Net.Index
if (useLiveDocs)
{
liveDocs = globalLiveDocs;
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" use liveDocs");
}
@@ -733,7 +733,7 @@ namespace Lucene.Net.Index
else
{
liveDocs = null;
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" no liveDocs");
}
@@ -788,7 +788,7 @@ namespace Lucene.Net.Index
flags |= DocsAndPositionsFlags.PAYLOADS;
}
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" get DocsAndPositionsEnum (but we won't check positions) flags=" + flags);
}
@@ -799,7 +799,7 @@ namespace Lucene.Net.Index
}
else
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" get DocsEnum");
}
@@ -829,7 +829,7 @@ namespace Lucene.Net.Index
flags |= DocsAndPositionsFlags.PAYLOADS;
}
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" get DocsAndPositionsEnum flags=" + flags);
}
@@ -843,7 +843,7 @@ namespace Lucene.Net.Index
int initialDocID = docsEnum.DocID;
Assert.AreEqual(-1, initialDocID, "inital docID should be -1" + docsEnum);
- if (VERBOSE)
+ if (Verbose)
{
if (prevDocsEnum == null)
{
@@ -864,7 +864,7 @@ namespace Lucene.Net.Index
if (!alwaysTestMax && options.Contains(Option.PARTIAL_DOC_CONSUME) && expected.DocFreq > 1 && Random.Next(10) == 7)
{
stopAt = Random.Next(expected.DocFreq - 1);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" will not consume all docs (" + stopAt + " vs " + expected.DocFreq + ")");
}
@@ -872,7 +872,7 @@ namespace Lucene.Net.Index
else
{
stopAt = expected.DocFreq;
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" consume all docs");
}
@@ -890,7 +890,7 @@ namespace Lucene.Net.Index
double payloadCheckChance = alwaysTestMax ? 1.0 : Random.NextDouble();
double offsetCheckChance = alwaysTestMax ? 1.0 : Random.NextDouble();
- if (VERBOSE)
+ if (Verbose)
{
if (options.Contains(Option.SKIPPING))
{
@@ -957,7 +957,7 @@ namespace Lucene.Net.Index
if (expected.Upto >= stopAt)
{
int target = Random.NextBoolean() ? maxDoc : DocsEnum.NO_MORE_DOCS;
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" now advance to end (target=" + target + ")");
}
@@ -966,7 +966,7 @@ namespace Lucene.Net.Index
}
else
{
- if (VERBOSE)
+ if (Verbose)
{
if (targetDocID != -1)
{
@@ -984,7 +984,7 @@ namespace Lucene.Net.Index
else
{
expected.NextDoc();
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" now nextDoc to " + expected.DocID + " (" + expected.Upto + " of " + stopAt + ")");
}
@@ -998,7 +998,7 @@ namespace Lucene.Net.Index
if (doCheckFreqs && Random.NextDouble() <= freqAskChance)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" now freq()=" + expected.Freq);
}
@@ -1022,7 +1022,7 @@ namespace Lucene.Net.Index
for (int i = 0; i < numPosToConsume; i++)
{
int pos = expected.NextPosition();
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" now nextPosition to " + pos);
}
@@ -1033,7 +1033,7 @@ namespace Lucene.Net.Index
BytesRef expectedPayload = expected.GetPayload();
if (Random.NextDouble() <= payloadCheckChance)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" now check expectedPayload length=" + (expectedPayload == null ? 0 : expectedPayload.Length));
}
@@ -1059,7 +1059,7 @@ namespace Lucene.Net.Index
}
else
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" skip check payload length=" + (expectedPayload == null ? 0 : expectedPayload.Length));
}
@@ -1070,7 +1070,7 @@ namespace Lucene.Net.Index
{
if (Random.NextDouble() <= offsetCheckChance)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" now check offsets: startOff=" + expected.StartOffset + " endOffset=" + expected.EndOffset);
}
@@ -1079,7 +1079,7 @@ namespace Lucene.Net.Index
}
else
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" skip check offsets");
}
@@ -1087,7 +1087,7 @@ namespace Lucene.Net.Index
}
else if (fieldInfo.IndexOptions.CompareTo(IndexOptions.DOCS_AND_FREQS_AND_POSITIONS_AND_OFFSETS) < 0)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" now check offsets are -1");
}
@@ -1189,7 +1189,7 @@ namespace Lucene.Net.Index
{
// Seek by random field+term:
fieldAndTerm = allTerms[upto++];
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("\nTEST: seek to term=" + fieldAndTerm.Field + ":" + fieldAndTerm.Term.Utf8ToString());
}
@@ -1199,7 +1199,7 @@ namespace Lucene.Net.Index
// Seek by previous saved TermState
int idx = Random.Next(termStates.Count);
fieldAndTerm = termStateTerms[idx];
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("\nTEST: seek using TermState to term=" + fieldAndTerm.Field + ":" + fieldAndTerm.Term.Utf8ToString());
}
@@ -1252,7 +1252,7 @@ namespace Lucene.Net.Index
if (alwaysTestMax || Random.Next(10) == 7)
{
// Try same term again
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: try enum again on same term");
}
diff --git a/src/Lucene.Net.TestFramework/Index/BaseStoredFieldsFormatTestCase.cs b/src/Lucene.Net.TestFramework/Index/BaseStoredFieldsFormatTestCase.cs
index a33229d..9e03dde 100644
--- a/src/Lucene.Net.TestFramework/Index/BaseStoredFieldsFormatTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Index/BaseStoredFieldsFormatTestCase.cs
@@ -102,7 +102,7 @@ namespace Lucene.Net.Index
IDictionary<string, Document> docs = new Dictionary<string, Document>();
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: build index docCount=" + docCount);
}
@@ -116,7 +116,7 @@ namespace Lucene.Net.Index
string id = "" + i;
idField.SetStringValue(id);
docs[id] = doc;
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: add doc id=" + id);
}
@@ -143,7 +143,7 @@ namespace Lucene.Net.Index
if (rand.Next(5) == 3 && i > 0)
{
string delID = "" + rand.Next(i);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: delete doc id=" + delID);
}
@@ -152,7 +152,7 @@ namespace Lucene.Net.Index
}
}
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: " + docs.Count + " docs in index; now load fields");
}
@@ -166,7 +166,7 @@ namespace Lucene.Net.Index
{
IndexSearcher s = NewSearcher(r);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: cycle x=" + x + " r=" + r);
}
@@ -175,7 +175,7 @@ namespace Lucene.Net.Index
for (int iter = 0; iter < num; iter++)
{
string testID = idsList[rand.Next(idsList.Length)];
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: test id=" + testID);
}
diff --git a/src/Lucene.Net.TestFramework/Index/RandomIndexWriter.cs b/src/Lucene.Net.TestFramework/Index/RandomIndexWriter.cs
index 1a54d79..196f1b9 100644
--- a/src/Lucene.Net.TestFramework/Index/RandomIndexWriter.cs
+++ b/src/Lucene.Net.TestFramework/Index/RandomIndexWriter.cs
@@ -164,7 +164,7 @@ namespace Lucene.Net.Index
IndexWriter = MockIndexWriter(dir, c, r);
flushAt = TestUtil.NextInt32(r, 10, 1000);
codec = IndexWriter.Config.Codec;
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine("RIW dir=" + dir + " config=" + IndexWriter.Config);
Console.WriteLine("codec default=" + codec.Name);
@@ -264,7 +264,7 @@ namespace Lucene.Net.Index
{
if (docCount++ == flushAt)
{
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine("RIW.add/updateDocument: now doing a commit at docCount=" + docCount);
}
@@ -425,7 +425,7 @@ namespace Lucene.Net.Index
if (r.NextBoolean() || segCount == 0)
{
// full forceMerge
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine("RIW: doRandomForceMerge(1)");
}
@@ -435,7 +435,7 @@ namespace Lucene.Net.Index
{
// partial forceMerge
int limit = TestUtil.NextInt32(r, 1, segCount);
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine("RIW: doRandomForceMerge(" + limit + ")");
}
@@ -457,7 +457,7 @@ namespace Lucene.Net.Index
// order during searching:
if (!applyDeletions || !codec.Name.Equals("Lucene3x", StringComparison.Ordinal) && r.NextBoolean())
{
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine("RIW.getReader: use NRT reader");
}
@@ -469,7 +469,7 @@ namespace Lucene.Net.Index
}
else
{
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine("RIW.getReader: open new reader");
}
diff --git a/src/Lucene.Net.TestFramework/Index/ThreadedIndexingAndSearchingTestCase.cs b/src/Lucene.Net.TestFramework/Index/ThreadedIndexingAndSearchingTestCase.cs
index 23894ff..d6a4a53 100644
--- a/src/Lucene.Net.TestFramework/Index/ThreadedIndexingAndSearchingTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Index/ThreadedIndexingAndSearchingTestCase.cs
@@ -173,9 +173,9 @@ namespace Lucene.Net.Index
{
// Occasional longish pause if running
// nightly
- if (LuceneTestCase.TEST_NIGHTLY && Random.Next(6) == 3)
+ if (LuceneTestCase.TestNightly && Random.Next(6) == 3)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(Thread.CurrentThread.Name + ": now long sleep");
}
@@ -186,7 +186,7 @@ namespace Lucene.Net.Index
if (Random.Next(7) == 5)
{
Thread.Sleep(TestUtil.NextInt32(Random, 1, 10));
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(Thread.CurrentThread.Name + ": done sleep");
}
@@ -262,7 +262,7 @@ namespace Lucene.Net.Index
delSubDocs.Deleted = true;
delIDs.UnionWith(delSubDocs.SubIDs);
outerInstance.m_delCount.AddAndGet(delSubDocs.SubIDs.Count);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(Thread.CurrentThread.Name + ": update pack packID=" + delSubDocs.PackID +
" count=" + docsList.Count + " docs=" + string.Format(J2N.Text.StringFormatter.InvariantCulture, "{0}", docIDs));
@@ -271,7 +271,7 @@ namespace Lucene.Net.Index
}
else
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(Thread.CurrentThread.Name + ": add pack packID=" + packID +
" count=" + docsList.Count + " docs=" + string.Format(J2N.Text.StringFormatter.InvariantCulture, "{0}", docIDs));
@@ -282,7 +282,7 @@ namespace Lucene.Net.Index
if (Random.Next(5) == 2)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(Thread.CurrentThread.Name + ": buffer del id:" + packID);
}
@@ -293,7 +293,7 @@ namespace Lucene.Net.Index
{
// Add single doc
string docid = doc.Get("docid");
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(Thread.CurrentThread.Name + ": add doc docid:" + docid);
}
@@ -302,7 +302,7 @@ namespace Lucene.Net.Index
if (Random.Next(5) == 3)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(Thread.CurrentThread.Name + ": buffer del id:" + doc.Get("docid"));
}
@@ -315,7 +315,7 @@ namespace Lucene.Net.Index
// Update single doc, but we never re-use
// and ID so the delete will never
// actually happen:
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(Thread.CurrentThread.Name + ": update doc id:" + doc.Get("docid"));
}
@@ -325,7 +325,7 @@ namespace Lucene.Net.Index
if (Random.Next(5) == 3)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(Thread.CurrentThread.Name + ": buffer del id:" + doc.Get("docid"));
}
@@ -335,20 +335,20 @@ namespace Lucene.Net.Index
if (Random.Next(30) == 17)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(Thread.CurrentThread.Name + ": apply " + toDeleteIDs.Count + " deletes");
}
foreach (string id in toDeleteIDs)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(Thread.CurrentThread.Name + ": del term=id:" + id);
}
outerInstance.DeleteDocuments(new Term("docid", id));
}
int count = outerInstance.m_delCount.AddAndGet(toDeleteIDs.Count);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(Thread.CurrentThread.Name + ": tot " + count + " deletes");
}
@@ -361,7 +361,7 @@ namespace Lucene.Net.Index
delPackIDs.Add(subDocs.PackID);
outerInstance.DeleteDocuments(new Term("packID", subDocs.PackID));
subDocs.Deleted = true;
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(Thread.CurrentThread.Name + ": del subs: " + subDocs.SubIDs + " packID=" + subDocs.PackID);
}
@@ -384,7 +384,7 @@ namespace Lucene.Net.Index
throw new Exception(t.ToString(), t);
}
}
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(Thread.CurrentThread.Name + ": indexing done");
}
@@ -415,7 +415,7 @@ namespace Lucene.Net.Index
searchThreads[thread].Join();
}
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: DONE search: totHits=" + totHits);
}
@@ -439,7 +439,7 @@ namespace Lucene.Net.Index
public override void Run()
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(Thread.CurrentThread.Name + ": launch search thread");
}
@@ -571,7 +571,7 @@ namespace Lucene.Net.Index
analyzer.MaxTokenLength = TestUtil.NextInt32(LuceneTestCase.Random, 1, IndexWriter.MAX_TERM_LENGTH);
IndexWriterConfig conf = NewIndexWriterConfig(TEST_VERSION_CURRENT, analyzer).SetInfoStream(new FailOnNonBulkMergesInfoStream());
- if (LuceneTestCase.TEST_NIGHTLY)
+ if (LuceneTestCase.TestNightly)
{
// newIWConfig makes smallish max seg size, which
// results in tons and tons of segments for this test
@@ -593,7 +593,7 @@ namespace Lucene.Net.Index
conf.SetMergedSegmentWarmer(new IndexReaderWarmerAnonymousInnerClassHelper(this));
- if (VERBOSE)
+ if (Verbose)
{
conf.SetInfoStream(new PrintStreamInfoStreamAnonymousInnerClassHelper(this, Console.Out));
}
@@ -606,7 +606,7 @@ namespace Lucene.Net.Index
int NUM_INDEX_THREADS = TestUtil.NextInt32(LuceneTestCase.Random, 2, 4);
- int RUN_TIME_SEC = LuceneTestCase.TEST_NIGHTLY ? 300 : RANDOM_MULTIPLIER;
+ int RUN_TIME_SEC = LuceneTestCase.TestNightly ? 300 : RandomMultiplier;
ISet<string> delIDs = new ConcurrentHashSet<string>();
ISet<string> delPackIDs = new ConcurrentHashSet<string>();
@@ -616,7 +616,7 @@ namespace Lucene.Net.Index
ThreadJob[] indexThreads = LaunchIndexingThreads(docs, NUM_INDEX_THREADS, stopTime, delIDs, delPackIDs, allSubDocs);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: DONE start " + NUM_INDEX_THREADS + " indexing threads [" + (Environment.TickCount - t0) + " ms]");
}
@@ -626,7 +626,7 @@ namespace Lucene.Net.Index
DoSearching(es, stopTime);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: all searching done [" + (Environment.TickCount - t0) + " ms]");
}
@@ -636,13 +636,13 @@ namespace Lucene.Net.Index
indexThreads[thread].Join();
}
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: done join indexing threads [" + (Environment.TickCount - t0) + " ms]; addCount=" + m_addCount + " delCount=" + m_delCount);
}
IndexSearcher s = GetFinalSearcher();
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: finalSearcher=" + s);
}
@@ -775,7 +775,7 @@ namespace Lucene.Net.Index
//System.IO.Directory.Delete(tempDir.FullName, true);
TestUtil.Rm(tempDir);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: done [" + (Environment.TickCount - t0) + " ms]");
}
@@ -792,7 +792,7 @@ namespace Lucene.Net.Index
public override void Warm(AtomicReader reader)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: now warm merged reader=" + reader);
}
@@ -821,7 +821,7 @@ namespace Lucene.Net.Index
sum += searcher.Search(new TermQuery(new Term("body", "united")), 10).TotalHits;
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: warm visited " + sum + " fields");
}
diff --git a/src/Lucene.Net.TestFramework/Search/ShardSearchingTestBase.cs b/src/Lucene.Net.TestFramework/Search/ShardSearchingTestBase.cs
index 4da7acb..453adae 100644
--- a/src/Lucene.Net.TestFramework/Search/ShardSearchingTestBase.cs
+++ b/src/Lucene.Net.TestFramework/Search/ShardSearchingTestBase.cs
@@ -162,7 +162,7 @@ namespace Lucene.Net.Search
// collection stats to all other nodes:
internal virtual void BroadcastNodeReopen(int nodeID, long version, IndexSearcher newSearcher)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("REOPEN: nodeID=" + nodeID + " version=" + version + " maxDoc=" + newSearcher.IndexReader.MaxDoc);
}
@@ -581,7 +581,7 @@ namespace Lucene.Net.Search
analyzer.MaxTokenLength = TestUtil.NextInt32(LuceneTestCase.Random, 1, IndexWriter.MAX_TERM_LENGTH);
IndexWriterConfig iwc = new IndexWriterConfig(TEST_VERSION_CURRENT, analyzer);
iwc.SetOpenMode(OpenMode.CREATE);
- if (VERBOSE)
+ if (Verbose)
{
iwc.SetInfoStream(new TextWriterInfoStream(Console.Out));
}
diff --git a/src/Lucene.Net.TestFramework/Store/MockDirectoryWrapper.cs b/src/Lucene.Net.TestFramework/Store/MockDirectoryWrapper.cs
index 08a4c40..ff08f44 100644
--- a/src/Lucene.Net.TestFramework/Store/MockDirectoryWrapper.cs
+++ b/src/Lucene.Net.TestFramework/Store/MockDirectoryWrapper.cs
@@ -392,7 +392,7 @@ namespace Lucene.Net.Store
@out.Length = 0;
}
}
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine("MockDirectoryWrapper: " + action + " unsynced file: " + name);
}
@@ -476,7 +476,7 @@ namespace Lucene.Net.Store
{
if (randomState.NextDouble() < randomIOExceptionRate)
{
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine(Thread.CurrentThread.Name + ": MockDirectoryWrapper: now throw random exception" + (message == null ? "" : " (" + message + ")"));
}
@@ -488,7 +488,7 @@ namespace Lucene.Net.Store
{
if (randomState.NextDouble() < randomIOExceptionRateOnOpen)
{
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine(Thread.CurrentThread.Name + ": MockDirectoryWrapper: now throw random exception during open file=" + name);
}
@@ -688,7 +688,7 @@ namespace Lucene.Net.Store
// throttling REALLY slows down tests, so don't do it very often for SOMETIMES.
if (throttling == Throttling.ALWAYS || (throttling == Throttling.SOMETIMES && randomState.Next(50) == 0) && !(m_input is RateLimitedDirectoryWrapper))
{
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine("MockDirectoryWrapper: throttling indexOutput (" + name + ")");
}
@@ -767,7 +767,7 @@ namespace Lucene.Net.Store
int randomInt = randomState.Next(500);
if (randomInt == 0)
{
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine("MockDirectoryWrapper: using SlowClosingMockIndexInputWrapper for file " + name);
}
@@ -775,7 +775,7 @@ namespace Lucene.Net.Store
}
else if (randomInt == 1)
{
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine("MockDirectoryWrapper: using SlowOpeningMockIndexInputWrapper for file " + name);
}
@@ -895,12 +895,12 @@ namespace Lucene.Net.Store
randomIOExceptionRateOnOpen = 0.0;
if (DirectoryReader.IndexExists(this))
{
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine("\nNOTE: MockDirectoryWrapper: now crush");
}
Crash(); // corrupt any unsynced-files
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine("\nNOTE: MockDirectoryWrapper: now run CheckIndex");
}
@@ -926,7 +926,7 @@ namespace Lucene.Net.Store
// this is possible if we hit an exception while writing segments.gen, we try to delete it
// and it ends out in pendingDeletions (but IFD wont remove this).
startSet.Add("segments.gen");
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine("MDW: Unreferenced check: Ignoring segments.gen that we could not delete.");
}
@@ -940,7 +940,7 @@ namespace Lucene.Net.Store
if (file.StartsWith("segments", StringComparison.Ordinal) && !file.Equals("segments.gen", StringComparison.Ordinal) && endSet.Contains(file))
{
startSet.Add(file);
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine("MDW: Unreferenced check: Ignoring segments file: " + file + " that we could not delete.");
}
@@ -964,7 +964,7 @@ namespace Lucene.Net.Store
if (endSet.Contains(s) && !startSet.Contains(s))
{
Debug.Assert(pendingDeletions.Contains(s));
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine("MDW: Unreferenced check: Ignoring referenced file: " + s + " " +
"from " + file + " that we could not delete.");
diff --git a/src/Lucene.Net.TestFramework/Support/Configuration/ConfigurationSettingTestCase.cs b/src/Lucene.Net.TestFramework/Support/Configuration/ConfigurationSettingTestCase.cs
index 413e7b0..4a1eba4 100644
--- a/src/Lucene.Net.TestFramework/Support/Configuration/ConfigurationSettingTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Support/Configuration/ConfigurationSettingTestCase.cs
@@ -5,21 +5,21 @@ using System;
namespace Lucene.Net.Configuration
{
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
/// <summary>
/// Base class for testing configuration settings.
@@ -40,7 +40,23 @@ namespace Lucene.Net.Configuration
var configuration = LoadConfiguration();
// Set up mocks for ConfigurationSettings and SystemProperties
ConfigurationSettings = new ConfigurationSettingsImpl(configuration);
- SystemProperties = new Properties(() => configuration);
+ var factory = new ConfigurationFactoryImpl(ConfigurationSettings);
+ SystemProperties = new Properties(() => factory);
+ }
+
+ private class ConfigurationFactoryImpl : IConfigurationFactory
+ {
+ private readonly IConfigurationSettings configurationSettings;
+
+ public ConfigurationFactoryImpl(IConfigurationSettings configurationSettings)
+ {
+ this.configurationSettings = configurationSettings ?? throw new ArgumentNullException(nameof(configurationSettings));
+ }
+
+ public IConfiguration GetConfiguration()
+ {
+ return configurationSettings.CurrentConfiguration;
+ }
}
[CLSCompliant(false)]
diff --git a/src/Lucene.Net.TestFramework/Util/Fst/FSTTester.cs b/src/Lucene.Net.TestFramework/Util/Fst/FSTTester.cs
index 2c817b6..8db4255 100644
--- a/src/Lucene.Net.TestFramework/Util/Fst/FSTTester.cs
+++ b/src/Lucene.Net.TestFramework/Util/Fst/FSTTester.cs
@@ -308,7 +308,7 @@ namespace Lucene.Net.Util.Fst
internal virtual FST<T> DoTest(int prune1, int prune2, bool allowRandomSuffixSharing)
{
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine("\nTEST: prune1=" + prune1 + " prune2=" + prune2);
}
@@ -326,7 +326,7 @@ namespace Lucene.Net.Util.Fst
PackedInt32s.DEFAULT,
true,
15);
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
if (willRewrite)
{
@@ -375,7 +375,7 @@ namespace Lucene.Net.Util.Fst
}
}
- if (LuceneTestCase.VERBOSE && pairs.Count <= 20 && fst != null)
+ if (LuceneTestCase.Verbose && pairs.Count <= 20 && fst != null)
{
using (TextWriter w = new StreamWriter(new FileStream("out.dot", FileMode.OpenOrCreate), Encoding.UTF8))
{
@@ -384,7 +384,7 @@ namespace Lucene.Net.Util.Fst
Console.WriteLine("SAVED out.dot");
}
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
if (fst == null)
{
@@ -450,7 +450,7 @@ namespace Lucene.Net.Util.Fst
return;
}
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine("TEST: now verify " + pairs.Count + " terms");
foreach (InputOutput<T> pair in pairs)
@@ -467,7 +467,7 @@ namespace Lucene.Net.Util.Fst
// visit valid pairs in order -- make sure all words
// are accepted, and FSTEnum's next() steps through
// them correctly
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine("TEST: check valid terms/next()");
}
@@ -476,7 +476,7 @@ namespace Lucene.Net.Util.Fst
foreach (InputOutput<T> pair in pairs)
{
Int32sRef term = pair.Input;
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine("TEST: check term=" + InputToString(inputMode, term) + " output=" + fst.Outputs.OutputToString(pair.Output));
}
@@ -516,7 +516,7 @@ namespace Lucene.Net.Util.Fst
}
// find random matching word and make sure it's valid
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine("TEST: verify random accepted terms");
}
@@ -539,7 +539,7 @@ namespace Lucene.Net.Util.Fst
}
// test IntsRefFSTEnum.Seek:
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine("TEST: verify seek");
}
@@ -547,7 +547,7 @@ namespace Lucene.Net.Util.Fst
num_ = LuceneTestCase.AtLeast(random, 100);
for (int iter = 0; iter < num_; iter++)
{
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine(" iter=" + iter);
}
@@ -566,7 +566,7 @@ namespace Lucene.Net.Util.Fst
Int32sRefFSTEnum.InputOutput<T> seekResult;
if (random.Next(3) == 0)
{
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine(" do non-exist seekExact term=" + InputToString(inputMode, term));
}
@@ -575,7 +575,7 @@ namespace Lucene.Net.Util.Fst
}
else if (random.NextBoolean())
{
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine(" do non-exist seekFloor term=" + InputToString(inputMode, term));
}
@@ -584,7 +584,7 @@ namespace Lucene.Net.Util.Fst
}
else
{
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine(" do non-exist seekCeil term=" + InputToString(inputMode, term));
}
@@ -595,7 +595,7 @@ namespace Lucene.Net.Util.Fst
{
//System.out.println(" got " + inputToString(inputMode,seekResult.input) + " output=" + fst.Outputs.outputToString(seekResult.Output));
Assert.IsNotNull(seekResult, "got null but expected term=" + InputToString(inputMode, pairs[pos].Input));
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine(" got " + InputToString(inputMode, seekResult.Input));
}
@@ -607,7 +607,7 @@ namespace Lucene.Net.Util.Fst
// seeked before start or beyond end
//System.out.println("seek=" + seekTerm);
Assert.IsNull(seekResult, "expected null but got " + (seekResult == null ? "null" : InputToString(inputMode, seekResult.Input)));
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine(" got null");
}
@@ -624,7 +624,7 @@ namespace Lucene.Net.Util.Fst
Int32sRefFSTEnum.InputOutput<T> seekResult;
if (random.Next(3) == 2)
{
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine(" do exists seekExact term=" + InputToString(inputMode, pair.Input));
}
@@ -632,7 +632,7 @@ namespace Lucene.Net.Util.Fst
}
else if (random.NextBoolean())
{
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine(" do exists seekFloor " + InputToString(inputMode, pair.Input));
}
@@ -640,7 +640,7 @@ namespace Lucene.Net.Util.Fst
}
else
{
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine(" do exists seekCeil " + InputToString(inputMode, pair.Input));
}
@@ -652,7 +652,7 @@ namespace Lucene.Net.Util.Fst
}
}
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine("TEST: mixed next/seek");
}
@@ -661,7 +661,7 @@ namespace Lucene.Net.Util.Fst
num_ = LuceneTestCase.AtLeast(random, 100);
for (int iter = 0; iter < num_; iter++)
{
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine("TEST: iter " + iter);
}
@@ -675,7 +675,7 @@ namespace Lucene.Net.Util.Fst
{
// next
upto++;
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine(" do next");
}
@@ -697,7 +697,7 @@ namespace Lucene.Net.Util.Fst
{
upto--;
Assert.IsTrue(upto != -1);
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine(" do non-exist seekFloor(" + InputToString(inputMode, term) + ")");
}
@@ -705,7 +705,7 @@ namespace Lucene.Net.Util.Fst
}
else
{
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine(" do non-exist seekCeil(" + InputToString(inputMode, term) + ")");
}
@@ -731,7 +731,7 @@ namespace Lucene.Net.Util.Fst
if (random.NextBoolean())
{
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine(" do seekCeil(" + InputToString(inputMode, pairs[upto].Input) + ")");
}
@@ -739,14 +739,14 @@ namespace Lucene.Net.Util.Fst
}
else
{
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine(" do seekFloor(" + InputToString(inputMode, pairs[upto].Input) + ")");
}
isDone = fstEnum_.SeekFloor(pairs[upto].Input) == null;
}
}
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
if (!isDone)
{
@@ -803,7 +803,7 @@ namespace Lucene.Net.Util.Fst
// FST is pruned
private void VerifyPruned(int inputMode, FST<T> fst, int prune1, int prune2)
{
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine("TEST: now verify pruned " + pairs.Count + " terms; outputs=" + outputs);
foreach (InputOutput<T> pair in pairs)
@@ -860,7 +860,7 @@ namespace Lucene.Net.Util.Fst
}
}
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine("TEST: now prune");
}
@@ -874,7 +874,7 @@ namespace Lucene.Net.Util.Fst
KeyValuePair<Int32sRef, CountMinOutput<T>> ent = prefixes.ElementAt(i);
Int32sRef prefix = ent.Key;
CountMinOutput<T> cmo = ent.Value;
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine(" term prefix=" + InputToString(inputMode, prefix, false) + " count=" + cmo.Count + " isLeaf=" + cmo.IsLeaf + " output=" + outputs.OutputToString(cmo.Output) + " isFinal=" + cmo.IsFinal);
}
@@ -932,7 +932,7 @@ namespace Lucene.Net.Util.Fst
}
}
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine("TEST: after prune");
foreach (KeyValuePair<Int32sRef, CountMinOutput<T>> ent in prefixes)
@@ -954,7 +954,7 @@ namespace Lucene.Net.Util.Fst
Assert.IsNotNull(fst);
// make sure FST only enums valid prefixes
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine("TEST: check pruned enum");
}
@@ -962,7 +962,7 @@ namespace Lucene.Net.Util.Fst
Int32sRefFSTEnum.InputOutput<T> current;
while ((current = fstEnum.Next()) != null)
{
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine(" fstEnum.next prefix=" + InputToString(inputMode, current.Input, false) + " output=" + outputs.OutputToString(current.Output));
}
@@ -981,7 +981,7 @@ namespace Lucene.Net.Util.Fst
}
// make sure all non-pruned prefixes are present in the FST
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine("TEST: verify all prefixes");
}
@@ -992,7 +992,7 @@ namespace Lucene.Net.Util.Fst
{
CountMinOutput<T> cmo = ent.Value;
T output = Run(fst, ent.Key, stopNode);
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine("TEST: verify prefix=" + InputToString(inputMode, ent.Key, false) + " output=" + outputs.OutputToString(cmo.Output));
}
diff --git a/src/Lucene.Net.TestFramework/Util/LineFileDocs.cs b/src/Lucene.Net.TestFramework/Util/LineFileDocs.cs
index 8ded83c..558db53 100644
--- a/src/Lucene.Net.TestFramework/Util/LineFileDocs.cs
+++ b/src/Lucene.Net.TestFramework/Util/LineFileDocs.cs
@@ -52,12 +52,12 @@ namespace Lucene.Net.Util
}
public LineFileDocs(Random random)
- : this(random, LuceneTestCase.TEST_LINE_DOCS_FILE, true)
+ : this(random, LuceneTestCase.TestLineDocsFile, true)
{
}
public LineFileDocs(Random random, bool useDocValues)
- : this(random, LuceneTestCase.TEST_LINE_DOCS_FILE, useDocValues)
+ : this(random, LuceneTestCase.TestLineDocsFile, useDocValues)
{
}
@@ -130,7 +130,7 @@ namespace Lucene.Net.Util
// optimized seek using RandomAccessFile:
seekTo = RandomSeekPos(random, size);
FileStream channel = new FileStream(path, FileMode.Open);
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine("TEST: LineFileDocs: file seek to fp=" + seekTo + " on open");
}
@@ -165,7 +165,7 @@ namespace Lucene.Net.Util
if (needSkip)
{
seekTo = RandomSeekPos(random, size);
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine("TEST: LineFileDocs: stream skip to fp=" + seekTo + " on open");
}
@@ -270,7 +270,7 @@ namespace Lucene.Net.Util
if (line == null)
{
// Always rewind at end:
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine("TEST: LineFileDocs: now rewind file...");
}
diff --git a/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs b/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
index 85711d9..60f69bf 100644
--- a/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
@@ -22,6 +22,7 @@ using System.IO;
using System.Linq;
using System.Reflection;
using System.Runtime.CompilerServices;
+using System.Threading;
using System.Threading.Tasks;
using System.Text.RegularExpressions;
using JCG = J2N.Collections.Generic;
@@ -212,10 +213,10 @@ namespace Lucene.Net.Util
// Test groups, system properties and other annotations modifying tests
// --------------------------------------------------------------------
- public const string SYSPROP_NIGHTLY = "tests:nightly";
- public const string SYSPROP_WEEKLY = "tests:weekly";
- public const string SYSPROP_AWAITSFIX = "tests:awaitsfix";
- public const string SYSPROP_SLOW = "tests:slow";
+ internal const string SYSPROP_NIGHTLY = "tests:nightly";
+ internal const string SYSPROP_WEEKLY = "tests:weekly";
+ internal const string SYSPROP_AWAITSFIX = "tests:awaitsfix";
+ internal const string SYSPROP_SLOW = "tests:slow";
internal const string SYSPROP_BADAPPLES = "tests:badapples"; // LUCENENET specific - made internal, because not fully implemented
///// <seealso cref="IgnoreAfterMaxFailures"/>
@@ -235,7 +236,8 @@ namespace Lucene.Net.Util
{
public void ApplyToTest(NUnit.Framework.Internal.Test test)
{
- if (!TEST_NIGHTLY)
+ LuceneTestFrameworkInitializer.EnsureInitialized();
+ if (!TestNightly)
{
test.RunState = RunState.Skipped;
test.Properties.Set(PropertyNames.SkipReason, "This is a nightly test.");
@@ -258,7 +260,8 @@ namespace Lucene.Net.Util
{
public void ApplyToTest(NUnit.Framework.Internal.Test test)
{
- if (!TEST_WEEKLY)
+ LuceneTestFrameworkInitializer.EnsureInitialized();
+ if (!TestWeekly)
{
test.RunState = RunState.Skipped;
test.Properties.Set(PropertyNames.SkipReason, "This is a weekly test.");
@@ -281,7 +284,8 @@ namespace Lucene.Net.Util
{
public void ApplyToTest(NUnit.Framework.Internal.Test test)
{
- if (!TEST_AWAITSFIX)
+ LuceneTestFrameworkInitializer.EnsureInitialized();
+ if (!TestAwaitsFix)
{
test.RunState = RunState.Ignored;
test.Properties.Set(PropertyNames.SkipReason, BugUrl);
@@ -308,18 +312,19 @@ namespace Lucene.Net.Util
{
void IApplyToTest.ApplyToTest(NUnit.Framework.Internal.Test test)
{
+ LuceneTestFrameworkInitializer.EnsureInitialized();
// The test framework setting overrides the NUnit category setting, if false
- if (!TEST_SLOW)
+ if (!TestSlow)
{
test.RunState = RunState.Skipped;
- test.Properties.Set(PropertyNames.SkipReason, Description);
+ test.Properties.Set(PropertyNames.SkipReason, Message);
}
test.Properties.Add(PropertyNames.Category, "Slow");
}
#else
{
#endif
- public string Description { get; set; } = "This test is slow.";
+ public string Message { get; set; } = "This test is slow.";
}
/////// <summary>
@@ -365,6 +370,7 @@ namespace Lucene.Net.Util
{
this.Value = value;
}
+
[WritableArray]
[SuppressMessage("Microsoft.Performance", "CA1819", Justification = "Lucene's design requires some writable array properties")]
public string[] Value { get; private set; }
@@ -397,97 +403,195 @@ namespace Lucene.Net.Util
/// Use this constant when creating Analyzers and any other version-dependent stuff.
/// <para/><b>NOTE:</b> Change this when development starts for new Lucene version:
/// </summary>
- public static readonly LuceneVersion TEST_VERSION_CURRENT = LuceneVersion.LUCENE_48;
+ public const LuceneVersion TEST_VERSION_CURRENT = LuceneVersion.LUCENE_48;
+
+ // LUCENENET specific - need to jump through a few hoops in order to
+ // ensure the test configuration data is loaded before anything utilizes
+ // it. We simply isolate this all in a SystemPropertyData class that is
+ // lazily loaded the first time the SystemPropertyHolder property is called.
+ private static SystemPropertyData testProperties;
+ private static SystemPropertyData TestProperties
+ => LazyInitializer.EnsureInitialized(ref testProperties, () => new SystemPropertyData());
/// <summary>
- /// True if and only if tests are run in verbose mode. If this flag is false
- /// tests are not expected to print any messages.
+ /// Used to defer static initialization of system properties
+ /// until they are called explicitly.
/// </summary>
- public static readonly bool VERBOSE = SystemProperties.GetPropertyAsBoolean("tests:verbose",
+ private class SystemPropertyData // LUCENENET specific
+ {
+ public SystemPropertyData()
+ {
+ // LUCENENET: Always ensure the system properties are initailized before any attempt to read them.
+ LuceneTestFrameworkInitializer.EnsureInitialized();
+ Verbose = SystemProperties.GetPropertyAsBoolean("tests:verbose", // LUCENENET specific - reformatted with :
#if DEBUG
- true
+ true
#else
- false
+ false
#endif
-); // LUCENENET specific - reformatted with :
+ );
+ UseInfoStream = SystemProperties.GetPropertyAsBoolean("tests:infostream", Verbose); // LUCENENET specific - reformatted with :
+ RandomMultiplier = SystemProperties.GetPropertyAsInt32("tests:multiplier", 1); // LUCENENET specific - reformatted with :
+ TestCodec = SystemProperties.GetProperty("tests:codec", "random");// LUCENENET specific - reformatted with :
+ TestPostingsFormat = SystemProperties.GetProperty("tests:postingsformat", "random"); // LUCENENET specific - reformatted with :
+ TestDocValuesFormat = SystemProperties.GetProperty("tests:docvaluesformat", "random"); // LUCENENET specific - reformatted with :
+ TestDirectory = SystemProperties.GetProperty("tests:directory", "random"); // LUCENENET specific - reformatted with :
+ TestLineDocsFile = SystemProperties.GetProperty("tests:linedocsfile", DEFAULT_LINE_DOCS_FILE); // LUCENENET specific - reformatted with :
+ TestNightly = SystemProperties.GetPropertyAsBoolean(SYSPROP_NIGHTLY, false);
+ TestWeekly = SystemProperties.GetPropertyAsBoolean(SYSPROP_WEEKLY, false);
+ TestAwaitsFix = SystemProperties.GetPropertyAsBoolean(SYSPROP_AWAITSFIX, false);
+ TestSlow = SystemProperties.GetPropertyAsBoolean(SYSPROP_SLOW, true); // LUCENENET specific - made default true, as per the docs
+ TestThrottling = TestNightly ? Throttling.SOMETIMES : Throttling.NEVER;
+ LeaveTemporary = LoadLeaveTemorary();
+ }
+
+
+ /// <summary>
+ /// True if and only if tests are run in verbose mode. If this flag is false
+ /// tests are not expected to print any messages.
+ /// </summary>
+ public bool Verbose { get; }
+
+ /// <summary>
+ /// TODO: javadoc? </summary>
+ public bool UseInfoStream { get; }
+
+ /// <summary>
+ /// A random multiplier which you should use when writing random tests:
+ /// multiply it by the number of iterations to scale your tests (for nightly builds).
+ /// </summary>
+ public int RandomMultiplier { get; } // LUCENENET specific - changed from field to property, and renamed
+
+ /// <summary>
+ /// Gets the codec to run tests with. </summary>
+ public string TestCodec { get; } // LUCENENET specific - changed from field to property, and renamed
+
+ /// <summary>
+ /// Gets the postingsFormat to run tests with. </summary>
+ public string TestPostingsFormat { get; } // LUCENENET specific - changed from field to property, and renamed
+
+ /// <summary>
+ /// Gets the docValuesFormat to run tests with </summary>
+ public string TestDocValuesFormat { get; } // LUCENENET specific - changed from field to property, and renamed
+
+ /// <summary>
+ /// Gets the directory to run tests with </summary>
+ public string TestDirectory { get; } // LUCENENET specific - changed from field to property, and renamed
+
+ /// <summary>
+ /// The line file used by LineFileDocs </summary>
+ public string TestLineDocsFile { get; } // LUCENENET specific - changed from field to property, and renamed
+
+ /// <summary>
+ /// Whether or not <see cref="NightlyAttribute"/> tests should run. </summary>
+ public bool TestNightly { get; } // LUCENENET specific - changed from field to property, and renamed
+
+ /// <summary>
+ /// Whether or not <see cref="WeeklyAttribute"/> tests should run. </summary>
+ public bool TestWeekly { get; } // LUCENENET specific - changed from field to property, and renamed
+
+ /// <summary>
+ /// Whether or not <see cref="AwaitsFixAttribute"/> tests should run. </summary>
+ public bool TestAwaitsFix { get; } // LUCENENET specific - changed from field to property, and renamed
+
+ /// <summary>
+ /// Whether or not <see cref="SlowAttribute"/> tests should run. </summary>
+ public bool TestSlow { get; } // LUCENENET specific - changed from field to property, and renamed
+
+ /// <summary>
+ /// Throttling, see <see cref="MockDirectoryWrapper.Throttling"/>. </summary>
+ public Throttling TestThrottling { get; }
+
+ /// <summary>
+ /// Leave temporary files on disk, even on successful runs. </summary>
+ public bool LeaveTemporary { get; }
+
+ private static bool LoadLeaveTemorary()
+ {
+ bool defaultValue = false;
+ // LUCENENET specific - reformatted with :
+ foreach (string property in new string[] {
+ "tests:leaveTemporary" /* ANT tasks's (junit4) flag. */,
+ "tests:leavetemporary" /* lowercase */,
+ "tests:leavetmpdir" /* default */,
+ "solr:test:leavetmpdir" /* Solr's legacy */
+ })
+ {
+ defaultValue |= SystemProperties.GetPropertyAsBoolean(property, false);
+ }
+ return defaultValue;
+ }
+ }
+
+
+ /// <summary>
+ /// True if and only if tests are run in verbose mode. If this flag is false
+ /// tests are not expected to print any messages.
+ /// </summary>
+ public static bool Verbose => TestProperties.Verbose;
/// <summary>
/// TODO: javadoc? </summary>
- public static readonly bool INFOSTREAM = SystemProperties.GetPropertyAsBoolean("tests:infostream", VERBOSE); // LUCENENET specific - reformatted with :
+ public static bool UseInfoStream => TestProperties.UseInfoStream;
/// <summary>
/// A random multiplier which you should use when writing random tests:
/// multiply it by the number of iterations to scale your tests (for nightly builds).
/// </summary>
- public static readonly int RANDOM_MULTIPLIER = SystemProperties.GetPropertyAsInt32("tests:multiplier", 1); // LUCENENET specific - reformatted with :
+ public static int RandomMultiplier => TestProperties.RandomMultiplier; // LUCENENET specific - changed from field to property, and renamed
/// <summary>
/// TODO: javadoc? </summary>
- public static readonly string DEFAULT_LINE_DOCS_FILE = "europarl.lines.txt.gz";
+ public const string DEFAULT_LINE_DOCS_FILE = "europarl.lines.txt.gz";
/// <summary>
/// TODO: javadoc? </summary>
- public static readonly string JENKINS_LARGE_LINE_DOCS_FILE = "enwiki.random.lines.txt";
+ public const string JENKINS_LARGE_LINE_DOCS_FILE = "enwiki.random.lines.txt";
/// <summary>
/// Gets the codec to run tests with. </summary>
- public static readonly string TEST_CODEC = SystemProperties.GetProperty("tests:codec", "random");// LUCENENET specific - reformatted with :
+ public static string TestCodec => TestProperties.TestCodec; // LUCENENET specific - changed from field to property, and renamed
/// <summary>
/// Gets the postingsFormat to run tests with. </summary>
- public static readonly string TEST_POSTINGSFORMAT = SystemProperties.GetProperty("tests:postingsformat", "random"); // LUCENENET specific - reformatted with :
+ public static string TestPostingsFormat => TestProperties.TestPostingsFormat; // LUCENENET specific - changed from field to property, and renamed
/// <summary>
/// Gets the docValuesFormat to run tests with </summary>
- public static readonly string TEST_DOCVALUESFORMAT = SystemProperties.GetProperty("tests:docvaluesformat", "random"); // LUCENENET specific - reformatted with :
+ public static string TestDocValuesFormat => TestProperties.TestDocValuesFormat; // LUCENENET specific - changed from field to property, and renamed
/// <summary>
/// Gets the directory to run tests with </summary>
- public static readonly string TEST_DIRECTORY = SystemProperties.GetProperty("tests:directory", "random"); // LUCENENET specific - reformatted with :
+ public static string TestDirectory => TestProperties.TestDirectory; // LUCENENET specific - changed from field to property, and renamed
/// <summary>
/// The line file used by LineFileDocs </summary>
- public static readonly string TEST_LINE_DOCS_FILE = SystemProperties.GetProperty("tests:linedocsfile", DEFAULT_LINE_DOCS_FILE); // LUCENENET specific - reformatted with :
+ public static string TestLineDocsFile => TestProperties.TestLineDocsFile; // LUCENENET specific - changed from field to property, and renamed
/// <summary>
/// Whether or not <see cref="NightlyAttribute"/> tests should run. </summary>
- public static readonly bool TEST_NIGHTLY = SystemProperties.GetPropertyAsBoolean(SYSPROP_NIGHTLY, false);
+ public static bool TestNightly => TestProperties.TestNightly; // LUCENENET specific - changed from field to property, and renamed
/// <summary>
/// Whether or not <see cref="WeeklyAttribute"/> tests should run. </summary>
- public static readonly bool TEST_WEEKLY = SystemProperties.GetPropertyAsBoolean(SYSPROP_WEEKLY, false);
+ public static bool TestWeekly => TestProperties.TestWeekly; // LUCENENET specific - changed from field to property, and renamed
/// <summary>
/// Whether or not <see cref="AwaitsFixAttribute"/> tests should run. </summary>
- public static readonly bool TEST_AWAITSFIX = SystemProperties.GetPropertyAsBoolean(SYSPROP_AWAITSFIX, false); // LUCENENET specific - made internal, because not fully implemented
+ public static bool TestAwaitsFix => TestProperties.TestAwaitsFix; // LUCENENET specific - changed from field to property, and renamed
/// <summary>
/// Whether or not <see cref="SlowAttribute"/> tests should run. </summary>
- public static readonly bool TEST_SLOW = SystemProperties.GetPropertyAsBoolean(SYSPROP_SLOW, true); // LUCENENET specific - made default true, as per the docs
+ public static bool TestSlow => TestProperties.TestSlow; // LUCENENET specific - changed from field to property, and renamed
/// <summary>
/// Throttling, see <see cref="MockDirectoryWrapper.Throttling"/>. </summary>
- internal static readonly Throttling TEST_THROTTLING = TEST_NIGHTLY ? Throttling.SOMETIMES : Throttling.NEVER; // LUCENENET specific - made internal, because not fully implemented
+ internal static Throttling TestThrottling => TestProperties.TestThrottling; // LUCENENET specific - made internal, because not fully implemented
/// <summary>
/// Leave temporary files on disk, even on successful runs. </summary>
- public static readonly bool LEAVE_TEMPORARY = LoadLeaveTemorary();
+ public static bool LeaveTemporary => TestProperties.LeaveTemporary;
- private static bool LoadLeaveTemorary()
- {
- bool defaultValue = false;
- // LUCENENET specific - reformatted with :
- foreach (string property in new string[] {
- "tests:leaveTemporary" /* ANT tasks's (junit4) flag. */,
- "tests:leavetemporary" /* lowercase */,
- "tests:leavetmpdir" /* default */,
- "solr:test:leavetmpdir" /* Solr's legacy */
- })
- {
- defaultValue |= SystemProperties.GetPropertyAsBoolean(property, false);
- }
- return defaultValue;
- }
// LUCENENET: Not Implemented
/////// <summary>
@@ -756,25 +860,25 @@ namespace Lucene.Net.Util
Console.WriteLine(similarityName);
Console.Write("Nightly: ");
- Console.WriteLine(TEST_NIGHTLY);
+ Console.WriteLine(TestNightly);
Console.Write("Weekly: ");
- Console.WriteLine(TEST_WEEKLY);
+ Console.WriteLine(TestWeekly);
Console.Write("Slow: ");
- Console.WriteLine(TEST_SLOW);
+ Console.WriteLine(TestSlow);
Console.Write("Awaits Fix: ");
- Console.WriteLine(TEST_AWAITSFIX);
+ Console.WriteLine(TestAwaitsFix);
Console.Write("Directory: ");
- Console.WriteLine(TEST_DIRECTORY);
+ Console.WriteLine(TestDirectory);
Console.Write("Verbose: ");
- Console.WriteLine(VERBOSE);
+ Console.WriteLine(Verbose);
Console.Write("Random Multiplier: ");
- Console.WriteLine(RANDOM_MULTIPLIER);
+ Console.WriteLine(RandomMultiplier);
}
/// <summary>
@@ -1114,12 +1218,12 @@ namespace Lucene.Net.Util
/// <summary>
/// Returns a number of at least <c>i</c>
/// <para/>
- /// The actual number returned will be influenced by whether <see cref="TEST_NIGHTLY"/>
- /// is active and <see cref="RANDOM_MULTIPLIER"/>, but also with some random fudge.
+ /// The actual number returned will be influenced by whether <see cref="TestNightly"/>
+ /// is active and <see cref="RandomMultiplier"/>, but also with some random fudge.
/// </summary>
public static int AtLeast(Random random, int i)
{
- int min = (TEST_NIGHTLY ? 2 * i : i) * RANDOM_MULTIPLIER;
+ int min = (TestNightly ? 2 * i : i) * RandomMultiplier;
int max = min + (min / 2);
return TestUtil.NextInt32(random, min, max);
}
@@ -1132,13 +1236,13 @@ namespace Lucene.Net.Util
/// <summary>
/// Returns true if something should happen rarely,
/// <para/>
- /// The actual number returned will be influenced by whether <see cref="TEST_NIGHTLY"/>
- /// is active and <see cref="RANDOM_MULTIPLIER"/>.
+ /// The actual number returned will be influenced by whether <see cref="TestNightly"/>
+ /// is active and <see cref="RandomMultiplier"/>.
/// </summary>
public static bool Rarely(Random random)
{
- int p = TEST_NIGHTLY ? 10 : 1;
- p += (int)(p * Math.Log(RANDOM_MULTIPLIER));
+ int p = TestNightly ? 10 : 1;
+ p += (int)(p * Math.Log(RandomMultiplier));
int min = 100 - Math.Min(p, 50); // never more than 50
return random.Next(100) >= min;
}
@@ -1280,7 +1384,7 @@ namespace Lucene.Net.Util
#else
c.SetSimilarity(luceneTestCase.ClassEnvRule.similarity);
#endif
- if (VERBOSE)
+ if (Verbose)
{
// Even though TestRuleSetupAndRestoreClassEnv calls
// InfoStream.setDefault, we do it again here so that
@@ -1593,7 +1697,7 @@ namespace Lucene.Net.Util
/// </summary>
public static BaseDirectoryWrapper NewDirectory(Random random)
{
- var newDir = NewDirectoryImpl(random, TEST_DIRECTORY);
+ var newDir = NewDirectoryImpl(random, TestDirectory);
return WrapDirectory(random, newDir, Rarely(random));
}
@@ -1605,7 +1709,7 @@ namespace Lucene.Net.Util
public static MockDirectoryWrapper NewMockDirectory(Random random)
{
- return (MockDirectoryWrapper)WrapDirectory(random, NewDirectoryImpl(random, TEST_DIRECTORY), false);
+ return (MockDirectoryWrapper)WrapDirectory(random, NewDirectoryImpl(random, TestDirectory), false);
}
public static MockDirectoryWrapper NewMockFSDirectory(DirectoryInfo d)
@@ -1639,7 +1743,7 @@ namespace Lucene.Net.Util
private static BaseDirectoryWrapper NewFSDirectory(DirectoryInfo d, LockFactory lf, bool bare)
{
- string fsdirClass = TEST_DIRECTORY;
+ string fsdirClass = TestDirectory;
if (fsdirClass.Equals("random", StringComparison.Ordinal))
{
fsdirClass = RandomPicks.RandomFrom(Random, FS_DIRECTORIES);
@@ -1674,7 +1778,7 @@ namespace Lucene.Net.Util
/// </summary>
public static BaseDirectoryWrapper NewDirectory(Random random, Directory directory)
{
- Directory impl = NewDirectoryImpl(random, TEST_DIRECTORY);
+ Directory impl = NewDirectoryImpl(random, TestDirectory);
foreach (string file in directory.ListAll())
{
directory.Copy(impl, file, file, NewIOContext(random));
@@ -1692,7 +1796,7 @@ namespace Lucene.Net.Util
if (Rarely(random))
{
double maxMBPerSec = 10 + 5 * (random.NextDouble() - 0.5);
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine("LuceneTestCase: will rate limit output IndexOutput to " + maxMBPerSec + " MB/sec");
}
@@ -1725,7 +1829,7 @@ namespace Lucene.Net.Util
{
MockDirectoryWrapper mock = new MockDirectoryWrapper(random, directory);
- mock.Throttling = TEST_THROTTLING;
+ mock.Throttling = TestThrottling;
// LUCENENET TODO: CloseAfterSuite(new DisposableDirectory(mock, SuiteFailureMarker));
return mock;
}
@@ -1868,7 +1972,7 @@ namespace Lucene.Net.Util
}
}
- if (VERBOSE)
+ if (Verbose)
{
Trace.TraceInformation("Type of Directory is : {0}", clazzName);
}
@@ -1961,7 +2065,7 @@ namespace Lucene.Net.Util
// prevent cache insanity caused by e.g. ParallelCompositeReader, to fix we wrap one more time:
r = new FCInvisibleMultiReader(r);
}
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("maybeWrapReader wrapped: " + r);
}
@@ -2181,7 +2285,7 @@ namespace Lucene.Net.Util
}
if (ex != null)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("NOTE: newSearcher using ExecutorService with " + threads + " threads");
}
@@ -3055,7 +3159,7 @@ namespace Lucene.Net.Util
/// Returns true if the file exists (can be opened), false
/// if it cannot be opened, and (unlike .NET's
/// <see cref="System.IO.File.Exists(string)"/>) if there's some
- /// unexpected error.
+ /// unexpected error, returns <c>false</c>.
/// </summary>
public static bool SlowFileExists(Directory dir, string fileName)
{
@@ -3246,7 +3350,7 @@ namespace Lucene.Net.Util
{
Debug.Assert(f != null);
- if (LuceneTestCase.LEAVE_TEMPORARY)
+ if (LuceneTestCase.LeaveTemporary)
{
Console.Error.WriteLine("INFO: Will leave temporary file: " + f.FullName);
return;
diff --git a/src/Lucene.Net.TestFramework/Util/TestRuleSetupAndRestoreClassEnv.cs b/src/Lucene.Net.TestFramework/Util/TestRuleSetupAndRestoreClassEnv.cs
index 16ea943..515c22b 100644
--- a/src/Lucene.Net.TestFramework/Util/TestRuleSetupAndRestoreClassEnv.cs
+++ b/src/Lucene.Net.TestFramework/Util/TestRuleSetupAndRestoreClassEnv.cs
@@ -112,7 +112,7 @@ namespace Lucene.Net.Util
// LUCENENET specific - SOLR setup code removed
// if verbose: print some debugging stuff about which codecs are loaded.
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
// LUCENENET: Only list the services if the underlying ICodecFactory
// implements IServiceListable
@@ -140,7 +140,7 @@ namespace Lucene.Net.Util
savedInfoStream = InfoStream.Default;
Random random = LuceneTestCase.Random;
bool v = random.NextBoolean();
- if (LuceneTestCase.INFOSTREAM)
+ if (LuceneTestCase.UseInfoStream)
{
InfoStream.Default = new ThreadNameFixingPrintStreamInfoStream(Console.Out);
}
@@ -162,9 +162,9 @@ namespace Lucene.Net.Util
savedCodec = Codec.Default;
int randomVal = random.Next(10);
- if ("Lucene3x".Equals(LuceneTestCase.TEST_CODEC, StringComparison.Ordinal) || ("random".Equals(LuceneTestCase.TEST_CODEC, StringComparison.Ordinal) &&
- "random".Equals(LuceneTestCase.TEST_POSTINGSFORMAT, StringComparison.Ordinal) &&
- "random".Equals(LuceneTestCase.TEST_DOCVALUESFORMAT, StringComparison.Ordinal) &&
+ if ("Lucene3x".Equals(LuceneTestCase.TestCodec, StringComparison.Ordinal) || ("random".Equals(LuceneTestCase.TestCodec, StringComparison.Ordinal) &&
+ "random".Equals(LuceneTestCase.TestPostingsFormat, StringComparison.Ordinal) &&
+ "random".Equals(LuceneTestCase.TestDocValuesFormat, StringComparison.Ordinal) &&
randomVal == 3 &&
!ShouldAvoidCodec("Lucene3x"))) // preflex-only setup
{
@@ -172,8 +172,8 @@ namespace Lucene.Net.Util
Debug.Assert((codec is PreFlexRWCodec), "fix your ICodecFactory to scan Lucene.Net.Tests before Lucene.Net.TestFramework");
LuceneTestCase.OldFormatImpersonationIsActive = true;
}
- else if ("Lucene40".Equals(LuceneTestCase.TEST_CODEC, StringComparison.Ordinal) || ("random".Equals(LuceneTestCase.TEST_CODEC, StringComparison.Ordinal) &&
- "random".Equals(LuceneTestCase.TEST_POSTINGSFORMAT, StringComparison.Ordinal) &&
+ else if ("Lucene40".Equals(LuceneTestCase.TestCodec, StringComparison.Ordinal) || ("random".Equals(LuceneTestCase.TestCodec, StringComparison.Ordinal) &&
+ "random".Equals(LuceneTestCase.TestPostingsFormat, StringComparison.Ordinal) &&
randomVal == 0 &&
!ShouldAvoidCodec("Lucene40"))) // 4.0 setup
{
@@ -182,9 +182,9 @@ namespace Lucene.Net.Util
Debug.Assert((codec is Lucene40RWCodec), "fix your ICodecFactory to scan Lucene.Net.Tests before Lucene.Net.TestFramework");
Debug.Assert((PostingsFormat.ForName("Lucene40") is Lucene40RWPostingsFormat), "fix your IPostingsFormatFactory to scan Lucene.Net.Tests before Lucene.Net.TestFramework");
}
- else if ("Lucene41".Equals(LuceneTestCase.TEST_CODEC, StringComparison.Ordinal) || ("random".Equals(LuceneTestCase.TEST_CODEC, StringComparison.Ordinal) &&
- "random".Equals(LuceneTestCase.TEST_POSTINGSFORMAT, StringComparison.Ordinal) &&
- "random".Equals(LuceneTestCase.TEST_DOCVALUESFORMAT, StringComparison.Ordinal) &&
+ else if ("Lucene41".Equals(LuceneTestCase.TestCodec, StringComparison.Ordinal) || ("random".Equals(LuceneTestCase.TestCodec, StringComparison.Ordinal) &&
+ "random".Equals(LuceneTestCase.TestPostingsFormat, StringComparison.Ordinal) &&
+ "random".Equals(LuceneTestCase.TestDocValuesFormat, StringComparison.Ordinal) &&
randomVal == 1 &&
!ShouldAvoidCodec("Lucene41")))
{
@@ -192,9 +192,9 @@ namespace Lucene.Net.Util
LuceneTestCase.OldFormatImpersonationIsActive = true;
Debug.Assert((codec is Lucene41RWCodec), "fix your ICodecFactory to scan Lucene.Net.Tests before Lucene.Net.TestFramework");
}
- else if ("Lucene42".Equals(LuceneTestCase.TEST_CODEC, StringComparison.Ordinal) || ("random".Equals(LuceneTestCase.TEST_CODEC, StringComparison.Ordinal) &&
- "random".Equals(LuceneTestCase.TEST_POSTINGSFORMAT, StringComparison.Ordinal) &&
- "random".Equals(LuceneTestCase.TEST_DOCVALUESFORMAT, StringComparison.Ordinal) &&
+ else if ("Lucene42".Equals(LuceneTestCase.TestCodec, StringComparison.Ordinal) || ("random".Equals(LuceneTestCase.TestCodec, StringComparison.Ordinal) &&
+ "random".Equals(LuceneTestCase.TestPostingsFormat, StringComparison.Ordinal) &&
+ "random".Equals(LuceneTestCase.TestDocValuesFormat, StringComparison.Ordinal) &&
randomVal == 2 &&
!ShouldAvoidCodec("Lucene42")))
{
@@ -202,9 +202,9 @@ namespace Lucene.Net.Util
LuceneTestCase.OldFormatImpersonationIsActive = true;
Debug.Assert((codec is Lucene42RWCodec), "fix your ICodecFactory to scan Lucene.Net.Tests before Lucene.Net.TestFramework");
}
- else if ("Lucene45".Equals(LuceneTestCase.TEST_CODEC, StringComparison.Ordinal) || ("random".Equals(LuceneTestCase.TEST_CODEC, StringComparison.Ordinal) &&
- "random".Equals(LuceneTestCase.TEST_POSTINGSFORMAT, StringComparison.Ordinal) &&
- "random".Equals(LuceneTestCase.TEST_DOCVALUESFORMAT, StringComparison.Ordinal) &&
+ else if ("Lucene45".Equals(LuceneTestCase.TestCodec, StringComparison.Ordinal) || ("random".Equals(LuceneTestCase.TestCodec, StringComparison.Ordinal) &&
+ "random".Equals(LuceneTestCase.TestPostingsFormat, StringComparison.Ordinal) &&
+ "random".Equals(LuceneTestCase.TestDocValuesFormat, StringComparison.Ordinal) &&
randomVal == 5 &&
!ShouldAvoidCodec("Lucene45")))
{
@@ -212,64 +212,64 @@ namespace Lucene.Net.Util
LuceneTestCase.OldFormatImpersonationIsActive = true;
Debug.Assert((codec is Lucene45RWCodec), "fix your ICodecFactory to scan Lucene.Net.Tests before Lucene.Net.TestFramework");
}
- else if (("random".Equals(LuceneTestCase.TEST_POSTINGSFORMAT, StringComparison.Ordinal) == false)
- || ("random".Equals(LuceneTestCase.TEST_DOCVALUESFORMAT, StringComparison.Ordinal) == false))
+ else if (("random".Equals(LuceneTestCase.TestPostingsFormat, StringComparison.Ordinal) == false)
+ || ("random".Equals(LuceneTestCase.TestDocValuesFormat, StringComparison.Ordinal) == false))
{
// the user wired postings or DV: this is messy
// refactor into RandomCodec....
PostingsFormat format;
- if ("random".Equals(LuceneTestCase.TEST_POSTINGSFORMAT, StringComparison.Ordinal))
+ if ("random".Equals(LuceneTestCase.TestPostingsFormat, StringComparison.Ordinal))
{
format = PostingsFormat.ForName("Lucene41");
}
- else if ("MockRandom".Equals(LuceneTestCase.TEST_POSTINGSFORMAT, StringComparison.Ordinal))
+ else if ("MockRandom".Equals(LuceneTestCase.TestPostingsFormat, StringComparison.Ordinal))
{
format = new MockRandomPostingsFormat(new Random(random.Next()));
}
else
{
- format = PostingsFormat.ForName(LuceneTestCase.TEST_POSTINGSFORMAT);
+ format = PostingsFormat.ForName(LuceneTestCase.TestPostingsFormat);
}
DocValuesFormat dvFormat;
- if ("random".Equals(LuceneTestCase.TEST_DOCVALUESFORMAT, StringComparison.Ordinal))
+ if ("random".Equals(LuceneTestCase.TestDocValuesFormat, StringComparison.Ordinal))
{
dvFormat = DocValuesFormat.ForName("Lucene45");
}
else
{
- dvFormat = DocValuesFormat.ForName(LuceneTestCase.TEST_DOCVALUESFORMAT);
+ dvFormat = DocValuesFormat.ForName(LuceneTestCase.TestDocValuesFormat);
}
codec = new Lucene46CodecAnonymousInnerClassHelper(this, format, dvFormat);
}
- else if ("SimpleText".Equals(LuceneTestCase.TEST_CODEC, StringComparison.Ordinal)
- || ("random".Equals(LuceneTestCase.TEST_CODEC, StringComparison.Ordinal) && randomVal == 9 && LuceneTestCase.Rarely(random) && !ShouldAvoidCodec("SimpleText")))
+ else if ("SimpleText".Equals(LuceneTestCase.TestCodec, StringComparison.Ordinal)
+ || ("random".Equals(LuceneTestCase.TestCodec, StringComparison.Ordinal) && randomVal == 9 && LuceneTestCase.Rarely(random) && !ShouldAvoidCodec("SimpleText")))
{
codec = new SimpleTextCodec();
}
- else if ("CheapBastard".Equals(LuceneTestCase.TEST_CODEC, StringComparison.Ordinal)
- || ("random".Equals(LuceneTestCase.TEST_CODEC, StringComparison.Ordinal) && randomVal == 8 && !ShouldAvoidCodec("CheapBastard") && !ShouldAvoidCodec("Lucene41")))
+ else if ("CheapBastard".Equals(LuceneTestCase.TestCodec, StringComparison.Ordinal)
+ || ("random".Equals(LuceneTestCase.TestCodec, StringComparison.Ordinal) && randomVal == 8 && !ShouldAvoidCodec("CheapBastard") && !ShouldAvoidCodec("Lucene41")))
{
// we also avoid this codec if Lucene41 is avoided, since thats the postings format it uses.
codec = new CheapBastardCodec();
}
- else if ("Asserting".Equals(LuceneTestCase.TEST_CODEC, StringComparison.Ordinal)
- || ("random".Equals(LuceneTestCase.TEST_CODEC, StringComparison.Ordinal) && randomVal == 6 && !ShouldAvoidCodec("Asserting")))
+ else if ("Asserting".Equals(LuceneTestCase.TestCodec, StringComparison.Ordinal)
+ || ("random".Equals(LuceneTestCase.TestCodec, StringComparison.Ordinal) && randomVal == 6 && !ShouldAvoidCodec("Asserting")))
{
codec = new AssertingCodec();
}
- else if ("Compressing".Equals(LuceneTestCase.TEST_CODEC, StringComparison.Ordinal)
- || ("random".Equals(LuceneTestCase.TEST_CODEC, StringComparison.Ordinal) && randomVal == 5 && !ShouldAvoidCodec("Compressing")))
+ else if ("Compressing".Equals(LuceneTestCase.TestCodec, StringComparison.Ordinal)
+ || ("random".Equals(LuceneTestCase.TestCodec, StringComparison.Ordinal) && randomVal == 5 && !ShouldAvoidCodec("Compressing")))
{
codec = CompressingCodec.RandomInstance(random);
}
- else if (!"random".Equals(LuceneTestCase.TEST_CODEC, StringComparison.Ordinal))
+ else if (!"random".Equals(LuceneTestCase.TestCodec, StringComparison.Ordinal))
{
- codec = Codec.ForName(LuceneTestCase.TEST_CODEC);
+ codec = Codec.ForName(LuceneTestCase.TestCodec);
}
- else if ("random".Equals(LuceneTestCase.TEST_POSTINGSFORMAT, StringComparison.Ordinal))
+ else if ("random".Equals(LuceneTestCase.TestPostingsFormat, StringComparison.Ordinal))
{
codec = new RandomCodec(random, avoidCodecs);
}
@@ -364,7 +364,7 @@ namespace Lucene.Net.Util
PostingsFormat pf = codec.PostingsFormat;
LuceneTestCase.AssumeFalse("Class not allowed to use postings format: " + pf.Name + ".", ShouldAvoidCodec(pf.Name));
- LuceneTestCase.AssumeFalse("Class not allowed to use postings format: " + LuceneTestCase.TEST_POSTINGSFORMAT + ".", ShouldAvoidCodec(LuceneTestCase.TEST_POSTINGSFORMAT));
+ LuceneTestCase.AssumeFalse("Class not allowed to use postings format: " + LuceneTestCase.TestPostingsFormat + ".", ShouldAvoidCodec(LuceneTestCase.TestPostingsFormat));
}
/// <summary>
diff --git a/src/Lucene.Net.TestFramework/Util/TestUtil.cs b/src/Lucene.Net.TestFramework/Util/TestUtil.cs
index c8a0d3e..8e08b14 100644
--- a/src/Lucene.Net.TestFramework/Util/TestUtil.cs
+++ b/src/Lucene.Net.TestFramework/Util/TestUtil.cs
@@ -210,7 +210,7 @@ namespace Lucene.Net.Util
}
else
{
- if (LuceneTestCase.INFOSTREAM)
+ if (LuceneTestCase.UseInfoStream)
{
checker.FlushInfoStream();
Console.WriteLine(bos.ToString());
@@ -252,7 +252,7 @@ namespace Lucene.Net.Util
}
else
{
- if (LuceneTestCase.INFOSTREAM)
+ if (LuceneTestCase.UseInfoStream)
{
Console.WriteLine(bos.ToString());
}
@@ -876,7 +876,7 @@ namespace Lucene.Net.Util
// TODO: we really need for postings impls etc to announce themselves
// (and maybe their params, too) to infostream on flush and merge.
// otherwise in a real debugging situation we won't know whats going on!
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine("forcing postings format to:" + format);
}
@@ -908,7 +908,7 @@ namespace Lucene.Net.Util
// TODO: we really need for docvalues impls etc to announce themselves
// (and maybe their params, too) to infostream on flush and merge.
// otherwise in a real debugging situation we won't know whats going on!
- if (LuceneTestCase.VERBOSE)
+ if (LuceneTestCase.Verbose)
{
Console.WriteLine("forcing docvalues format to:" + format);
}
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ar/TestArabicAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ar/TestArabicAnalyzer.cs
index 8b9edf0..53de3b4 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ar/TestArabicAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ar/TestArabicAnalyzer.cs
@@ -110,7 +110,7 @@ namespace Lucene.Net.Analysis.Ar
[Test]
public virtual void TestRandomStrings()
{
- CheckRandomData(Random, new ArabicAnalyzer(TEST_VERSION_CURRENT), 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, new ArabicAnalyzer(TEST_VERSION_CURRENT), 1000 * RandomMultiplier);
}
}
}
\ No newline at end of file
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Bg/TestBulgarianAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Bg/TestBulgarianAnalyzer.cs
index a968298..e6f2609 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Bg/TestBulgarianAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Bg/TestBulgarianAnalyzer.cs
@@ -87,7 +87,7 @@ namespace Lucene.Net.Analysis.Bg
[Test]
public virtual void TestRandomStrings()
{
- CheckRandomData(Random, new BulgarianAnalyzer(TEST_VERSION_CURRENT), 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, new BulgarianAnalyzer(TEST_VERSION_CURRENT), 1000 * RandomMultiplier);
}
}
}
\ No newline at end of file
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Br/TestBrazilianStemmer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Br/TestBrazilianStemmer.cs
index b734301..cdbd71d 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Br/TestBrazilianStemmer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Br/TestBrazilianStemmer.cs
@@ -168,7 +168,7 @@ namespace Lucene.Net.Analysis.Br
[Test]
public virtual void TestRandomStrings()
{
- CheckRandomData(Random, new BrazilianAnalyzer(TEST_VERSION_CURRENT), 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, new BrazilianAnalyzer(TEST_VERSION_CURRENT), 1000 * RandomMultiplier);
}
[Test]
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ca/TestCatalanAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ca/TestCatalanAnalyzer.cs
index d3deed6..a763ff2 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ca/TestCatalanAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ca/TestCatalanAnalyzer.cs
@@ -70,7 +70,7 @@ namespace Lucene.Net.Analysis.Ca
[Test]
public virtual void TestRandomStrings()
{
- CheckRandomData(Random, new CatalanAnalyzer(TEST_VERSION_CURRENT), 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, new CatalanAnalyzer(TEST_VERSION_CURRENT), 1000 * RandomMultiplier);
}
}
}
\ No newline at end of file
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/CharFilters/HTMLStripCharFilterTest.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/CharFilters/HTMLStripCharFilterTest.cs
index e26d19d..7975f93 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/CharFilters/HTMLStripCharFilterTest.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/CharFilters/HTMLStripCharFilterTest.cs
@@ -434,14 +434,14 @@ namespace Lucene.Net.Analysis.CharFilters
[Test]
public virtual void TestRandom()
{
- int numRounds = RANDOM_MULTIPLIER * 1000;
+ int numRounds = RandomMultiplier * 1000;
CheckRandomData(Random, NewTestAnalyzer(), numRounds);
}
[Test]
public virtual void TestRandomHugeStrings()
{
- int numRounds = RANDOM_MULTIPLIER * 100;
+ int numRounds = RandomMultiplier * 100;
CheckRandomData(Random, NewTestAnalyzer(), numRounds, 8192);
}
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/CharFilters/TestMappingCharFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/CharFilters/TestMappingCharFilter.cs
index 4e789be..c1db403 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/CharFilters/TestMappingCharFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/CharFilters/TestMappingCharFilter.cs
@@ -213,7 +213,7 @@ namespace Lucene.Net.Analysis.CharFilters
{
Analyzer analyzer = new AnalyzerAnonymousInnerClassHelper(this);
- int numRounds = RANDOM_MULTIPLIER * 10000;
+ int numRounds = RandomMultiplier * 10000;
CheckRandomData(Random, analyzer, numRounds);
}
@@ -348,7 +348,7 @@ namespace Lucene.Net.Analysis.CharFilters
for (int iter = 0; iter < numIterations; iter++)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("\nTEST iter=" + iter);
}
@@ -357,7 +357,7 @@ namespace Lucene.Net.Analysis.CharFilters
IDictionary<string, string> map = new Dictionary<string, string>();
NormalizeCharMap.Builder builder = new NormalizeCharMap.Builder();
int numMappings = AtLeast(5);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" mappings:");
}
@@ -369,7 +369,7 @@ namespace Lucene.Net.Analysis.CharFilters
string value = TestUtil.RandomSimpleString(random);
map[key] = value;
builder.Add(key, value);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" " + key + " -> " + value);
}
@@ -378,7 +378,7 @@ namespace Lucene.Net.Analysis.CharFilters
NormalizeCharMap charMap = builder.Build();
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" test random documents...");
}
@@ -387,7 +387,7 @@ namespace Lucene.Net.Analysis.CharFilters
{
string content = TestUtil.RandomSimpleStringRange(random, 'a', endLetter, AtLeast(1000));
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" content=" + content);
}
@@ -440,7 +440,7 @@ namespace Lucene.Net.Analysis.CharFilters
if (matchLen != -1)
{
// We found a match here!
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" match=" + content.Substring(charIdx, matchLen) + " @ off=" + charIdx + " repl=" + matchRepl);
}
@@ -488,7 +488,7 @@ namespace Lucene.Net.Analysis.CharFilters
}
string expected = output.ToString();
- if (VERBOSE)
+ if (Verbose)
{
Console.Write(" expected:");
for (int charIdx2 = 0; charIdx2 < expected.Length; charIdx2++)
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cjk/TestCJKAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cjk/TestCJKAnalyzer.cs
index 9e3cb4c..d5d86ae 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cjk/TestCJKAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cjk/TestCJKAnalyzer.cs
@@ -226,7 +226,7 @@ namespace Lucene.Net.Analysis.Cjk
[Test]
public virtual void TestRandomStrings()
{
- CheckRandomData(Random, new CJKAnalyzer(TEST_VERSION_CURRENT), 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, new CJKAnalyzer(TEST_VERSION_CURRENT), 1000 * RandomMultiplier);
}
/// <summary>
@@ -235,7 +235,7 @@ namespace Lucene.Net.Analysis.Cjk
public virtual void TestRandomHugeStrings()
{
Random random = Random;
- CheckRandomData(random, new CJKAnalyzer(TEST_VERSION_CURRENT), 100 * RANDOM_MULTIPLIER, 8192);
+ CheckRandomData(random, new CJKAnalyzer(TEST_VERSION_CURRENT), 100 * RandomMultiplier, 8192);
}
[Test]
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cjk/TestCJKBigramFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cjk/TestCJKBigramFilter.cs
index 6600a33..03e6c49 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cjk/TestCJKBigramFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cjk/TestCJKBigramFilter.cs
@@ -146,7 +146,7 @@ namespace Lucene.Net.Analysis.Cjk
[Test]
public virtual void TestRandomUnibiStrings()
{
- CheckRandomData(Random, unibiAnalyzer, 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, unibiAnalyzer, 1000 * RandomMultiplier);
}
/// <summary>
@@ -155,7 +155,7 @@ namespace Lucene.Net.Analysis.Cjk
public virtual void TestRandomUnibiHugeStrings()
{
Random random = Random;
- CheckRandomData(random, unibiAnalyzer, 100 * RANDOM_MULTIPLIER, 8192);
+ CheckRandomData(random, unibiAnalyzer, 100 * RandomMultiplier, 8192);
}
}
}
\ No newline at end of file
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cjk/TestCJKTokenizer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cjk/TestCJKTokenizer.cs
index d32ccad..5477890 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cjk/TestCJKTokenizer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cjk/TestCJKTokenizer.cs
@@ -213,7 +213,7 @@ namespace Lucene.Net.Analysis.Cjk
[Test]
public virtual void TestRandomStrings()
{
- CheckRandomData(Random, new CJKAnalyzer(LuceneVersion.LUCENE_30), 10000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, new CJKAnalyzer(LuceneVersion.LUCENE_30), 10000 * RandomMultiplier);
}
}
}
\ No newline at end of file
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cjk/TestCJKWidthFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cjk/TestCJKWidthFilter.cs
index 40570c9..1fcbb9c 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cjk/TestCJKWidthFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cjk/TestCJKWidthFilter.cs
@@ -66,7 +66,7 @@ namespace Lucene.Net.Analysis.Cjk
[Test]
public virtual void TestRandomData()
{
- CheckRandomData(Random, analyzer, 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, analyzer, 1000 * RandomMultiplier);
}
[Test]
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ckb/TestSoraniAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ckb/TestSoraniAnalyzer.cs
index e27224e..49d7742 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ckb/TestSoraniAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ckb/TestSoraniAnalyzer.cs
@@ -71,7 +71,7 @@ namespace Lucene.Net.Analysis.Ckb
[Test]
public virtual void TestRandomStrings()
{
- CheckRandomData(Random, new SoraniAnalyzer(TEST_VERSION_CURRENT), 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, new SoraniAnalyzer(TEST_VERSION_CURRENT), 1000 * RandomMultiplier);
}
}
}
\ No newline at end of file
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cn/TestChineseTokenizer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cn/TestChineseTokenizer.cs
index ac18b7f..1c00e44 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cn/TestChineseTokenizer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cn/TestChineseTokenizer.cs
@@ -135,7 +135,7 @@ namespace Lucene.Net.Analysis.Cn
[Test]
public virtual void TestRandomStrings()
{
- CheckRandomData(Random, new ChineseAnalyzer(), 10000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, new ChineseAnalyzer(), 10000 * RandomMultiplier);
}
}
}
\ No newline at end of file
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Commongrams/CommonGramsFilterTest.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Commongrams/CommonGramsFilterTest.cs
index f2c965c..68c7ef9 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Commongrams/CommonGramsFilterTest.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Commongrams/CommonGramsFilterTest.cs
@@ -288,11 +288,11 @@ namespace Lucene.Net.Analysis.CommonGrams
{
Analyzer a = new AnalyzerAnonymousInnerClassHelper3(this);
- CheckRandomData(Random, a, 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, a, 1000 * RandomMultiplier);
Analyzer b = new AnalyzerAnonymousInnerClassHelper4(this);
- CheckRandomData(Random, b, 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, b, 1000 * RandomMultiplier);
}
private class AnalyzerAnonymousInnerClassHelper3 : Analyzer
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Compound/TestCompoundWordTokenFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Compound/TestCompoundWordTokenFilter.cs
index 5cdaac9..6c49f61 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Compound/TestCompoundWordTokenFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Compound/TestCompoundWordTokenFilter.cs
@@ -276,14 +276,14 @@ namespace Lucene.Net.Analysis.Compound
{
CharArraySet dict = makeDictionary("a", "e", "i", "o", "u", "y", "bc", "def");
Analyzer a = new AnalyzerAnonymousInnerClassHelper2(this, dict);
- CheckRandomData(Random, a, 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, a, 1000 * RandomMultiplier);
//InputSource @is = new InputSource(this.GetType().getResource("da_UTF8.xml").toExternalForm());
using (var @is = this.GetType().getResourceAsStream("da_UTF8.xml"))
{
HyphenationTree hyphenator = HyphenationCompoundWordTokenFilter.GetHyphenationTree(@is);
Analyzer b = new AnalyzerAnonymousInnerClassHelper3(this, hyphenator);
- CheckRandomData(Random, b, 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, b, 1000 * RandomMultiplier);
}
}
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestAnalyzers.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestAnalyzers.cs
index a1bfcf1..2f886b1 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestAnalyzers.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestAnalyzers.cs
@@ -234,9 +234,9 @@ namespace Lucene.Net.Analysis.Core
[Test]
public virtual void TestRandomStrings()
{
- CheckRandomData(Random, new WhitespaceAnalyzer(TEST_VERSION_CURRENT), 1000 * RANDOM_MULTIPLIER);
- CheckRandomData(Random, new SimpleAnalyzer(TEST_VERSION_CURRENT), 1000 * RANDOM_MULTIPLIER);
- CheckRandomData(Random, new StopAnalyzer(TEST_VERSION_CURRENT), 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, new WhitespaceAnalyzer(TEST_VERSION_CURRENT), 1000 * RandomMultiplier);
+ CheckRandomData(Random, new SimpleAnalyzer(TEST_VERSION_CURRENT), 1000 * RandomMultiplier);
+ CheckRandomData(Random, new StopAnalyzer(TEST_VERSION_CURRENT), 1000 * RandomMultiplier);
}
/// <summary>
@@ -246,9 +246,9 @@ namespace Lucene.Net.Analysis.Core
public virtual void TestRandomHugeStrings()
{
Random random = Random;
- CheckRandomData(random, new WhitespaceAnalyzer(TEST_VERSION_CURRENT), 100 * RANDOM_MULTIPLIER, 8192);
- CheckRandomData(random, new SimpleAnalyzer(TEST_VERSION_CURRENT), 100 * RANDOM_MULTIPLIER, 8192);
- CheckRandomData(random, new StopAnalyzer(TEST_VERSION_CURRENT), 100 * RANDOM_MULTIPLIER, 8192);
+ CheckRandomData(random, new WhitespaceAnalyzer(TEST_VERSION_CURRENT), 100 * RandomMultiplier, 8192);
+ CheckRandomData(random, new SimpleAnalyzer(TEST_VERSION_CURRENT), 100 * RandomMultiplier, 8192);
+ CheckRandomData(random, new StopAnalyzer(TEST_VERSION_CURRENT), 100 * RandomMultiplier, 8192);
}
}
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestClassicAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestClassicAnalyzer.cs
index f1cee9c..7e66774 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestClassicAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestClassicAnalyzer.cs
@@ -351,7 +351,7 @@ namespace Lucene.Net.Analysis.Core
[Test]
public virtual void TestRandomStrings()
{
- CheckRandomData(Random, new ClassicAnalyzer(TEST_VERSION_CURRENT), 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, new ClassicAnalyzer(TEST_VERSION_CURRENT), 1000 * RandomMultiplier);
}
/// <summary>
@@ -360,7 +360,7 @@ namespace Lucene.Net.Analysis.Core
public virtual void TestRandomHugeStrings()
{
Random random = Random;
- CheckRandomData(random, new ClassicAnalyzer(TEST_VERSION_CURRENT), 100 * RANDOM_MULTIPLIER, 8192);
+ CheckRandomData(random, new ClassicAnalyzer(TEST_VERSION_CURRENT), 100 * RandomMultiplier, 8192);
}
}
}
\ No newline at end of file
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestKeywordAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestKeywordAnalyzer.cs
index 76304ec..4ad984e 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestKeywordAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestKeywordAnalyzer.cs
@@ -118,7 +118,7 @@ namespace Lucene.Net.Analysis.Core
[Test]
public virtual void TestRandomStrings()
{
- CheckRandomData(Random, new KeywordAnalyzer(), 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, new KeywordAnalyzer(), 1000 * RandomMultiplier);
}
}
}
\ No newline at end of file
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestRandomChains.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestRandomChains.cs
index e099151..b71771b 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestRandomChains.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestRandomChains.cs
@@ -247,7 +247,7 @@ namespace Lucene.Net.Analysis.Core
tokenizers.Sort(ctorComp);
tokenfilters.Sort(ctorComp);
charfilters.Sort(ctorComp);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("tokenizers = " + tokenizers);
Console.WriteLine("tokenfilters = " + tokenfilters);
@@ -904,7 +904,7 @@ namespace Lucene.Net.Analysis.Core
{
// thats ok, ignore
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("Ignoring IAE/UOE from ctor:");
//cause.printStackTrace(System.err);
@@ -1130,13 +1130,13 @@ namespace Lucene.Net.Analysis.Core
for (int i = 0; i < numIterations; i++)
{
MockRandomAnalyzer a = new MockRandomAnalyzer(random.Next());
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("Creating random analyzer:" + a);
}
try
{
- CheckRandomData(random, a, 500 * RANDOM_MULTIPLIER, 20, false,
+ CheckRandomData(random, a, 500 * RandomMultiplier, 20, false,
false /* We already validate our own offsets... */);
}
catch (Exception /*e*/)
@@ -1157,13 +1157,13 @@ namespace Lucene.Net.Analysis.Core
for (int i = 0; i < numIterations; i++)
{
MockRandomAnalyzer a = new MockRandomAnalyzer(random.Next());
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("Creating random analyzer:" + a);
}
try
{
- CheckRandomData(random, a, 50 * RANDOM_MULTIPLIER, 128, false,
+ CheckRandomData(random, a, 50 * RandomMultiplier, 128, false,
false /* We already validate our own offsets... */);
}
catch (Exception /*e*/)
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestStandardAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestStandardAnalyzer.cs
index 8b6dca9..3721451 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestStandardAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestStandardAnalyzer.cs
@@ -379,7 +379,7 @@ namespace Lucene.Net.Analysis.Core
[Test]
public virtual void TestRandomStrings()
{
- CheckRandomData(Random, new StandardAnalyzer(TEST_VERSION_CURRENT), 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, new StandardAnalyzer(TEST_VERSION_CURRENT), 1000 * RandomMultiplier);
}
/// <summary>
@@ -388,7 +388,7 @@ namespace Lucene.Net.Analysis.Core
public virtual void TestRandomHugeStrings()
{
Random random = Random;
- CheckRandomData(random, new StandardAnalyzer(TEST_VERSION_CURRENT), 100 * RANDOM_MULTIPLIER, 8192);
+ CheckRandomData(random, new StandardAnalyzer(TEST_VERSION_CURRENT), 100 * RandomMultiplier, 8192);
}
// Adds random graph after:
@@ -396,7 +396,7 @@ namespace Lucene.Net.Analysis.Core
public virtual void TestRandomHugeStringsGraphAfter()
{
Random random = Random;
- CheckRandomData(random, new AnalyzerAnonymousInnerClassHelper4(this), 100 * RANDOM_MULTIPLIER, 8192);
+ CheckRandomData(random, new AnalyzerAnonymousInnerClassHelper4(this), 100 * RandomMultiplier, 8192);
}
private class AnalyzerAnonymousInnerClassHelper4 : Analyzer
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestStopFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestStopFilter.cs
index 592ad68..a6440c4 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestStopFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestStopFilter.cs
@@ -155,7 +155,7 @@ namespace Lucene.Net.Analysis.Core
// print debug info depending on VERBOSE
private static void log(string s)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(s);
}
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestTypeTokenFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestTypeTokenFilter.cs
index e53b1f0..dc66a27 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestTypeTokenFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestTypeTokenFilter.cs
@@ -110,7 +110,7 @@ namespace Lucene.Net.Analysis.Core
// print debug info depending on VERBOSE
private static void log(string s)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(s);
}
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestUAX29URLEmailAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestUAX29URLEmailAnalyzer.cs
index f86b0a6..624f811 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestUAX29URLEmailAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestUAX29URLEmailAnalyzer.cs
@@ -320,7 +320,7 @@ namespace Lucene.Net.Analysis.Core
[Test]
public virtual void TestRandomStrings()
{
- CheckRandomData(Random, new UAX29URLEmailAnalyzer(TEST_VERSION_CURRENT), 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, new UAX29URLEmailAnalyzer(TEST_VERSION_CURRENT), 1000 * RandomMultiplier);
}
}
}
\ No newline at end of file
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestUAX29URLEmailTokenizer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestUAX29URLEmailTokenizer.cs
index 0e846b2..65cec17 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestUAX29URLEmailTokenizer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestUAX29URLEmailTokenizer.cs
@@ -685,7 +685,7 @@ namespace Lucene.Net.Analysis.Core
[Test]
public virtual void TestRandomStrings()
{
- CheckRandomData(Random, a, 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, a, 1000 * RandomMultiplier);
}
/// <summary>
@@ -694,7 +694,7 @@ namespace Lucene.Net.Analysis.Core
public virtual void TestRandomHugeStrings()
{
Random random = Random;
- CheckRandomData(random, a, 100 * RANDOM_MULTIPLIER, 8192);
+ CheckRandomData(random, a, 100 * RandomMultiplier, 8192);
}
}
}
\ No newline at end of file
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cz/TestCzechAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cz/TestCzechAnalyzer.cs
index e9907af..accfea8 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cz/TestCzechAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cz/TestCzechAnalyzer.cs
@@ -77,7 +77,7 @@ namespace Lucene.Net.Analysis.Cz
[Test]
public virtual void TestRandomStrings()
{
- CheckRandomData(Random, new CzechAnalyzer(TEST_VERSION_CURRENT), 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, new CzechAnalyzer(TEST_VERSION_CURRENT), 1000 * RandomMultiplier);
}
}
}
\ No newline at end of file
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Da/TestDanishAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Da/TestDanishAnalyzer.cs
index 2c48494..aa22fce 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Da/TestDanishAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Da/TestDanishAnalyzer.cs
@@ -61,7 +61,7 @@ namespace Lucene.Net.Analysis.Da
[Test]
public virtual void TestRandomStrings()
{
- CheckRandomData(Random, new DanishAnalyzer(TEST_VERSION_CURRENT), 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, new DanishAnalyzer(TEST_VERSION_CURRENT), 1000 * RandomMultiplier);
}
}
}
\ No newline at end of file
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/De/TestGermanAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/De/TestGermanAnalyzer.cs
index 3f4c05e..0bf5aa4 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/De/TestGermanAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/De/TestGermanAnalyzer.cs
@@ -75,7 +75,7 @@ namespace Lucene.Net.Analysis.De
[Test]
public virtual void TestRandomStrings()
{
- CheckRandomData(Random, new GermanAnalyzer(TEST_VERSION_CURRENT), 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, new GermanAnalyzer(TEST_VERSION_CURRENT), 1000 * RandomMultiplier);
}
}
}
\ No newline at end of file
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/De/TestGermanLightStemFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/De/TestGermanLightStemFilter.cs
index 481398f..36239c4 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/De/TestGermanLightStemFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/De/TestGermanLightStemFilter.cs
@@ -84,7 +84,7 @@ namespace Lucene.Net.Analysis.De
[Test]
public virtual void TestRandomStrings()
{
- CheckRandomData(Random, analyzer, 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, analyzer, 1000 * RandomMultiplier);
}
[Test]
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/De/TestGermanMinimalStemFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/De/TestGermanMinimalStemFilter.cs
index afd0a9d..35c7733 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/De/TestGermanMinimalStemFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/De/TestGermanMinimalStemFilter.cs
@@ -99,7 +99,7 @@ namespace Lucene.Net.Analysis.De
[Test]
public virtual void TestRandomStrings()
{
- CheckRandomData(Random, analyzer, 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, analyzer, 1000 * RandomMultiplier);
}
[Test]
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/De/TestGermanNormalizationFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/De/TestGermanNormalizationFilter.cs
index 9bf966a..15ef811 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/De/TestGermanNormalizationFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/De/TestGermanNormalizationFilter.cs
@@ -75,7 +75,7 @@ namespace Lucene.Net.Analysis.De
[Test]
public virtual void TestRandomStrings()
{
- CheckRandomData(Random, analyzer, 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, analyzer, 1000 * RandomMultiplier);
}
[Test]
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/De/TestGermanStemFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/De/TestGermanStemFilter.cs
index eb6a21a..284f590 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/De/TestGermanStemFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/De/TestGermanStemFilter.cs
@@ -95,7 +95,7 @@ namespace Lucene.Net.Analysis.De
[Test]
public virtual void TestRandomStrings()
{
- CheckRandomData(Random, analyzer, 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, analyzer, 1000 * RandomMultiplier);
}
[Test]
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/El/GreekAnalyzerTest.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/El/GreekAnalyzerTest.cs
index 1b7b86d..b6010b8 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/El/GreekAnalyzerTest.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/El/GreekAnalyzerTest.cs
@@ -87,7 +87,7 @@ namespace Lucene.Net.Analysis.El
[Test]
public virtual void TestRandomStrings()
{
- CheckRandomData(Random, new GreekAnalyzer(TEST_VERSION_CURRENT), 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, new GreekAnalyzer(TEST_VERSION_CURRENT), 1000 * RandomMultiplier);
}
}
}
\ No newline at end of file
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/En/TestEnglishAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/En/TestEnglishAnalyzer.cs
index bf3fc35..4566df9 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/En/TestEnglishAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/En/TestEnglishAnalyzer.cs
@@ -64,7 +64,7 @@ namespace Lucene.Net.Analysis.En
[Test]
public virtual void TestRandomStrings()
{
- CheckRandomData(Random, new EnglishAnalyzer(TEST_VERSION_CURRENT), 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, new EnglishAnalyzer(TEST_VERSION_CURRENT), 1000 * RandomMultiplier);
}
}
}
\ No newline at end of file
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/En/TestEnglishMinimalStemFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/En/TestEnglishMinimalStemFilter.cs
index 76bda42..261f02a 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/En/TestEnglishMinimalStemFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/En/TestEnglishMinimalStemFilter.cs
@@ -62,7 +62,7 @@ namespace Lucene.Net.Analysis.En
[Test]
public virtual void TestRandomStrings()
{
- CheckRandomData(Random, analyzer, 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, analyzer, 1000 * RandomMultiplier);
}
[Test]
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/En/TestKStemmer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/En/TestKStemmer.cs
index 49a765a..ec04c2b 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/En/TestKStemmer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/En/TestKStemmer.cs
@@ -46,7 +46,7 @@ namespace Lucene.Net.Analysis.En
[Test]
public virtual void TestRandomStrings()
{
- CheckRandomData(Random, a, 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, a, 1000 * RandomMultiplier);
}
/// <summary>
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/En/TestPorterStemFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/En/TestPorterStemFilter.cs
index 17e24f8..dd3192a 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/En/TestPorterStemFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/En/TestPorterStemFilter.cs
@@ -67,7 +67,7 @@ namespace Lucene.Net.Analysis.En
[Test]
public virtual void TestRandomStrings()
{
- CheckRandomData(Random, a, 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, a, 1000 * RandomMultiplier);
}
[Test]
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Es/TestSpanishAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Es/TestSpanishAnalyzer.cs
index 63cdd55..924fc0f 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Es/TestSpanishAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Es/TestSpanishAnalyzer.cs
@@ -61,7 +61,7 @@ namespace Lucene.Net.Analysis.Es
[Test]
public virtual void TestRandomStrings()
{
- CheckRandomData(Random, new SpanishAnalyzer(TEST_VERSION_CURRENT), 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, new SpanishAnalyzer(TEST_VERSION_CURRENT), 1000 * RandomMultiplier);
}
}
}
\ No newline at end of file
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Es/TestSpanishLightStemFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Es/TestSpanishLightStemFilter.cs
index bb1996f..c336512 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Es/TestSpanishLightStemFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Es/TestSpanishLightStemFilter.cs
@@ -54,7 +54,7 @@ namespace Lucene.Net.Analysis.Es
[Test]
public virtual void TestRandomStrings()
{
- CheckRandomData(Random, analyzer, 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, analyzer, 1000 * RandomMultiplier);
}
[Test]
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Eu/TestBasqueAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Eu/TestBasqueAnalyzer.cs
index a1b5d9c..6f9f47d 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Eu/TestBasqueAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Eu/TestBasqueAnalyzer.cs
@@ -61,7 +61,7 @@ namespace Lucene.Net.Analysis.Eu
[Test]
public virtual void TestRandomStrings()
{
- CheckRandomData(Random, new BasqueAnalyzer(TEST_VERSION_CURRENT), 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, new BasqueAnalyzer(TEST_VERSION_CURRENT), 1000 * RandomMultiplier);
}
}
}
\ No newline at end of file
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fa/TestPersianAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fa/TestPersianAnalyzer.cs
index 10e1d5e..e4a1124 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fa/TestPersianAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fa/TestPersianAnalyzer.cs
@@ -238,7 +238,7 @@ namespace Lucene.Net.Analysis.Fa
[Test]
public virtual void TestRandomStrings()
{
- CheckRandomData(Random, new PersianAnalyzer(TEST_VERSION_CURRENT), 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, new PersianAnalyzer(TEST_VERSION_CURRENT), 1000 * RandomMultiplier);
}
}
}
\ No newline at end of file
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fa/TestPersianCharFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fa/TestPersianCharFilter.cs
index cb54ef8..5207e77 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fa/TestPersianCharFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fa/TestPersianCharFilter.cs
@@ -52,7 +52,7 @@ namespace Lucene.Net.Analysis.Fa
[Test]
public virtual void TestRandomStrings()
{
- CheckRandomData(Random, analyzer, 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, analyzer, 1000 * RandomMultiplier);
}
}
}
\ No newline at end of file
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fi/TestFinnishAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fi/TestFinnishAnalyzer.cs
index d7501e9..7d9cdf0 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fi/TestFinnishAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fi/TestFinnishAnalyzer.cs
@@ -61,7 +61,7 @@ namespace Lucene.Net.Analysis.Fi
[Test]
public virtual void TestRandomStrings()
{
- CheckRandomData(Random, new FinnishAnalyzer(TEST_VERSION_CURRENT), 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, new FinnishAnalyzer(TEST_VERSION_CURRENT), 1000 * RandomMultiplier);
}
}
}
\ No newline at end of file
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fi/TestFinnishLightStemFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fi/TestFinnishLightStemFilter.cs
index 1278a91..48aa2ec 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fi/TestFinnishLightStemFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fi/TestFinnishLightStemFilter.cs
@@ -84,7 +84,7 @@ namespace Lucene.Net.Analysis.Fi
[Test]
public virtual void TestRandomStrings()
{
- CheckRandomData(Random, analyzer, 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, analyzer, 1000 * RandomMultiplier);
}
[Test]
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fr/TestFrenchAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fr/TestFrenchAnalyzer.cs
index 48a53d9..07d4d1e 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fr/TestFrenchAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fr/TestFrenchAnalyzer.cs
@@ -177,7 +177,7 @@ namespace Lucene.Net.Analysis.Fr
[Test]
public virtual void TestRandomStrings()
{
- CheckRandomData(Random, new FrenchAnalyzer(TEST_VERSION_CURRENT), 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, new FrenchAnalyzer(TEST_VERSION_CURRENT), 1000 * RandomMultiplier);
}
/// <summary>
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fr/TestFrenchLightStemFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fr/TestFrenchLightStemFilter.cs
index da3aa84..0214574 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fr/TestFrenchLightStemFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fr/TestFrenchLightStemFilter.cs
@@ -218,7 +218,7 @@ namespace Lucene.Net.Analysis.Fr
[Test]
public virtual void TestRandomStrings()
{
- CheckRandomData(Random, analyzer, 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, analyzer, 1000 * RandomMultiplier);
}
[Test]
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fr/TestFrenchMinimalStemFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fr/TestFrenchMinimalStemFilter.cs
index 7dc6969..6a3c993 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fr/TestFrenchMinimalStemFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fr/TestFrenchMinimalStemFilter.cs
@@ -101,7 +101,7 @@ namespace Lucene.Net.Analysis.Fr
[Test]
public virtual void TestRandomStrings()
{
- CheckRandomData(Random, analyzer, 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, analyzer, 1000 * RandomMultiplier);
}
[Test]
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ga/TestIrishAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ga/TestIrishAnalyzer.cs
index 183b1f4..34de7b7 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ga/TestIrishAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ga/TestIrishAnalyzer.cs
@@ -78,7 +78,7 @@ namespace Lucene.Net.Analysis.Ga
[Test]
public virtual void TestRandomStrings()
{
- CheckRandomData(Random, new IrishAnalyzer(TEST_VERSION_CURRENT), 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, new IrishAnalyzer(TEST_VERSION_CURRENT), 1000 * RandomMultiplier);
}
}
}
\ No newline at end of file
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Gl/TestGalicianAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Gl/TestGalicianAnalyzer.cs
index 2d5fbea..ddc5d90 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Gl/TestGalicianAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Gl/TestGalicianAnalyzer.cs
@@ -60,7 +60,7 @@ namespace Lucene.Net.Analysis.Gl
[Test]
public virtual void TestRandomStrings()
{
- CheckRandomData(Random, new GalicianAnalyzer(TEST_VERSION_CURRENT), 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, new GalicianAnalyzer(TEST_VERSION_CURRENT), 1000 * RandomMultiplier);
}
}
}
\ No newline at end of file
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Gl/TestGalicianMinimalStemFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Gl/TestGalicianMinimalStemFilter.cs
index 1c4533f..610a8aa 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Gl/TestGalicianMinimalStemFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Gl/TestGalicianMinimalStemFilter.cs
@@ -92,7 +92,7 @@ namespace Lucene.Net.Analysis.Gl
[Test]
public virtual void TestRandomStrings()
{
- CheckRandomData(Random, a, 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, a, 1000 * RandomMultiplier);
}
[Test]
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hi/TestHindiAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hi/TestHindiAnalyzer.cs
index 8c16b6b..7722abc 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hi/TestHindiAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hi/TestHindiAnalyzer.cs
@@ -56,7 +56,7 @@ namespace Lucene.Net.Analysis.Hi
[Test]
public virtual void TestRandomStrings()
{
- CheckRandomData(Random, new HindiAnalyzer(TEST_VERSION_CURRENT), 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, new HindiAnalyzer(TEST_VERSION_CURRENT), 1000 * RandomMultiplier);
}
}
}
\ No newline at end of file
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hu/TestHungarianAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hu/TestHungarianAnalyzer.cs
index 84d9fa8..80dce07 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hu/TestHungarianAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hu/TestHungarianAnalyzer.cs
@@ -60,7 +60,7 @@ namespace Lucene.Net.Analysis.Hu
[Test]
public virtual void TestRandomStrings()
{
- CheckRandomData(Random, new HungarianAnalyzer(TEST_VERSION_CURRENT), 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, new HungarianAnalyzer(TEST_VERSION_CURRENT), 1000 * RandomMultiplier);
}
}
}
\ No newline at end of file
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHunspellStemFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHunspellStemFilter.cs
index 1d123b3..099d46d 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHunspellStemFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHunspellStemFilter.cs
@@ -85,7 +85,7 @@ namespace Lucene.Net.Analysis.Hunspell
public virtual void TestRandomStrings()
{
Analyzer analyzer = new AnalyzerAnonymousInnerClassHelper(this);
- CheckRandomData(Random, analyzer, 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, analyzer, 1000 * RandomMultiplier);
}
private class AnalyzerAnonymousInnerClassHelper : Analyzer
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hy/TestArmenianAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hy/TestArmenianAnalyzer.cs
index 81cd5b5..4bba84c 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hy/TestArmenianAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hy/TestArmenianAnalyzer.cs
@@ -61,7 +61,7 @@ namespace Lucene.Net.Analysis.Hy
[Test]
public virtual void TestRandomStrings()
{
- CheckRandomData(Random, new ArmenianAnalyzer(TEST_VERSION_CURRENT), 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, new ArmenianAnalyzer(TEST_VERSION_CURRENT), 1000 * RandomMultiplier);
}
}
}
\ No newline at end of file
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Id/TestIndonesianAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Id/TestIndonesianAnalyzer.cs
index 58e8e57..2c1ccfc 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Id/TestIndonesianAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Id/TestIndonesianAnalyzer.cs
@@ -60,7 +60,7 @@ namespace Lucene.Net.Analysis.Id
[Test]
public virtual void TestRandomStrings()
{
- CheckRandomData(Random, new IndonesianAnalyzer(TEST_VERSION_CURRENT), 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, new IndonesianAnalyzer(TEST_VERSION_CURRENT), 1000 * RandomMultiplier);
}
}
}
\ No newline at end of file
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/It/TestItalianAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/It/TestItalianAnalyzer.cs
index 6831f2c..3c81ae7 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/It/TestItalianAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/It/TestItalianAnalyzer.cs
@@ -62,7 +62,7 @@ namespace Lucene.Net.Analysis.It
[Test]
public virtual void TestRandomStrings()
{
- CheckRandomData(Random, new ItalianAnalyzer(TEST_VERSION_CURRENT), 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, new ItalianAnalyzer(TEST_VERSION_CURRENT), 1000 * RandomMultiplier);
}
/// <summary>
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/It/TestItalianLightStemFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/It/TestItalianLightStemFilter.cs
index 379b728..5c61b33 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/It/TestItalianLightStemFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/It/TestItalianLightStemFilter.cs
@@ -54,7 +54,7 @@ namespace Lucene.Net.Analysis.It
[Test]
public virtual void TestRandomStrings()
{
- CheckRandomData(Random, analyzer, 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, analyzer, 1000 * RandomMultiplier);
}
[Test]
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Lv/TestLatvianAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Lv/TestLatvianAnalyzer.cs
index 67b330a..483949e 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Lv/TestLatvianAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Lv/TestLatvianAnalyzer.cs
@@ -61,7 +61,7 @@ namespace Lucene.Net.Analysis.Lv
[Test]
public virtual void TestRandomStrings()
{
- CheckRandomData(Random, new LatvianAnalyzer(TEST_VERSION_CURRENT), 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, new LatvianAnalyzer(TEST_VERSION_CURRENT), 1000 * RandomMultiplier);
}
}
}
\ No newline at end of file
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/PatternAnalyzerTest.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/PatternAnalyzerTest.cs
index 432ef16..d3f0b23 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/PatternAnalyzerTest.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/PatternAnalyzerTest.cs
@@ -138,7 +138,7 @@ namespace Lucene.Net.Analysis.Miscellaneous
{
Analyzer a = new PatternAnalyzer(TEST_VERSION_CURRENT, new Regex(",", RegexOptions.Compiled), true, StopAnalyzer.ENGLISH_STOP_WORDS_SET);
- CheckRandomData(Random, a, 10000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, a, 10000 * RandomMultiplier);
}
}
#pragma warning restore 612, 618
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestASCIIFoldingFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestASCIIFoldingFilter.cs
index 75b1c1a..b7db3c7 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestASCIIFoldingFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestASCIIFoldingFilter.cs
@@ -231,7 +231,7 @@ namespace Lucene.Net.Analysis.Miscellaneous
public virtual void testRandomStrings()
{
Analyzer a = new AnalyzerAnonymousInnerClassHelper(this);
- CheckRandomData(Random, a, 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, a, 1000 * RandomMultiplier);
}
private class AnalyzerAnonymousInnerClassHelper : Analyzer
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestCapitalizationFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestCapitalizationFilter.cs
index 2786d9a..31376e7 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestCapitalizationFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestCapitalizationFilter.cs
@@ -96,7 +96,7 @@ namespace Lucene.Net.Analysis.Miscellaneous
{
Analyzer a = new AnalyzerAnonymousInnerClassHelper(this);
- CheckRandomData(Random, a, 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, a, 1000 * RandomMultiplier);
}
private class AnalyzerAnonymousInnerClassHelper : Analyzer
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestHyphenatedWordsFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestHyphenatedWordsFilter.cs
index d2cfd34..72e7e1c 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestHyphenatedWordsFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestHyphenatedWordsFilter.cs
@@ -65,7 +65,7 @@ namespace Lucene.Net.Analysis.Miscellaneous
{
Analyzer a = new AnalyzerAnonymousInnerClassHelper(this);
- CheckRandomData(Random, a, 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, a, 1000 * RandomMultiplier);
}
private class AnalyzerAnonymousInnerClassHelper : Analyzer
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestKeepWordFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestKeepWordFilter.cs
index 9bebbe1..d700e5d 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestKeepWordFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestKeepWordFilter.cs
@@ -72,7 +72,7 @@ namespace Lucene.Net.Analysis.Miscellaneous
Analyzer a = new AnalyzerAnonymousInnerClassHelper(this, words);
- CheckRandomData(Random, a, 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, a, 1000 * RandomMultiplier);
}
private class AnalyzerAnonymousInnerClassHelper : Analyzer
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestScandinavianFoldingFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestScandinavianFoldingFilter.cs
index a7ecab9..fa0bd74 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestScandinavianFoldingFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestScandinavianFoldingFilter.cs
@@ -140,7 +140,7 @@ namespace Lucene.Net.Analysis.Miscellaneous
[Test]
public virtual void TestRandomData()
{
- CheckRandomData(Random, analyzer, 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, analyzer, 1000 * RandomMultiplier);
}
}
}
\ No newline at end of file
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestScandinavianNormalizationFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestScandinavianNormalizationFilter.cs
index 1e612b8..fbb9622 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestScandinavianNormalizationFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestScandinavianNormalizationFilter.cs
@@ -140,7 +140,7 @@ namespace Lucene.Net.Analysis.Miscellaneous
[Test]
public virtual void TestRandomData()
{
- CheckRandomData(Random, analyzer, 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, analyzer, 1000 * RandomMultiplier);
}
}
}
\ No newline at end of file
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestTrimFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestTrimFilter.cs
index bd00b2d..1943883 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestTrimFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestTrimFilter.cs
@@ -110,10 +110,10 @@ namespace Lucene.Net.Analysis.Miscellaneous
public virtual void TestRandomStrings()
{
Analyzer a = new AnalyzerAnonymousInnerClassHelper(this);
- CheckRandomData(Random, a, 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, a, 1000 * RandomMultiplier);
Analyzer b = new AnalyzerAnonymousInnerClassHelper2(this);
- CheckRandomData(Random, b, 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, b, 1000 * RandomMultiplier);
}
private class AnalyzerAnonymousInnerClassHelper : Analyzer
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestWordDelimiterFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestWordDelimiterFilter.cs
index cdec7d3..e01b509 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestWordDelimiterFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestWordDelimiterFilter.cs
@@ -435,7 +435,7 @@ namespace Lucene.Net.Analysis.Miscellaneous
}
Analyzer a = new AnalyzerAnonymousInnerClassHelper6(this, flags, protectedWords);
- CheckRandomData(Random, a, 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, a, 1000 * RandomMultiplier);
}
}
@@ -481,7 +481,7 @@ namespace Lucene.Net.Analysis.Miscellaneous
}
Analyzer a = new AnalyzerAnonymousInnerClassHelper7(this, flags, protectedWords);
- CheckRandomData(Random, a, 100 * RANDOM_MULTIPLIER, 8192);
+ CheckRandomData(Random, a, 100 * RandomMultiplier, 8192);
}
}
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/NGram/EdgeNGramTokenFilterTest.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/NGram/EdgeNGramTokenFilterTest.cs
index bed26aa..51016c0 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/NGram/EdgeNGramTokenFilterTest.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/NGram/EdgeNGramTokenFilterTest.cs
@@ -262,11 +262,11 @@ namespace Lucene.Net.Analysis.NGram
int max = TestUtil.NextInt32(Random, min, 20);
Analyzer a = new AnalyzerAnonymousInnerClassHelper2(this, min, max);
- CheckRandomData(Random, a, 100 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, a, 100 * RandomMultiplier);
}
Analyzer b = new AnalyzerAnonymousInnerClassHelper3(this);
- CheckRandomData(Random, b, 1000 * RANDOM_MULTIPLIER, 20, false, false);
+ CheckRandomData(Random, b, 1000 * RandomMultiplier, 20, false, false);
}
private class AnalyzerAnonymousInnerClassHelper2 : Analyzer
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/NGram/EdgeNGramTokenizerTest.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/NGram/EdgeNGramTokenizerTest.cs
index 921091e..e03c572 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/NGram/EdgeNGramTokenizerTest.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/NGram/EdgeNGramTokenizerTest.cs
@@ -143,13 +143,13 @@ namespace Lucene.Net.Analysis.NGram
int max = TestUtil.NextInt32(Random, min, 20);
Analyzer a = new AnalyzerAnonymousInnerClassHelper(this, min, max);
- CheckRandomData(Random, a, 100 * RANDOM_MULTIPLIER, 20);
- CheckRandomData(Random, a, 10 * RANDOM_MULTIPLIER, 8192);
+ CheckRandomData(Random, a, 100 * RandomMultiplier, 20);
+ CheckRandomData(Random, a, 10 * RandomMultiplier, 8192);
}
Analyzer b = new AnalyzerAnonymousInnerClassHelper2(this);
- CheckRandomData(Random, b, 1000 * RANDOM_MULTIPLIER, 20, false, false);
- CheckRandomData(Random, b, 100 * RANDOM_MULTIPLIER, 8192, false, false);
+ CheckRandomData(Random, b, 1000 * RandomMultiplier, 20, false, false);
+ CheckRandomData(Random, b, 100 * RandomMultiplier, 8192, false, false);
}
private class AnalyzerAnonymousInnerClassHelper : Analyzer
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/NGram/NGramTokenFilterTest.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/NGram/NGramTokenFilterTest.cs
index 06d159e..207903a 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/NGram/NGramTokenFilterTest.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/NGram/NGramTokenFilterTest.cs
@@ -161,7 +161,7 @@ namespace Lucene.Net.Analysis.NGram
int min = TestUtil.NextInt32(Random, 2, 10);
int max = TestUtil.NextInt32(Random, min, 20);
Analyzer a = new AnalyzerAnonymousInnerClassHelper2(this, min, max);
- CheckRandomData(Random, a, 200 * RANDOM_MULTIPLIER, 20);
+ CheckRandomData(Random, a, 200 * RandomMultiplier, 20);
}
}
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/NGram/NGramTokenizerTest.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/NGram/NGramTokenizerTest.cs
index 0277a44..2841ecb 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/NGram/NGramTokenizerTest.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/NGram/NGramTokenizerTest.cs
@@ -116,8 +116,8 @@ namespace Lucene.Net.Analysis.NGram
int min = TestUtil.NextInt32(Random, 2, 10);
int max = TestUtil.NextInt32(Random, min, 20);
Analyzer a = new AnalyzerAnonymousInnerClassHelper(this, min, max);
- CheckRandomData(Random, a, 200 * RANDOM_MULTIPLIER, 20);
- CheckRandomData(Random, a, 10 * RANDOM_MULTIPLIER, 1027);
+ CheckRandomData(Random, a, 200 * RandomMultiplier, 20);
+ CheckRandomData(Random, a, 10 * RandomMultiplier, 1027);
}
}
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Nl/TestDutchStemmer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Nl/TestDutchStemmer.cs
index 6c32421..c5761cd 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Nl/TestDutchStemmer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Nl/TestDutchStemmer.cs
@@ -233,7 +233,7 @@ namespace Lucene.Net.Analysis.Nl
/// blast some random strings through the analyzer </summary>
public virtual void TestRandomStrings()
{
- CheckRandomData(Random, new DutchAnalyzer(TEST_VERSION_CURRENT), 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, new DutchAnalyzer(TEST_VERSION_CURRENT), 1000 * RandomMultiplier);
}
}
}
\ No newline at end of file
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/No/TestNorwegianAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/No/TestNorwegianAnalyzer.cs
index a1672b4..2976e45 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/No/TestNorwegianAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/No/TestNorwegianAnalyzer.cs
@@ -61,7 +61,7 @@ namespace Lucene.Net.Analysis.No
[Test]
public virtual void TestRandomStrings()
{
- CheckRandomData(Random, new NorwegianAnalyzer(TEST_VERSION_CURRENT), 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, new NorwegianAnalyzer(TEST_VERSION_CURRENT), 1000 * RandomMultiplier);
}
}
}
\ No newline at end of file
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/No/TestNorwegianLightStemFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/No/TestNorwegianLightStemFilter.cs
index 99817bf..fae4fe8 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/No/TestNorwegianLightStemFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/No/TestNorwegianLightStemFilter.cs
@@ -111,7 +111,7 @@ namespace Lucene.Net.Analysis.No
public virtual void TestRandomStrings()
{
Random random = Random;
- CheckRandomData(random, analyzer, 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(random, analyzer, 1000 * RandomMultiplier);
}
[Test]
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/No/TestNorwegianMinimalStemFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/No/TestNorwegianMinimalStemFilter.cs
index 0d07cef..9ecec2b 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/No/TestNorwegianMinimalStemFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/No/TestNorwegianMinimalStemFilter.cs
@@ -111,7 +111,7 @@ namespace Lucene.Net.Analysis.No
public virtual void TestRandomStrings()
{
Random random = Random;
- CheckRandomData(random, analyzer, 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(random, analyzer, 1000 * RandomMultiplier);
}
[Test]
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Path/TestPathHierarchyTokenizer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Path/TestPathHierarchyTokenizer.cs
index 706106d..465fa9b 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Path/TestPathHierarchyTokenizer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Path/TestPathHierarchyTokenizer.cs
@@ -156,7 +156,7 @@ namespace Lucene.Net.Analysis.Path
public virtual void TestRandomStrings()
{
Analyzer a = new AnalyzerAnonymousInnerClassHelper(this);
- CheckRandomData(Random, a, 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, a, 1000 * RandomMultiplier);
}
private class AnalyzerAnonymousInnerClassHelper : Analyzer
@@ -182,7 +182,7 @@ namespace Lucene.Net.Analysis.Path
{
Random random = Random;
Analyzer a = new AnalyzerAnonymousInnerClassHelper2(this);
- CheckRandomData(random, a, 100 * RANDOM_MULTIPLIER, 1027);
+ CheckRandomData(random, a, 100 * RandomMultiplier, 1027);
}
private class AnalyzerAnonymousInnerClassHelper2 : Analyzer
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Path/TestReversePathHierarchyTokenizer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Path/TestReversePathHierarchyTokenizer.cs
index f120442..8ac6e58 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Path/TestReversePathHierarchyTokenizer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Path/TestReversePathHierarchyTokenizer.cs
@@ -125,7 +125,7 @@ namespace Lucene.Net.Analysis.Path
public virtual void TestRandomStrings()
{
Analyzer a = new AnalyzerAnonymousInnerClassHelper(this);
- CheckRandomData(Random, a, 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, a, 1000 * RandomMultiplier);
}
private class AnalyzerAnonymousInnerClassHelper : Analyzer
@@ -151,7 +151,7 @@ namespace Lucene.Net.Analysis.Path
{
Random random = Random;
Analyzer a = new AnalyzerAnonymousInnerClassHelper2(this);
- CheckRandomData(random, a, 100 * RANDOM_MULTIPLIER, 1027);
+ CheckRandomData(random, a, 100 * RandomMultiplier, 1027);
}
private class AnalyzerAnonymousInnerClassHelper2 : Analyzer
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pattern/TestPatternCaptureGroupTokenFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pattern/TestPatternCaptureGroupTokenFilter.cs
index c71b7bc..05d3bd5 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pattern/TestPatternCaptureGroupTokenFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pattern/TestPatternCaptureGroupTokenFilter.cs
@@ -180,7 +180,7 @@ namespace Lucene.Net.Analysis.Pattern
{
Analyzer a = new AnalyzerAnonymousInnerClassHelper(this);
- CheckRandomData(Random, a, 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, a, 1000 * RandomMultiplier);
}
private class AnalyzerAnonymousInnerClassHelper : Analyzer
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pattern/TestPatternReplaceCharFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pattern/TestPatternReplaceCharFilter.cs
index 316762f..e425e3d 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pattern/TestPatternReplaceCharFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pattern/TestPatternReplaceCharFilter.cs
@@ -264,7 +264,7 @@ namespace Lucene.Net.Analysis.Pattern
const int maxInputLength = 30;
/* ASCII only input?: */
const bool asciiOnly = true;
- CheckRandomData(random, a, 250 * RANDOM_MULTIPLIER, maxInputLength, asciiOnly);
+ CheckRandomData(random, a, 250 * RandomMultiplier, maxInputLength, asciiOnly);
}
}
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pattern/TestPatternReplaceFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pattern/TestPatternReplaceFilter.cs
index d9588f4..427bc7b 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pattern/TestPatternReplaceFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pattern/TestPatternReplaceFilter.cs
@@ -72,10 +72,10 @@ namespace Lucene.Net.Analysis.Pattern
public virtual void TestRandomStrings()
{
Analyzer a = new AnalyzerAnonymousInnerClassHelper(this);
- CheckRandomData(Random, a, 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, a, 1000 * RandomMultiplier);
Analyzer b = new AnalyzerAnonymousInnerClassHelper2(this);
- CheckRandomData(Random, b, 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, b, 1000 * RandomMultiplier);
}
private class AnalyzerAnonymousInnerClassHelper : Analyzer
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pattern/TestPatternTokenizer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pattern/TestPatternTokenizer.cs
index 48a82e0..cbfcba3 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pattern/TestPatternTokenizer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pattern/TestPatternTokenizer.cs
@@ -121,10 +121,10 @@ namespace Lucene.Net.Analysis.Pattern
public virtual void TestRandomStrings()
{
Analyzer a = new AnalyzerAnonymousInnerClassHelper(this);
- CheckRandomData(Random, a, 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, a, 1000 * RandomMultiplier);
Analyzer b = new AnalyzerAnonymousInnerClassHelper2(this);
- CheckRandomData(Random, b, 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, b, 1000 * RandomMultiplier);
}
private class AnalyzerAnonymousInnerClassHelper : Analyzer
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pt/TestPortugueseAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pt/TestPortugueseAnalyzer.cs
index 99b868d..76ae875 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pt/TestPortugueseAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pt/TestPortugueseAnalyzer.cs
@@ -62,7 +62,7 @@ namespace Lucene.Net.Analysis.Pt
[Test]
public virtual void TestRandomStrings()
{
- CheckRandomData(Random, new PortugueseAnalyzer(TEST_VERSION_CURRENT), 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, new PortugueseAnalyzer(TEST_VERSION_CURRENT), 1000 * RandomMultiplier);
}
}
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pt/TestPortugueseLightStemFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pt/TestPortugueseLightStemFilter.cs
index 187061c..b543caa 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pt/TestPortugueseLightStemFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pt/TestPortugueseLightStemFilter.cs
@@ -124,7 +124,7 @@ namespace Lucene.Net.Analysis.Pt
[Test]
public virtual void TestRandomStrings()
{
- CheckRandomData(Random, analyzer, 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, analyzer, 1000 * RandomMultiplier);
}
[Test]
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pt/TestPortugueseMinimalStemFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pt/TestPortugueseMinimalStemFilter.cs
index c5dbc5a..7a53af5 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pt/TestPortugueseMinimalStemFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pt/TestPortugueseMinimalStemFilter.cs
@@ -96,7 +96,7 @@ namespace Lucene.Net.Analysis.Pt
[Test]
public virtual void TestRandomStrings()
{
- CheckRandomData(Random, analyzer, 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, analyzer, 1000 * RandomMultiplier);
}
[Test]
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pt/TestPortugueseStemFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pt/TestPortugueseStemFilter.cs
index 36edcc3..bc92c46 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pt/TestPortugueseStemFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pt/TestPortugueseStemFilter.cs
@@ -96,7 +96,7 @@ namespace Lucene.Net.Analysis.Pt
[Test]
public virtual void TestRandomStrings()
{
- CheckRandomData(Random, analyzer, 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, analyzer, 1000 * RandomMultiplier);
}
[Test]
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Reverse/TestReverseStringFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Reverse/TestReverseStringFilter.cs
index da8ed49..962275c 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Reverse/TestReverseStringFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Reverse/TestReverseStringFilter.cs
@@ -113,7 +113,7 @@ namespace Lucene.Net.Analysis.Reverse
public virtual void TestRandomStrings()
{
Analyzer a = new AnalyzerAnonymousInnerClassHelper(this);
- CheckRandomData(Random, a, 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, a, 1000 * RandomMultiplier);
}
private class AnalyzerAnonymousInnerClassHelper : Analyzer
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ro/TestRomanianAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ro/TestRomanianAnalyzer.cs
index a867671..2ae18f2 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ro/TestRomanianAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ro/TestRomanianAnalyzer.cs
@@ -60,7 +60,7 @@ namespace Lucene.Net.Analysis.Ro
[Test]
public virtual void TestRandomStrings()
{
- CheckRandomData(Random, new RomanianAnalyzer(TEST_VERSION_CURRENT), 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, new RomanianAnalyzer(TEST_VERSION_CURRENT), 1000 * RandomMultiplier);
}
}
}
\ No newline at end of file
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ru/TestRussianAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ru/TestRussianAnalyzer.cs
index 52c8706..fb6b247 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ru/TestRussianAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ru/TestRussianAnalyzer.cs
@@ -72,7 +72,7 @@ namespace Lucene.Net.Analysis.Ru
[Test]
public virtual void TestRandomStrings()
{
- CheckRandomData(Random, new RussianAnalyzer(TEST_VERSION_CURRENT), 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, new RussianAnalyzer(TEST_VERSION_CURRENT), 1000 * RandomMultiplier);
}
}
}
\ No newline at end of file
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ru/TestRussianLightStemFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ru/TestRussianLightStemFilter.cs
index 714ce4a..5b448bc 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ru/TestRussianLightStemFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ru/TestRussianLightStemFilter.cs
@@ -84,7 +84,7 @@ namespace Lucene.Net.Analysis.Ru
[Test]
public virtual void TestRandomStrings()
{
- CheckRandomData(Random, analyzer, 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, analyzer, 1000 * RandomMultiplier);
}
[Test]
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Shingle/ShingleFilterTest.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Shingle/ShingleFilterTest.cs
index 43d6ecb..4a0b881 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Shingle/ShingleFilterTest.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Shingle/ShingleFilterTest.cs
@@ -511,7 +511,7 @@ namespace Lucene.Net.Analysis.Shingle
public virtual void TestRandomStrings()
{
Analyzer a = new AnalyzerAnonymousInnerClassHelper(this);
- CheckRandomData(Random, a, 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, a, 1000 * RandomMultiplier);
}
private class AnalyzerAnonymousInnerClassHelper : Analyzer
@@ -537,7 +537,7 @@ namespace Lucene.Net.Analysis.Shingle
{
Random random = Random;
Analyzer a = new AnalyzerAnonymousInnerClassHelper2(this);
- CheckRandomData(random, a, 100 * RANDOM_MULTIPLIER, 8192);
+ CheckRandomData(random, a, 100 * RandomMultiplier, 8192);
}
private class AnalyzerAnonymousInnerClassHelper2 : Analyzer
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Snowball/TestSnowball.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Snowball/TestSnowball.cs
index cdee01e..705312a 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Snowball/TestSnowball.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Snowball/TestSnowball.cs
@@ -206,7 +206,7 @@ namespace Lucene.Net.Analysis.Snowball
public virtual void CheckRandomStrings(string snowballLanguage)
{
Analyzer a = new AnalyzerAnonymousInnerClassHelper2(this, snowballLanguage);
- CheckRandomData(Random, a, 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, a, 1000 * RandomMultiplier);
}
private class AnalyzerAnonymousInnerClassHelper2 : Analyzer
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Snowball/TestSnowballVocab.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Snowball/TestSnowballVocab.cs
index 94c8166..169b252 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Snowball/TestSnowballVocab.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Snowball/TestSnowballVocab.cs
@@ -66,7 +66,7 @@ namespace Lucene.Net.Analysis.Snowball
/// </summary>
private void AssertCorrectOutput(string snowballLanguage, string dataDirectory)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("checking snowball language: " + snowballLanguage);
}
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Sv/TestSwedishAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Sv/TestSwedishAnalyzer.cs
index 780968c..d245f01 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Sv/TestSwedishAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Sv/TestSwedishAnalyzer.cs
@@ -61,7 +61,7 @@ namespace Lucene.Net.Analysis.Sv
[Test]
public virtual void TestRandomStrings()
{
- CheckRandomData(Random, new SwedishAnalyzer(TEST_VERSION_CURRENT), 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, new SwedishAnalyzer(TEST_VERSION_CURRENT), 1000 * RandomMultiplier);
}
}
}
\ No newline at end of file
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Sv/TestSwedishLightStemFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Sv/TestSwedishLightStemFilter.cs
index e21f6d5..6e64b8b 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Sv/TestSwedishLightStemFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Sv/TestSwedishLightStemFilter.cs
@@ -84,7 +84,7 @@ namespace Lucene.Net.Analysis.Sv
[Test]
public virtual void TestRandomStrings()
{
- CheckRandomData(Random, analyzer, 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, analyzer, 1000 * RandomMultiplier);
}
[Test]
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Synonym/TestSynonymMapFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Synonym/TestSynonymMapFilter.cs
index be8ed0a..504aec1 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Synonym/TestSynonymMapFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Synonym/TestSynonymMapFilter.cs
@@ -48,7 +48,7 @@ namespace Lucene.Net.Analysis.Synonym
private void Add(string input, string output, bool keepOrig)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" add input=" + input + " output=" + output + " keepOrig=" + keepOrig);
}
@@ -81,7 +81,7 @@ namespace Lucene.Net.Analysis.Synonym
// the tests are a little messy
private void Verify(string input, string output)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: verify input=" + input + " expectedOutput=" + output);
}
@@ -93,7 +93,7 @@ namespace Lucene.Net.Analysis.Synonym
while (tokensOut.IncrementToken())
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" incr token=" + termAtt.ToString() + " posIncr=" + posIncrAtt.PositionIncrement + " startOff=" + offsetAtt.StartOffset + " endOff=" + offsetAtt.EndOffset);
}
@@ -108,7 +108,7 @@ namespace Lucene.Net.Analysis.Synonym
if (atPos > 0)
{
assertTrue(tokensOut.IncrementToken());
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" incr token=" + termAtt.ToString() + " posIncr=" + posIncrAtt.PositionIncrement + " startOff=" + offsetAtt.StartOffset + " endOff=" + offsetAtt.EndOffset);
}
@@ -149,7 +149,7 @@ namespace Lucene.Net.Analysis.Synonym
}
tokensOut.End();
tokensOut.Dispose();
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" incr: END");
}
@@ -468,7 +468,7 @@ namespace Lucene.Net.Analysis.Synonym
string document = GetRandomString('a', alphabetSize, docLen);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: doc=" + document);
}
@@ -479,7 +479,7 @@ namespace Lucene.Net.Analysis.Synonym
IDictionary<string, OneSyn> synMap = new Dictionary<string, OneSyn>();
IList<OneSyn> syns = new List<OneSyn>();
bool dedup = Random.nextBoolean();
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" dedup=" + dedup);
}
@@ -499,7 +499,7 @@ namespace Lucene.Net.Analysis.Synonym
string synOut = GetRandomString('0', 10, TestUtil.NextInt32(Random, 1, 5)).Trim();
s.@out.Add(synOut);
Add(synIn, synOut, s.keepOrig);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" syns[" + synIDX + "] = " + s.@in + " -> " + s.@out + " keepOrig=" + s.keepOrig);
}
@@ -525,7 +525,7 @@ namespace Lucene.Net.Analysis.Synonym
string expected = SlowSynMatcher(document, syns, 5);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: expected=" + expected);
}
@@ -746,7 +746,7 @@ namespace Lucene.Net.Analysis.Synonym
{
b = new SynonymMap.Builder(random.nextBoolean());
int numEntries = AtLeast(10);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: iter=" + i + " numEntries=" + numEntries);
}
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Th/TestThaiAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Th/TestThaiAnalyzer.cs
index 018bd4c..e8ceb75 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Th/TestThaiAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Th/TestThaiAnalyzer.cs
@@ -177,7 +177,7 @@ namespace Lucene.Net.Analysis.Th
[Test]
public virtual void TestRandomStrings()
{
- CheckRandomData(Random, new ThaiAnalyzer(TEST_VERSION_CURRENT), 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, new ThaiAnalyzer(TEST_VERSION_CURRENT), 1000 * RandomMultiplier);
}
/// <summary>
@@ -187,7 +187,7 @@ namespace Lucene.Net.Analysis.Th
public virtual void TestRandomHugeStrings()
{
Random random = Random;
- CheckRandomData(random, new ThaiAnalyzer(TEST_VERSION_CURRENT), 100 * RANDOM_MULTIPLIER, 8192);
+ CheckRandomData(random, new ThaiAnalyzer(TEST_VERSION_CURRENT), 100 * RandomMultiplier, 8192);
}
// LUCENE-3044
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Tr/TestTurkishAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Tr/TestTurkishAnalyzer.cs
index 12c22ec..6a40bcc 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Tr/TestTurkishAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Tr/TestTurkishAnalyzer.cs
@@ -64,7 +64,7 @@ namespace Lucene.Net.Analysis.Tr
[Test]
public virtual void TestRandomStrings()
{
- CheckRandomData(Random, new TurkishAnalyzer(TEST_VERSION_CURRENT), 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, new TurkishAnalyzer(TEST_VERSION_CURRENT), 1000 * RandomMultiplier);
}
}
}
\ No newline at end of file
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestCharArrayMap.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestCharArrayMap.cs
index 13a23bb..14a290a 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestCharArrayMap.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestCharArrayMap.cs
@@ -66,7 +66,7 @@ namespace Lucene.Net.Analysis.Util
[Test]
public virtual void TestCharArrayMap()
{
- int num = 5 * RANDOM_MULTIPLIER;
+ int num = 5 * RandomMultiplier;
for (int i = 0; i < num; i++)
{ // pump this up for more random testing
DoRandom(1000, false);
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestCharTokenizers.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestCharTokenizers.cs
index 9b6fcd6..51dc9c1 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestCharTokenizers.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestCharTokenizers.cs
@@ -46,7 +46,7 @@ namespace Lucene.Net.Analysis.Util
var builder = new StringBuilder();
// create random input
var num = 1024 + Random.Next(1024);
- num *= RANDOM_MULTIPLIER;
+ num *= RandomMultiplier;
for (var i = 1; i < num; i++)
{
builder.Append("\ud801\udc1cabc");
@@ -121,7 +121,7 @@ namespace Lucene.Net.Analysis.Util
public virtual void TestCrossPlaneNormalization()
{
var analyzer = new AnalyzerAnonymousInnerClassHelper();
- var num = 1000 * RANDOM_MULTIPLIER;
+ var num = 1000 * RandomMultiplier;
for (var i = 0; i < num; i++)
{
var s = TestUtil.RandomUnicodeString(Random);
@@ -184,7 +184,7 @@ namespace Lucene.Net.Analysis.Util
public virtual void TestCrossPlaneNormalization2()
{
var analyzer = new AnalyzerAnonymousInnerClassHelper2();
- var num = 1000 * RANDOM_MULTIPLIER;
+ var num = 1000 * RandomMultiplier;
for (var i = 0; i < num; i++)
{
var s = TestUtil.RandomUnicodeString(Random);
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestRollingCharBuffer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestRollingCharBuffer.cs
index 940d858..807b368 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestRollingCharBuffer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestRollingCharBuffer.cs
@@ -46,7 +46,7 @@ namespace Lucene.Net.Analysis.Util
{
s = TestUtil.RandomUnicodeString(random, stringLen);
}
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("\nTEST: iter=" + iter + " s.length()=" + s.Length);
}
@@ -55,14 +55,14 @@ namespace Lucene.Net.Analysis.Util
var availCount = 0;
while (nextRead < s.Length)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" cycle nextRead=" + nextRead + " avail=" + availCount);
}
if (availCount == 0 || random.NextBoolean())
{
// Read next char
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" new char");
}
@@ -74,7 +74,7 @@ namespace Lucene.Net.Analysis.Util
{
// Read previous char
var pos = TestUtil.NextInt32(random, nextRead - availCount, nextRead - 1);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" old char pos=" + pos);
}
@@ -101,7 +101,7 @@ namespace Lucene.Net.Analysis.Util
{
start = nextRead - availCount + random.Next(availCount - length);
}
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" slice start=" + start + " length=" + length);
}
@@ -111,7 +111,7 @@ namespace Lucene.Net.Analysis.Util
if (availCount > 0 && random.Next(20) == 17)
{
var toFree = random.Next(availCount);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" free " + toFree + " (avail=" + (availCount - toFree) + ")");
}
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestSegmentingTokenizerBase.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestSegmentingTokenizerBase.cs
index 9157740..bd2f9e8 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestSegmentingTokenizerBase.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestSegmentingTokenizerBase.cs
@@ -117,8 +117,8 @@ namespace Lucene.Net.Analysis.Util
[Test]
public virtual void TestRandomStrings()
{
- CheckRandomData(Random, sentence, 10000 * RANDOM_MULTIPLIER);
- CheckRandomData(Random, sentenceAndWord, 10000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, sentence, 10000 * RandomMultiplier);
+ CheckRandomData(Random, sentenceAndWord, 10000 * RandomMultiplier);
}
// some tokenizers for testing
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Wikipedia/WikipediaTokenizerTest.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Wikipedia/WikipediaTokenizerTest.cs
index 745c21c..7cddc75 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Wikipedia/WikipediaTokenizerTest.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Wikipedia/WikipediaTokenizerTest.cs
@@ -115,7 +115,7 @@ namespace Lucene.Net.Analysis.Wikipedia
public virtual void TestRandomStrings()
{
Analyzer a = new AnalyzerAnonymousInnerClassHelper(this);
- CheckRandomData(Random, a, 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, a, 1000 * RandomMultiplier);
}
private class AnalyzerAnonymousInnerClassHelper : Analyzer
@@ -141,7 +141,7 @@ namespace Lucene.Net.Analysis.Wikipedia
{
Random random = Random;
Analyzer a = new AnalyzerAnonymousInnerClassHelper2(this);
- CheckRandomData(random, a, 100 * RANDOM_MULTIPLIER, 8192);
+ CheckRandomData(random, a, 100 * RandomMultiplier, 8192);
}
private class AnalyzerAnonymousInnerClassHelper2 : Analyzer
diff --git a/src/Lucene.Net.Tests.Analysis.ICU/Analysis/Icu/Segmentation/TestICUTokenizer.cs b/src/Lucene.Net.Tests.Analysis.ICU/Analysis/Icu/Segmentation/TestICUTokenizer.cs
index a6e5451..336aef8 100644
--- a/src/Lucene.Net.Tests.Analysis.ICU/Analysis/Icu/Segmentation/TestICUTokenizer.cs
+++ b/src/Lucene.Net.Tests.Analysis.ICU/Analysis/Icu/Segmentation/TestICUTokenizer.cs
@@ -324,7 +324,7 @@ namespace Lucene.Net.Analysis.Icu.Segmentation
[Test]
public void TestRandomStrings()
{
- CheckRandomData(Random, a, 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, a, 1000 * RandomMultiplier);
}
/** blast some random large strings through the analyzer */
@@ -332,7 +332,7 @@ namespace Lucene.Net.Analysis.Icu.Segmentation
public void TestRandomHugeStrings()
{
Random random = Random;
- CheckRandomData(random, a, 100 * RANDOM_MULTIPLIER, 8192);
+ CheckRandomData(random, a, 100 * RandomMultiplier, 8192);
}
[Test]
@@ -382,7 +382,7 @@ namespace Lucene.Net.Analysis.Icu.Segmentation
}
tokenizer.End();
- if (VERBOSE)
+ if (Verbose)
{
SystemConsole.Out.WriteLine(tokenCount);
}
diff --git a/src/Lucene.Net.Tests.Analysis.ICU/Analysis/Icu/Segmentation/TestICUTokenizerCJK.cs b/src/Lucene.Net.Tests.Analysis.ICU/Analysis/Icu/Segmentation/TestICUTokenizerCJK.cs
index 116f5fc..92e3cd0 100644
--- a/src/Lucene.Net.Tests.Analysis.ICU/Analysis/Icu/Segmentation/TestICUTokenizerCJK.cs
+++ b/src/Lucene.Net.Tests.Analysis.ICU/Analysis/Icu/Segmentation/TestICUTokenizerCJK.cs
@@ -114,7 +114,7 @@ namespace Lucene.Net.Analysis.Icu.Segmentation
[Test]
public void TestRandomStrings()
{
- CheckRandomData(Random, a, 10000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, a, 10000 * RandomMultiplier);
}
/** blast some random large strings through the analyzer */
@@ -122,7 +122,7 @@ namespace Lucene.Net.Analysis.Icu.Segmentation
public void TestRandomHugeStrings()
{
Random random = Random;
- CheckRandomData(random, a, 100 * RANDOM_MULTIPLIER, 8192);
+ CheckRandomData(random, a, 100 * RandomMultiplier, 8192);
}
}
}
\ No newline at end of file
diff --git a/src/Lucene.Net.Tests.Analysis.ICU/Analysis/Icu/TestICUFoldingFilter.cs b/src/Lucene.Net.Tests.Analysis.ICU/Analysis/Icu/TestICUFoldingFilter.cs
index 6cca491..d3f94d1 100644
--- a/src/Lucene.Net.Tests.Analysis.ICU/Analysis/Icu/TestICUFoldingFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.ICU/Analysis/Icu/TestICUFoldingFilter.cs
@@ -93,7 +93,7 @@ namespace Lucene.Net.Analysis.Icu
[Test]
public void TestRandomStrings()
{
- CheckRandomData(Random, a, 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, a, 1000 * RandomMultiplier);
}
[Test]
diff --git a/src/Lucene.Net.Tests.Analysis.ICU/Analysis/Icu/TestICUNormalizer2CharFilter.cs b/src/Lucene.Net.Tests.Analysis.ICU/Analysis/Icu/TestICUNormalizer2CharFilter.cs
index b72d7ee..c929e01 100644
--- a/src/Lucene.Net.Tests.Analysis.ICU/Analysis/Icu/TestICUNormalizer2CharFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.ICU/Analysis/Icu/TestICUNormalizer2CharFilter.cs
@@ -140,61 +140,61 @@ namespace Lucene.Net.Analysis.Icu
[Test]
public void TestNFC()
{
- DoTestMode(Normalizer2.GetInstance(null, "nfc", Normalizer2Mode.Compose), 20, RANDOM_MULTIPLIER * 1000, 128);
+ DoTestMode(Normalizer2.GetInstance(null, "nfc", Normalizer2Mode.Compose), 20, RandomMultiplier * 1000, 128);
}
[Test]
public void TestNFCHuge()
{
- DoTestMode(Normalizer2.GetInstance(null, "nfc", Normalizer2Mode.Compose), 256, RANDOM_MULTIPLIER * 500, 16);
+ DoTestMode(Normalizer2.GetInstance(null, "nfc", Normalizer2Mode.Compose), 256, RandomMultiplier * 500, 16);
}
[Test]
public void TestNFD()
{
- DoTestMode(Normalizer2.GetInstance(null, "nfc", Normalizer2Mode.Decompose), 20, RANDOM_MULTIPLIER * 1000, 128);
+ DoTestMode(Normalizer2.GetInstance(null, "nfc", Normalizer2Mode.Decompose), 20, RandomMultiplier * 1000, 128);
}
[Test]
public void TestNFDHuge()
{
- DoTestMode(Normalizer2.GetInstance(null, "nfc", Normalizer2Mode.Decompose), 256, RANDOM_MULTIPLIER * 500, 16);
+ DoTestMode(Normalizer2.GetInstance(null, "nfc", Normalizer2Mode.Decompose), 256, RandomMultiplier * 500, 16);
}
[Test]
public void TestNFKC()
{
- DoTestMode(Normalizer2.GetInstance(null, "nfkc", Normalizer2Mode.Compose), 20, RANDOM_MULTIPLIER * 1000, 128);
+ DoTestMode(Normalizer2.GetInstance(null, "nfkc", Normalizer2Mode.Compose), 20, RandomMultiplier * 1000, 128);
}
[Test]
public void TestNFKCHuge()
{
- DoTestMode(Normalizer2.GetInstance(null, "nfkc", Normalizer2Mode.Compose), 256, RANDOM_MULTIPLIER * 500, 16);
+ DoTestMode(Normalizer2.GetInstance(null, "nfkc", Normalizer2Mode.Compose), 256, RandomMultiplier * 500, 16);
}
[Test]
public void TestNFKD()
{
- DoTestMode(Normalizer2.GetInstance(null, "nfkc", Normalizer2Mode.Decompose), 20, RANDOM_MULTIPLIER * 1000, 128);
+ DoTestMode(Normalizer2.GetInstance(null, "nfkc", Normalizer2Mode.Decompose), 20, RandomMultiplier * 1000, 128);
}
[Test]
public void TestNFKDHuge()
{
- DoTestMode(Normalizer2.GetInstance(null, "nfkc", Normalizer2Mode.Decompose), 256, RANDOM_MULTIPLIER * 500, 16);
+ DoTestMode(Normalizer2.GetInstance(null, "nfkc", Normalizer2Mode.Decompose), 256, RandomMultiplier * 500, 16);
}
[Test]
public void TestNFKC_CF()
{
- DoTestMode(Normalizer2.GetInstance(null, "nfkc_cf", Normalizer2Mode.Compose), 20, RANDOM_MULTIPLIER * 1000, 128);
+ DoTestMode(Normalizer2.GetInstance(null, "nfkc_cf", Normalizer2Mode.Compose), 20, RandomMultiplier * 1000, 128);
}
[Test]
public void TestNFKC_CFHuge()
{
- DoTestMode(Normalizer2.GetInstance(null, "nfkc_cf", Normalizer2Mode.Compose), 256, RANDOM_MULTIPLIER * 500, 16);
+ DoTestMode(Normalizer2.GetInstance(null, "nfkc_cf", Normalizer2Mode.Compose), 256, RandomMultiplier * 500, 16);
}
//@AwaitsFix(bugUrl = "https://issues.apache.org/jira/browse/LUCENE-5595")
@@ -211,9 +211,9 @@ namespace Lucene.Net.Analysis.Icu
return new ICUNormalizer2CharFilter(reader, Normalizer2.GetInstance(null, "nfkc_cf", Normalizer2Mode.Compose));
}))
{
- CheckRandomData(Random, a, 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, a, 1000 * RandomMultiplier);
// huge strings
- CheckRandomData(Random, a, 100 * RANDOM_MULTIPLIER, 8192);
+ CheckRandomData(Random, a, 100 * RandomMultiplier, 8192);
}
// nfkd
@@ -225,9 +225,9 @@ namespace Lucene.Net.Analysis.Icu
return new ICUNormalizer2CharFilter(reader, Normalizer2.GetInstance(null, "nfkc", Normalizer2Mode.Decompose));
}))
{
- CheckRandomData(Random, a, 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, a, 1000 * RandomMultiplier);
// huge strings
- CheckRandomData(Random, a, 100 * RANDOM_MULTIPLIER, 8192);
+ CheckRandomData(Random, a, 100 * RandomMultiplier, 8192);
}
}
diff --git a/src/Lucene.Net.Tests.Analysis.ICU/Analysis/Icu/TestICUNormalizer2Filter.cs b/src/Lucene.Net.Tests.Analysis.ICU/Analysis/Icu/TestICUNormalizer2Filter.cs
index 5cad108..1ee1ad3 100644
--- a/src/Lucene.Net.Tests.Analysis.ICU/Analysis/Icu/TestICUNormalizer2Filter.cs
+++ b/src/Lucene.Net.Tests.Analysis.ICU/Analysis/Icu/TestICUNormalizer2Filter.cs
@@ -92,7 +92,7 @@ namespace Lucene.Net.Analysis.Icu
[Test]
public void TestRandomStrings()
{
- CheckRandomData(Random, a, 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, a, 1000 * RandomMultiplier);
}
[Test]
diff --git a/src/Lucene.Net.Tests.Analysis.ICU/Analysis/Icu/TestICUTransformFilter.cs b/src/Lucene.Net.Tests.Analysis.ICU/Analysis/Icu/TestICUTransformFilter.cs
index 99cffcb..3bb38e5 100644
--- a/src/Lucene.Net.Tests.Analysis.ICU/Analysis/Icu/TestICUTransformFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.ICU/Analysis/Icu/TestICUTransformFilter.cs
@@ -98,7 +98,7 @@ namespace Lucene.Net.Analysis.Icu
return new TokenStreamComponents(tokenizer, new ICUTransformFilter(tokenizer, transform));
}))
{
- CheckRandomData(Random, a, 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, a, 1000 * RandomMultiplier);
}
}
diff --git a/src/Lucene.Net.Tests.Analysis.ICU/Collation/TestICUCollationKeyAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.ICU/Collation/TestICUCollationKeyAnalyzer.cs
index 3dc8cb6..a486862 100644
--- a/src/Lucene.Net.Tests.Analysis.ICU/Collation/TestICUCollationKeyAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.ICU/Collation/TestICUCollationKeyAnalyzer.cs
@@ -102,7 +102,7 @@ namespace Lucene.Net.Collation
[Test]
public void TestThreadSafe()
{
- int iters = 20 * RANDOM_MULTIPLIER;
+ int iters = 20 * RandomMultiplier;
for (int i = 0; i < iters; i++)
{
CultureInfo locale = new CultureInfo("de");
diff --git a/src/Lucene.Net.Tests.Analysis.Kuromoji/Dict/TestTokenInfoDictionary.cs b/src/Lucene.Net.Tests.Analysis.Kuromoji/Dict/TestTokenInfoDictionary.cs
index c4b853d..1e3b35e 100644
--- a/src/Lucene.Net.Tests.Analysis.Kuromoji/Dict/TestTokenInfoDictionary.cs
+++ b/src/Lucene.Net.Tests.Analysis.Kuromoji/Dict/TestTokenInfoDictionary.cs
@@ -106,7 +106,7 @@ namespace Lucene.Net.Analysis.Ja.Dict
assertTrue(UnicodeUtil.ValidUTF16String(reading));
}
}
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("checked " + numTerms + " terms, " + numWords + " words.");
}
diff --git a/src/Lucene.Net.Tests.Analysis.Kuromoji/TestExtendedMode.cs b/src/Lucene.Net.Tests.Analysis.Kuromoji/TestExtendedMode.cs
index cb94ba3..4330ec9 100644
--- a/src/Lucene.Net.Tests.Analysis.Kuromoji/TestExtendedMode.cs
+++ b/src/Lucene.Net.Tests.Analysis.Kuromoji/TestExtendedMode.cs
@@ -70,14 +70,14 @@ namespace Lucene.Net.Analysis.Ja
public void TestRandomStrings()
{
Random random = Random;
- CheckRandomData(random, analyzer, 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(random, analyzer, 1000 * RandomMultiplier);
}
/** blast some random large strings through the analyzer */
public void TestRandomHugeStrings()
{
Random random = Random;
- CheckRandomData(random, analyzer, 100 * RANDOM_MULTIPLIER, 8192);
+ CheckRandomData(random, analyzer, 100 * RandomMultiplier, 8192);
}
}
}
diff --git a/src/Lucene.Net.Tests.Analysis.Kuromoji/TestJapaneseAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Kuromoji/TestJapaneseAnalyzer.cs
index 9ddda95..c0a8197 100644
--- a/src/Lucene.Net.Tests.Analysis.Kuromoji/TestJapaneseAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Kuromoji/TestJapaneseAnalyzer.cs
@@ -145,7 +145,7 @@ namespace Lucene.Net.Analysis.Ja
Analyzer a = new JapaneseAnalyzer(TEST_VERSION_CURRENT, null, JapaneseTokenizerMode.SEARCH,
JapaneseAnalyzer.GetDefaultStopSet(),
JapaneseAnalyzer.GetDefaultStopTags());
- CheckRandomData(random, a, 100 * RANDOM_MULTIPLIER, 8192);
+ CheckRandomData(random, a, 100 * RandomMultiplier, 8192);
}
// Copied from TestJapaneseTokenizer, to make sure passing
diff --git a/src/Lucene.Net.Tests.Analysis.Kuromoji/TestJapaneseIterationMarkCharFilter.cs b/src/Lucene.Net.Tests.Analysis.Kuromoji/TestJapaneseIterationMarkCharFilter.cs
index d694dd7..5ad3fa0 100644
--- a/src/Lucene.Net.Tests.Analysis.Kuromoji/TestJapaneseIterationMarkCharFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Kuromoji/TestJapaneseIterationMarkCharFilter.cs
@@ -211,14 +211,14 @@ namespace Lucene.Net.Analysis.Ja
public void TestRandomStrings()
{
// Blast some random strings through
- CheckRandomData(Random, keywordAnalyzer, 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, keywordAnalyzer, 1000 * RandomMultiplier);
}
[Test]
public void TestRandomHugeStrings()
{
// Blast some random strings through
- CheckRandomData(Random, keywordAnalyzer, 100 * RANDOM_MULTIPLIER, 8192);
+ CheckRandomData(Random, keywordAnalyzer, 100 * RandomMultiplier, 8192);
}
private void assertCharFilterEquals(CharFilter filter, String expected)
diff --git a/src/Lucene.Net.Tests.Analysis.Kuromoji/TestJapaneseKatakanaStemFilter.cs b/src/Lucene.Net.Tests.Analysis.Kuromoji/TestJapaneseKatakanaStemFilter.cs
index 8503aba..eefa403 100644
--- a/src/Lucene.Net.Tests.Analysis.Kuromoji/TestJapaneseKatakanaStemFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Kuromoji/TestJapaneseKatakanaStemFilter.cs
@@ -82,7 +82,7 @@ namespace Lucene.Net.Analysis.Ja
[Test]
public void TestRandomData()
{
- CheckRandomData(Random, analyzer, 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, analyzer, 1000 * RandomMultiplier);
}
[Test]
diff --git a/src/Lucene.Net.Tests.Analysis.Kuromoji/TestJapaneseReadingFormFilter.cs b/src/Lucene.Net.Tests.Analysis.Kuromoji/TestJapaneseReadingFormFilter.cs
index 74ecf15..8c85c52 100644
--- a/src/Lucene.Net.Tests.Analysis.Kuromoji/TestJapaneseReadingFormFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Kuromoji/TestJapaneseReadingFormFilter.cs
@@ -90,8 +90,8 @@ namespace Lucene.Net.Analysis.Ja
public void TestRandomData()
{
Random random = Random;
- CheckRandomData(random, katakanaAnalyzer, 1000 * RANDOM_MULTIPLIER);
- CheckRandomData(random, romajiAnalyzer, 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(random, katakanaAnalyzer, 1000 * RandomMultiplier);
+ CheckRandomData(random, romajiAnalyzer, 1000 * RandomMultiplier);
}
[Test]
diff --git a/src/Lucene.Net.Tests.Analysis.Kuromoji/TestJapaneseTokenizer.cs b/src/Lucene.Net.Tests.Analysis.Kuromoji/TestJapaneseTokenizer.cs
index 28bfb32..0d13094 100644
--- a/src/Lucene.Net.Tests.Analysis.Kuromoji/TestJapaneseTokenizer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Kuromoji/TestJapaneseTokenizer.cs
@@ -200,8 +200,8 @@ namespace Lucene.Net.Analysis.Ja
[Test]
public void TestRandomStrings()
{
- CheckRandomData(Random, analyzer, 1000 * RANDOM_MULTIPLIER);
- CheckRandomData(Random, analyzerNoPunct, 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, analyzer, 1000 * RandomMultiplier);
+ CheckRandomData(Random, analyzerNoPunct, 1000 * RandomMultiplier);
}
/** blast some random large strings through the analyzer */
@@ -210,8 +210,8 @@ namespace Lucene.Net.Analysis.Ja
public void TestRandomHugeStrings()
{
Random random = Random;
- CheckRandomData(random, analyzer, 100 * RANDOM_MULTIPLIER, 8192);
- CheckRandomData(random, analyzerNoPunct, 100 * RANDOM_MULTIPLIER, 8192);
+ CheckRandomData(random, analyzer, 100 * RandomMultiplier, 8192);
+ CheckRandomData(random, analyzerNoPunct, 100 * RandomMultiplier, 8192);
}
[Test]
@@ -226,7 +226,7 @@ namespace Lucene.Net.Analysis.Ja
TokenStream graph = new MockGraphTokenFilter(Random, tokenizer);
return new TokenStreamComponents(tokenizer, graph);
}),
- 100 * RANDOM_MULTIPLIER, 8192);
+ 100 * RandomMultiplier, 8192);
}
[Test]
@@ -266,7 +266,7 @@ namespace Lucene.Net.Analysis.Ja
int numIterations = AtLeast(10000);
for (int i = 0; i < numIterations; i++)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("\nTEST: iter=" + i);
}
@@ -768,7 +768,7 @@ namespace Lucene.Net.Analysis.Ja
String line = reader.ReadLine();
reader.Dispose();
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("Test for Bocchan without pre-splitting sentences");
}
@@ -800,7 +800,7 @@ namespace Lucene.Net.Analysis.Ja
}
}
String[] sentences = Regex.Split(line, "、|。").TrimEnd();
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("Total time : " + (Environment.TickCount - totalStart));
Console.WriteLine("Test for Bocchan with pre-splitting sentences (" + sentences.Length + " sentences)");
@@ -823,7 +823,7 @@ namespace Lucene.Net.Analysis.Ja
}
}
}
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("Total time : " + (Environment.TickCount - totalStart));
}
diff --git a/src/Lucene.Net.Tests.Analysis.Kuromoji/TestSearchMode.cs b/src/Lucene.Net.Tests.Analysis.Kuromoji/TestSearchMode.cs
index 6d69f49..812e9f2 100644
--- a/src/Lucene.Net.Tests.Analysis.Kuromoji/TestSearchMode.cs
+++ b/src/Lucene.Net.Tests.Analysis.Kuromoji/TestSearchMode.cs
@@ -60,7 +60,7 @@ namespace Lucene.Net.Analysis.Ja
{
continue;
}
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("Line no. " + lineNumber + ": " + line);
}
diff --git a/src/Lucene.Net.Tests.Analysis.Morfologik/Morfologik/TestMorfologikAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Morfologik/Morfologik/TestMorfologikAnalyzer.cs
index 9a81d70..ad8b876 100644
--- a/src/Lucene.Net.Tests.Analysis.Morfologik/Morfologik/TestMorfologikAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Morfologik/Morfologik/TestMorfologikAnalyzer.cs
@@ -232,7 +232,7 @@ namespace Lucene.Net.Analysis.Morfologik
public void TestRandom()
{
Analyzer a = getTestAnalyzer();
- CheckRandomData(Random, a, 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, a, 1000 * RandomMultiplier);
a.Dispose();
}
}
diff --git a/src/Lucene.Net.Tests.Analysis.Morfologik/Uk/TestUkrainianAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Morfologik/Uk/TestUkrainianAnalyzer.cs
index 5e8e414..282055a 100644
--- a/src/Lucene.Net.Tests.Analysis.Morfologik/Uk/TestUkrainianAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Morfologik/Uk/TestUkrainianAnalyzer.cs
@@ -85,7 +85,7 @@ namespace Lucene.Net.Analysis.Uk
public void TestRandomStrings()
{
Analyzer analyzer = new UkrainianMorfologikAnalyzer(TEST_VERSION_CURRENT);
- CheckRandomData(Random, analyzer, 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, analyzer, 1000 * RandomMultiplier);
analyzer.Dispose();
}
}
diff --git a/src/Lucene.Net.Tests.Analysis.Phonetic/DoubleMetaphoneFilterTest.cs b/src/Lucene.Net.Tests.Analysis.Phonetic/DoubleMetaphoneFilterTest.cs
index 4245171..0842b37 100644
--- a/src/Lucene.Net.Tests.Analysis.Phonetic/DoubleMetaphoneFilterTest.cs
+++ b/src/Lucene.Net.Tests.Analysis.Phonetic/DoubleMetaphoneFilterTest.cs
@@ -85,7 +85,7 @@ namespace Lucene.Net.Analysis.Phonetic
return new TokenStreamComponents(tokenizer, new DoubleMetaphoneFilter(tokenizer, codeLen, false));
});
- CheckRandomData(Random, a, 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, a, 1000 * RandomMultiplier);
Analyzer b = Analyzer.NewAnonymous(createComponents: (fieldName, reader) =>
{
@@ -93,7 +93,7 @@ namespace Lucene.Net.Analysis.Phonetic
return new TokenStreamComponents(tokenizer, new DoubleMetaphoneFilter(tokenizer, codeLen, true));
});
- CheckRandomData(Random, b, 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, b, 1000 * RandomMultiplier);
}
[Test]
diff --git a/src/Lucene.Net.Tests.Analysis.Phonetic/TestBeiderMorseFilter.cs b/src/Lucene.Net.Tests.Analysis.Phonetic/TestBeiderMorseFilter.cs
index 3989ca8..feb9756 100644
--- a/src/Lucene.Net.Tests.Analysis.Phonetic/TestBeiderMorseFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Phonetic/TestBeiderMorseFilter.cs
@@ -96,7 +96,7 @@ namespace Lucene.Net.Analysis.Phonetic
[Test]
public void TestRandom()
{
- CheckRandomData(Random, analyzer, 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, analyzer, 1000 * RandomMultiplier);
}
[Test]
diff --git a/src/Lucene.Net.Tests.Analysis.Phonetic/TestPhoneticFilter.cs b/src/Lucene.Net.Tests.Analysis.Phonetic/TestPhoneticFilter.cs
index 6788f2c..91ce767 100644
--- a/src/Lucene.Net.Tests.Analysis.Phonetic/TestPhoneticFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Phonetic/TestPhoneticFilter.cs
@@ -89,7 +89,7 @@ namespace Lucene.Net.Analysis.Phonetic
return new TokenStreamComponents(tokenizer, new PhoneticFilter(tokenizer, e, false));
});
- CheckRandomData(Random, a, 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, a, 1000 * RandomMultiplier);
Analyzer b = Analyzer.NewAnonymous(createComponents: (fieldName, reader) =>
{
@@ -98,7 +98,7 @@ namespace Lucene.Net.Analysis.Phonetic
});
- CheckRandomData(Random, b, 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, b, 1000 * RandomMultiplier);
}
}
diff --git a/src/Lucene.Net.Tests.Analysis.SmartCn/TestSmartChineseAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.SmartCn/TestSmartChineseAnalyzer.cs
index 32ea4ea..c9ffef6 100644
--- a/src/Lucene.Net.Tests.Analysis.SmartCn/TestSmartChineseAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.SmartCn/TestSmartChineseAnalyzer.cs
@@ -326,7 +326,7 @@ namespace Lucene.Net.Analysis.Cn.Smart
[Test]
public void TestRandomStrings()
{
- CheckRandomData(Random, new SmartChineseAnalyzer(TEST_VERSION_CURRENT), 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, new SmartChineseAnalyzer(TEST_VERSION_CURRENT), 1000 * RandomMultiplier);
}
/** blast some random large strings through the analyzer */
@@ -335,7 +335,7 @@ namespace Lucene.Net.Analysis.Cn.Smart
public void TestRandomHugeStrings()
{
Random random = Random;
- CheckRandomData(random, new SmartChineseAnalyzer(TEST_VERSION_CURRENT), 100 * RANDOM_MULTIPLIER, 8192);
+ CheckRandomData(random, new SmartChineseAnalyzer(TEST_VERSION_CURRENT), 100 * RandomMultiplier, 8192);
}
[Test]
diff --git a/src/Lucene.Net.Tests.Analysis.Stempel/Pl/TestPolishAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Stempel/Pl/TestPolishAnalyzer.cs
index 18fc1b5..8f751f2 100644
--- a/src/Lucene.Net.Tests.Analysis.Stempel/Pl/TestPolishAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Stempel/Pl/TestPolishAnalyzer.cs
@@ -67,7 +67,7 @@ namespace Lucene.Net.Analysis.Pl
[Test]
public void TestRandomStrings()
{
- CheckRandomData(Random, new PolishAnalyzer(TEST_VERSION_CURRENT), 1000 * RANDOM_MULTIPLIER);
+ CheckRandomData(Random, new PolishAnalyzer(TEST_VERSION_CURRENT), 1000 * RandomMultiplier);
}
/// <summary>
diff --git a/src/Lucene.Net.Tests.Benchmark/BenchmarkTestCase.cs b/src/Lucene.Net.Tests.Benchmark/BenchmarkTestCase.cs
index 8ebd8ad..f41a589 100644
--- a/src/Lucene.Net.Tests.Benchmark/BenchmarkTestCase.cs
+++ b/src/Lucene.Net.Tests.Benchmark/BenchmarkTestCase.cs
@@ -121,7 +121,7 @@ namespace Lucene.Net.Benchmarks
private static void logTstLogic(String txt)
{
- if (!VERBOSE)
+ if (!Verbose)
return;
Console.WriteLine("Test logic of:");
Console.WriteLine(txt);
diff --git a/src/Lucene.Net.Tests.Benchmark/Quality/TestQualityRun.cs b/src/Lucene.Net.Tests.Benchmark/Quality/TestQualityRun.cs
index 752f28b..fbaf95c 100644
--- a/src/Lucene.Net.Tests.Benchmark/Quality/TestQualityRun.cs
+++ b/src/Lucene.Net.Tests.Benchmark/Quality/TestQualityRun.cs
@@ -51,7 +51,7 @@ namespace Lucene.Net.Benchmarks.Quality
int maxResults = 1000;
String docNameField = "doctitle"; // orig docID is in the linedoc format title
- TextWriter logger = VERBOSE ? Console.Out : null;
+ TextWriter logger = Verbose ? Console.Out : null;
// prepare topics
Stream topics = GetType().getResourceAsStream("trecTopics.txt");
@@ -72,7 +72,7 @@ namespace Lucene.Net.Benchmarks.Quality
IQualityQueryParser qqParser = new SimpleQQParser("title", "body");
QualityBenchmark qrun = new QualityBenchmark(qqs, qqParser, searcher, docNameField);
- SubmissionReport submitLog = VERBOSE ? new SubmissionReport(logger, "TestRun") : null;
+ SubmissionReport submitLog = Verbose ? new SubmissionReport(logger, "TestRun") : null;
qrun.MaxResults = (maxResults);
QualityStats[] stats = qrun.Execute(judge, submitLog, logger);
diff --git a/src/Lucene.Net.Tests.Facet/FacetTestCase.cs b/src/Lucene.Net.Tests.Facet/FacetTestCase.cs
index 1cbb155..fd04d81 100644
--- a/src/Lucene.Net.Tests.Facet/FacetTestCase.cs
+++ b/src/Lucene.Net.Tests.Facet/FacetTestCase.cs
@@ -114,7 +114,7 @@ namespace Lucene.Net.Facet
break;
}
}
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" doc " + i + ": content=" + doc.content);
for (int j = 0; j < numDims; j++)
diff --git a/src/Lucene.Net.Tests.Facet/Range/TestRangeFacetCounts.cs b/src/Lucene.Net.Tests.Facet/Range/TestRangeFacetCounts.cs
index e97addd..fe30090 100644
--- a/src/Lucene.Net.Tests.Facet/Range/TestRangeFacetCounts.cs
+++ b/src/Lucene.Net.Tests.Facet/Range/TestRangeFacetCounts.cs
@@ -264,7 +264,7 @@ namespace Lucene.Net.Facet.Range
IndexSearcher s = NewSearcher(r);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: searcher=" + s);
}
@@ -415,7 +415,7 @@ namespace Lucene.Net.Facet.Range
Random, dir);
int numDocs = AtLeast(1000);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: numDocs=" + numDocs);
}
@@ -441,7 +441,7 @@ namespace Lucene.Net.Facet.Range
int numIters = AtLeast(10);
for (int iter = 0; iter < numIters; iter++)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: iter=" + iter);
}
@@ -508,7 +508,7 @@ namespace Lucene.Net.Facet.Range
maxIncl = Random.NextBoolean();
}
ranges[rangeID] = new Int64Range("r" + rangeID, min, minIncl, max, maxIncl);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" range " + rangeID + ": " + ranges[rangeID]);
}
@@ -567,7 +567,7 @@ namespace Lucene.Net.Facet.Range
Assert.AreEqual(numRange, result.LabelValues.Length);
for (int rangeID = 0; rangeID < numRange; rangeID++)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" range " + rangeID + " expectedCount=" + expectedCounts[rangeID]);
}
@@ -634,7 +634,7 @@ namespace Lucene.Net.Facet.Range
int numIters = AtLeast(10);
for (int iter = 0; iter < numIters; iter++)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: iter=" + iter);
}
@@ -643,7 +643,7 @@ namespace Lucene.Net.Facet.Range
int[] expectedCounts = new int[numRange];
float minAcceptedValue = float.PositiveInfinity;
float maxAcceptedValue = float.NegativeInfinity;
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: " + numRange + " ranges");
}
@@ -713,7 +713,7 @@ namespace Lucene.Net.Facet.Range
}
ranges[rangeID] = new DoubleRange("r" + rangeID, min, minIncl, max, maxIncl);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: range " + rangeID + ": " + ranges[rangeID]);
}
@@ -739,7 +739,7 @@ namespace Lucene.Net.Facet.Range
{
accept &= values[i] < max;
}
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: check doc=" + i + " val=" + values[i] + " accept=" + accept);
}
@@ -776,7 +776,7 @@ namespace Lucene.Net.Facet.Range
Assert.AreEqual(numRange, result.LabelValues.Length);
for (int rangeID = 0; rangeID < numRange; rangeID++)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: verify range " + rangeID + " expectedCount=" + expectedCounts[rangeID]);
}
@@ -843,7 +843,7 @@ namespace Lucene.Net.Facet.Range
int numIters = AtLeast(10);
for (int iter = 0; iter < numIters; iter++)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: iter=" + iter);
}
@@ -966,7 +966,7 @@ namespace Lucene.Net.Facet.Range
Assert.AreEqual(numRange, result.LabelValues.Length);
for (int rangeID = 0; rangeID < numRange; rangeID++)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" range " + rangeID + " expectedCount=" + expectedCounts[rangeID]);
}
@@ -1082,7 +1082,7 @@ namespace Lucene.Net.Facet.Range
fastMatchFilter = null;
}
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: fastMatchFilter=" + fastMatchFilter);
}
diff --git a/src/Lucene.Net.Tests.Facet/SortedSet/TestSortedSetDocValuesFacets.cs b/src/Lucene.Net.Tests.Facet/SortedSet/TestSortedSetDocValuesFacets.cs
index 9aa1dce..9ff7aee 100644
--- a/src/Lucene.Net.Tests.Facet/SortedSet/TestSortedSetDocValuesFacets.cs
+++ b/src/Lucene.Net.Tests.Facet/SortedSet/TestSortedSetDocValuesFacets.cs
@@ -343,7 +343,7 @@ namespace Lucene.Net.Facet.SortedSet
for (int iter = 0; iter < iters; iter++)
{
string searchToken = tokens[Random.Next(tokens.Length)];
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("\nTEST: iter content=" + searchToken);
}
diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestConcurrentFacetedIndexing.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestConcurrentFacetedIndexing.cs
index 6f339bf..ffc06f1 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestConcurrentFacetedIndexing.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestConcurrentFacetedIndexing.cs
@@ -85,7 +85,7 @@ namespace Lucene.Net.Facet.Taxonomy.Directory
// this is the fastest, yet most memory consuming
return new Cl2oTaxonomyWriterCache(1024, 0.15f, 3);
}
- else if (TEST_NIGHTLY && d > 0.98)
+ else if (TestNightly && d > 0.98)
{
// this is the slowest, but tests the writer concurrency when no caching is done.
// only pick it during NIGHTLY tests, and even then, with very low chances.
diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestDirectoryTaxonomyWriter.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestDirectoryTaxonomyWriter.cs
index 5ecc3cc..7d9faf8 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestDirectoryTaxonomyWriter.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestDirectoryTaxonomyWriter.cs
@@ -273,7 +273,7 @@ namespace Lucene.Net.Facet.Taxonomy.Directory
// this is the fastest, yet most memory consuming
cache = new Cl2oTaxonomyWriterCache(1024, 0.15f, 3);
}
- else if (TEST_NIGHTLY && d > 0.98)
+ else if (TestNightly && d > 0.98)
{
// this is the slowest, but tests the writer concurrency when no caching is done.
// only pick it during NIGHTLY tests, and even then, with very low chances.
@@ -284,7 +284,7 @@ namespace Lucene.Net.Facet.Taxonomy.Directory
// this is slower than CL2O, but less memory consuming, and exercises finding categories on disk too.
cache = new LruTaxonomyWriterCache(ncats / 10);
}
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: use cache=" + cache);
}
diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/TestSearcherTaxonomyManager.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/TestSearcherTaxonomyManager.cs
index 05ff3e5..a78a289 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/TestSearcherTaxonomyManager.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/TestSearcherTaxonomyManager.cs
@@ -115,7 +115,7 @@ namespace Lucene.Net.Facet.Taxonomy
throw new Exception(ioe.ToString(), ioe);
}
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TW size=" + tw.Count + " vs " + ordLimit);
}
@@ -155,7 +155,7 @@ namespace Lucene.Net.Facet.Taxonomy
AtomicBoolean stop = new AtomicBoolean();
// How many unique facets to index before stopping:
- int ordLimit = TEST_NIGHTLY ? 100000 : 6000;
+ int ordLimit = TestNightly ? 100000 : 6000;
var indexer = new IndexerThread(w, config, tw, null, ordLimit, stop);
@@ -204,7 +204,7 @@ namespace Lucene.Net.Facet.Taxonomy
reopener.Join();
}
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: now stop");
}
@@ -235,14 +235,14 @@ namespace Lucene.Net.Facet.Taxonomy
// Sleep for up to 20 msec:
Thread.Sleep(Random.Next(20));
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: reopen");
}
mgr.MaybeRefresh();
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: reopen done");
}
@@ -258,7 +258,7 @@ namespace Lucene.Net.Facet.Taxonomy
[Test]
[Slow]
- public virtual void TestDirectory()
+ public virtual void Test_Directory() // LUCENENET specific - name collides with property of LuceneTestCase
{
Store.Directory indexDir = NewDirectory();
Store.Directory taxoDir = NewDirectory();
@@ -273,7 +273,7 @@ namespace Lucene.Net.Facet.Taxonomy
AtomicBoolean stop = new AtomicBoolean();
// How many unique facets to index before stopping:
- int ordLimit = TEST_NIGHTLY ? 100000 : 6000;
+ int ordLimit = TestNightly ? 100000 : 6000;
var indexer = new IndexerThread(w, config, tw, mgr, ordLimit, stop);
indexer.Start();
@@ -312,7 +312,7 @@ namespace Lucene.Net.Facet.Taxonomy
indexer.Join();
}
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: now stop");
}
diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts.cs
index 16eeaea..be5d70f 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts.cs
@@ -822,7 +822,7 @@ namespace Lucene.Net.Facet.Taxonomy
for (int iter = 0; iter < iters; iter++)
{
string searchToken = tokens[Random.Next(tokens.Length)];
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("\nTEST: iter content=" + searchToken);
}
diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetSumValueSource.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetSumValueSource.cs
index bf9f760..0a65b7c 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetSumValueSource.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetSumValueSource.cs
@@ -543,7 +543,7 @@ namespace Lucene.Net.Facet.Taxonomy
for (int iter = 0; iter < iters; iter++)
{
string searchToken = tokens[Random.Next(tokens.Length)];
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("\nTEST: iter content=" + searchToken);
}
@@ -604,7 +604,7 @@ namespace Lucene.Net.Facet.Taxonomy
// Messy: fixup ties
SortTies(actual);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("expected=\n" + expected.ToString());
Console.WriteLine("actual=\n" + actual.ToString());
diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/WriterCache/TestCompactLabelToOrdinal.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/WriterCache/TestCompactLabelToOrdinal.cs
index c4ce0a0..7b66a83 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/WriterCache/TestCompactLabelToOrdinal.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/WriterCache/TestCompactLabelToOrdinal.cs
@@ -112,7 +112,7 @@ namespace Lucene.Net.Facet.Taxonomy.WriterCache
int ord1 = map.GetOrdinal(label);
int ord2 = compact.GetOrdinal(label);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("Testing label: " + label.ToString());
}
@@ -142,7 +142,7 @@ namespace Lucene.Net.Facet.Taxonomy.WriterCache
int ord1 = map.GetOrdinal(label);
int ord2 = compact.GetOrdinal(label);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("Testing label 2: " + label.ToString());
}
@@ -228,7 +228,7 @@ namespace Lucene.Net.Facet.Taxonomy.WriterCache
int ord1 = map.GetOrdinal(label);
int ord2 = compact.GetOrdinal(label);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("Testing label: " + label.ToString());
}
@@ -259,7 +259,7 @@ namespace Lucene.Net.Facet.Taxonomy.WriterCache
int ord1 = map.GetOrdinal(label);
int ord2 = compact.GetOrdinal(label);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("Testing label 2: " + label.ToString());
}
diff --git a/src/Lucene.Net.Tests.Facet/TestDrillSideways.cs b/src/Lucene.Net.Tests.Facet/TestDrillSideways.cs
index f351a46..eb57574 100644
--- a/src/Lucene.Net.Tests.Facet/TestDrillSideways.cs
+++ b/src/Lucene.Net.Tests.Facet/TestDrillSideways.cs
@@ -468,7 +468,7 @@ namespace Lucene.Net.Facet
//int numDims = 3;
int numDocs = AtLeast(3000);
//int numDocs = 20;
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("numDims=" + numDims + " numDocs=" + numDocs + " aChance=" + aChance + " bChance=" + bChance + " cChance=" + cChance);
}
@@ -542,7 +542,7 @@ namespace Lucene.Net.Facet
Directory td = NewDirectory();
IndexWriterConfig iwc = NewIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(Random));
- iwc.SetInfoStream(InfoStream.NO_OUTPUT);
+ iwc.SetInfoStream((InfoStream)InfoStream.NO_OUTPUT);
var w = new RandomIndexWriter(Random, d, iwc);
var tw = new DirectoryTaxonomyWriter(td, OpenMode.CREATE);
FacetsConfig config = new FacetsConfig();
@@ -559,7 +559,7 @@ namespace Lucene.Net.Facet
doc.Add(NewStringField("id", rawDoc.id, Field.Store.YES));
doc.Add(NewStringField("content", rawDoc.contentToken, Field.Store.NO));
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" doc id=" + rawDoc.id + " token=" + rawDoc.contentToken);
}
@@ -577,7 +577,7 @@ namespace Lucene.Net.Facet
doc.Add(new FacetField("dim" + dim, dimValues[dim][dimValue]));
}
doc.Add(new StringField("dim" + dim, dimValues[dim][dimValue], Field.Store.YES));
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" dim" + dim + "=" + new BytesRef(dimValues[dim][dimValue]));
}
@@ -594,7 +594,7 @@ namespace Lucene.Net.Facet
doc.Add(new FacetField("dim" + dim, dimValues[dim][dimValue2]));
}
doc.Add(new StringField("dim" + dim, dimValues[dim][dimValue2], Field.Store.YES));
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" dim" + dim + "=" + new BytesRef(dimValues[dim][dimValue2]));
}
@@ -608,7 +608,7 @@ namespace Lucene.Net.Facet
{
// Randomly delete a few docs:
int numDel = TestUtil.NextInt32(Random, 1, (int)(numDocs * 0.05));
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("delete " + numDel);
}
@@ -618,7 +618,7 @@ namespace Lucene.Net.Facet
Doc doc = docs[Random.Next(docs.Count)];
if (!doc.deleted)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" delete id=" + doc.id);
}
@@ -631,7 +631,7 @@ namespace Lucene.Net.Facet
if (Random.NextBoolean())
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: forceMerge(1)...");
}
@@ -651,7 +651,7 @@ namespace Lucene.Net.Facet
sortedSetDVState = null;
}
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("r.numDocs() = " + r.NumDocs);
}
@@ -666,7 +666,7 @@ namespace Lucene.Net.Facet
string contentToken = Random.Next(30) == 17 ? null : randomContentToken(true);
int numDrillDown = TestUtil.NextInt32(Random, 1, Math.Min(4, numDims));
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("\nTEST: iter=" + iter + " baseQuery=" + contentToken + " numDrillDown=" + numDrillDown + " useSortedSetDV=" + doUseDV);
}
@@ -711,7 +711,7 @@ namespace Lucene.Net.Facet
}
}
}
- if (VERBOSE)
+ if (Verbose)
{
BytesRef[] values = new BytesRef[drillDowns[dim].Length];
for (int i = 0; i < values.Length; i++)
@@ -750,7 +750,7 @@ namespace Lucene.Net.Facet
Filter filter;
if (Random.Next(7) == 6)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" only-even filter");
}
@@ -801,7 +801,7 @@ namespace Lucene.Net.Facet
{
scores[s.Doc(sd.Doc).Get("id")] = sd.Score;
}
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" verify all facets");
}
@@ -1069,7 +1069,7 @@ namespace Lucene.Net.Facet
drillSidewaysCounts[dim] = new Counters(dimValues);
}
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" compute expected");
}
@@ -1120,7 +1120,7 @@ namespace Lucene.Net.Facet
if (failDim == -1)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" exp: id=" + doc.id + " is a hit");
}
@@ -1134,7 +1134,7 @@ namespace Lucene.Net.Facet
}
else
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" exp: id=" + doc.id + " is a near-miss on dim=" + failDim);
}
@@ -1185,7 +1185,7 @@ namespace Lucene.Net.Facet
internal virtual void VerifyEquals(string[][] dimValues, IndexSearcher s, TestFacetResult expected, DrillSidewaysResult actual, IDictionary<string, float?> scores, bool isSortedSetDV)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" verify totHits=" + expected.Hits.Count);
}
@@ -1193,7 +1193,7 @@ namespace Lucene.Net.Facet
Assert.AreEqual(expected.Hits.Count, actual.Hits.ScoreDocs.Length);
for (int i = 0; i < expected.Hits.Count; i++)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" hit " + i + " expected=" + expected.Hits[i].id);
}
@@ -1206,7 +1206,7 @@ namespace Lucene.Net.Facet
{
int topN = Random.NextBoolean() ? dimValues[dim].Length : TestUtil.NextInt32(Random, 1, dimValues[dim].Length);
FacetResult fr = actual.Facets.GetTopChildren(topN, "dim" + dim);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" dim" + dim + " topN=" + topN + " (vs " + dimValues[dim].Length + " unique values)");
Console.WriteLine(" actual");
@@ -1220,7 +1220,7 @@ namespace Lucene.Net.Facet
foreach (LabelAndValue labelValue in fr.LabelValues)
{
actualValues[labelValue.Label] = (int)labelValue.Value;
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" " + idx + ": " + new BytesRef(labelValue.Label) + ": " + labelValue.Value);
idx++;
@@ -1232,7 +1232,7 @@ namespace Lucene.Net.Facet
if (topN < dimValues[dim].Length)
{
int[] topNIDs = GetTopNOrds(expected.Counts[dim], dimValues[dim], topN);
- if (VERBOSE)
+ if (Verbose)
{
idx = 0;
Console.WriteLine(" expected (sorted)");
@@ -1244,7 +1244,7 @@ namespace Lucene.Net.Facet
idx++;
}
}
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" topN=" + topN + " expectedTopN=" + topNIDs.Length);
}
@@ -1272,7 +1272,7 @@ namespace Lucene.Net.Facet
else
{
- if (VERBOSE)
+ if (Verbose)
{
idx = 0;
Console.WriteLine(" expected (unsorted)");
diff --git a/src/Lucene.Net.Tests.Grouping/AllGroupHeadsCollectorTest.cs b/src/Lucene.Net.Tests.Grouping/AllGroupHeadsCollectorTest.cs
index 13f7a72..83cd800 100644
--- a/src/Lucene.Net.Tests.Grouping/AllGroupHeadsCollectorTest.cs
+++ b/src/Lucene.Net.Tests.Grouping/AllGroupHeadsCollectorTest.cs
@@ -165,15 +165,15 @@ namespace Lucene.Net.Search.Grouping
int numberOfRuns = TestUtil.NextInt32(Random, 3, 6);
for (int iter = 0; iter < numberOfRuns; iter++)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(string.Format("TEST: iter={0} total={1}", iter, numberOfRuns));
}
- int numDocs = TestUtil.NextInt32(Random, 100, 1000) * RANDOM_MULTIPLIER;
+ int numDocs = TestUtil.NextInt32(Random, 100, 1000) * RandomMultiplier;
int numGroups = TestUtil.NextInt32(Random, 1, numDocs);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: numDocs=" + numDocs + " numGroups=" + numGroups);
}
@@ -191,7 +191,7 @@ namespace Lucene.Net.Search.Grouping
groups.Add(new BytesRef(randomValue));
}
string[] contentStrings = new string[TestUtil.NextInt32(Random, 2, 20)];
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: create fake content");
}
@@ -205,7 +205,7 @@ namespace Lucene.Net.Search.Grouping
sb.append("fake ");
}
contentStrings[contentIDX] = sb.toString();
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" content=" + sb.toString());
}
@@ -281,7 +281,7 @@ namespace Lucene.Net.Search.Grouping
contentStrings[Random.nextInt(contentStrings.Length)]
);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" doc content=" + groupDoc.content + " id=" + i + " group=" + (groupDoc.group == null ? "null" : groupDoc.group.Utf8ToString()) + " sort1=" + groupDoc.sort1.Utf8ToString() + " sort2=" + groupDoc.sort2.Utf8ToString() + " sort3=" + groupDoc.sort3.Utf8ToString());
}
@@ -355,7 +355,7 @@ namespace Lucene.Net.Search.Grouping
for (int searchIter = 0; searchIter < 100; searchIter++)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: searchIter=" + searchIter);
}
@@ -376,7 +376,7 @@ namespace Lucene.Net.Search.Grouping
Array.Sort(expectedGroupHeads);
Array.Sort(actualGroupHeads);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("Collector: " + allGroupHeadsCollector.GetType().Name);
Console.WriteLine("Sort within group: " + sortWithinGroup);
@@ -619,7 +619,7 @@ namespace Lucene.Net.Search.Grouping
collector = TermAllGroupHeadsCollector.Create(groupField, sortWithinGroup);
}
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("Selected implementation: " + collector.GetType().Name);
}
diff --git a/src/Lucene.Net.Tests.Grouping/AllGroupsCollectorTest.cs b/src/Lucene.Net.Tests.Grouping/AllGroupsCollectorTest.cs
index f550734..8756b74 100644
--- a/src/Lucene.Net.Tests.Grouping/AllGroupsCollectorTest.cs
+++ b/src/Lucene.Net.Tests.Grouping/AllGroupsCollectorTest.cs
@@ -140,7 +140,7 @@ namespace Lucene.Net.Search.Grouping
selected = new FunctionAllGroupsCollector(vs, new Hashtable());
}
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("Selected implementation: " + selected.GetType().Name);
}
diff --git a/src/Lucene.Net.Tests.Grouping/DistinctValuesCollectorTest.cs b/src/Lucene.Net.Tests.Grouping/DistinctValuesCollectorTest.cs
index a1c5cdf..f0b0560 100644
--- a/src/Lucene.Net.Tests.Grouping/DistinctValuesCollectorTest.cs
+++ b/src/Lucene.Net.Tests.Grouping/DistinctValuesCollectorTest.cs
@@ -258,7 +258,7 @@ namespace Lucene.Net.Search.Grouping
// LUCENENET TODO: Try to work out how to do this without an O(n) operation
List<AbstractDistinctValuesCollector.IGroupCount<IComparable>> actualResult = new List<AbstractDistinctValuesCollector.IGroupCount<IComparable>>(distinctValuesCollector.Groups);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("Index iter=" + indexIter);
Console.WriteLine("Search iter=" + searchIter);
@@ -515,7 +515,7 @@ namespace Lucene.Net.Search.Grouping
bool canUseDV = !"Lucene3x".Equals(w.IndexWriter.Config.Codec.Name, StringComparison.Ordinal);
DocValuesType dvType = canUseDV ? dvTypes[random.nextInt(dvTypes.Length)] : DocValuesType.NONE;
- int numDocs = 86 + random.nextInt(1087) * RANDOM_MULTIPLIER;
+ int numDocs = 86 + random.nextInt(1087) * RandomMultiplier;
string[] groupValues = new string[numDocs / 5];
string[] countValues = new string[numDocs / 10];
for (int i = 0; i < groupValues.Length; i++)
@@ -564,7 +564,7 @@ namespace Lucene.Net.Search.Grouping
}
DirectoryReader reader = w.GetReader();
- if (VERBOSE)
+ if (Verbose)
{
for (int docID = 0; docID < reader.MaxDoc; docID++)
{
diff --git a/src/Lucene.Net.Tests.Grouping/GroupFacetCollectorTest.cs b/src/Lucene.Net.Tests.Grouping/GroupFacetCollectorTest.cs
index 1e6425b..ba3bbba 100644
--- a/src/Lucene.Net.Tests.Grouping/GroupFacetCollectorTest.cs
+++ b/src/Lucene.Net.Tests.Grouping/GroupFacetCollectorTest.cs
@@ -384,14 +384,14 @@ namespace Lucene.Net.Search.Grouping
IndexContext context = CreateIndexContext(multipleFacetsPerDocument);
IndexSearcher searcher = NewSearcher(context.indexReader);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: searcher=" + searcher);
}
for (int searchIter = 0; searchIter < 100; searchIter++)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: searchIter=" + searchIter);
}
@@ -431,7 +431,7 @@ namespace Lucene.Net.Search.Grouping
IList<TermGroupFacetCollector.FacetEntry> expectedFacetEntries = expectedFacetResult.GetFacetEntries();
IList<TermGroupFacetCollector.FacetEntry> actualFacetEntries = actualFacetResult.GetFacetEntries(offset, limit);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("Use DV: " + useDv);
Console.WriteLine("Collector: " + groupFacetCollector.GetType().Name);
@@ -498,11 +498,11 @@ namespace Lucene.Net.Search.Grouping
private IndexContext CreateIndexContext(bool multipleFacetValuesPerDocument)
{
Random random = Random;
- int numDocs = TestUtil.NextInt32(random, 138, 1145) * RANDOM_MULTIPLIER;
+ int numDocs = TestUtil.NextInt32(random, 138, 1145) * RandomMultiplier;
int numGroups = TestUtil.NextInt32(random, 1, numDocs / 4);
int numFacets = TestUtil.NextInt32(random, 1, numDocs / 6);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: numDocs=" + numDocs + " numGroups=" + numGroups);
}
@@ -518,14 +518,14 @@ namespace Lucene.Net.Search.Grouping
facetValues.Add(GenerateRandomNonEmptyString());
}
string[] contentBrs = new string[TestUtil.NextInt32(random, 2, 20)];
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: create fake content");
}
for (int contentIDX = 0; contentIDX < contentBrs.Length; contentIDX++)
{
contentBrs[contentIDX] = GenerateRandomNonEmptyString();
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" content=" + contentBrs[contentIDX]);
}
@@ -687,7 +687,7 @@ namespace Lucene.Net.Search.Grouping
}
}
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" doc content=" + contentStr + " group=" + (groupValue == null ? "null" : groupValue) + " facetVals=" + Collections.ToString(facetVals));
}
diff --git a/src/Lucene.Net.Tests.Grouping/TestGrouping.cs b/src/Lucene.Net.Tests.Grouping/TestGrouping.cs
index 282aa51..3b06e52 100644
--- a/src/Lucene.Net.Tests.Grouping/TestGrouping.cs
+++ b/src/Lucene.Net.Tests.Grouping/TestGrouping.cs
@@ -193,7 +193,7 @@ namespace Lucene.Net.Search.Grouping
{
selected = new TermFirstPassGroupingCollector(groupField, groupSort, topDocs);
}
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("Selected implementation: " + selected.GetType().Name);
}
@@ -766,18 +766,18 @@ namespace Lucene.Net.Search.Grouping
int numberOfRuns = TestUtil.NextInt32(Random, 3, 6);
for (int iter = 0; iter < numberOfRuns; iter++)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: iter=" + iter);
}
- int numDocs = TestUtil.NextInt32(Random, 100, 1000) * RANDOM_MULTIPLIER;
+ int numDocs = TestUtil.NextInt32(Random, 100, 1000) * RandomMultiplier;
//final int numDocs = TestUtil.nextInt(random, 5, 20);
int numGroups = TestUtil.NextInt32(Random, 1, numDocs);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: numDocs=" + numDocs + " numGroups=" + numGroups);
}
@@ -798,7 +798,7 @@ namespace Lucene.Net.Search.Grouping
groups.Add(new BytesRef(randomValue));
}
string[] contentStrings = new string[TestUtil.NextInt32(Random, 2, 20)];
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: create fake content");
}
@@ -812,7 +812,7 @@ namespace Lucene.Net.Search.Grouping
sb.append("fake ");
}
contentStrings[contentIDX] = sb.toString();
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" content=" + sb.toString());
}
@@ -869,7 +869,7 @@ namespace Lucene.Net.Search.Grouping
groups[Random.nextInt(groups.size())],
groups[Random.nextInt(groups.size())],
contentStrings[Random.nextInt(contentStrings.Length)]);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" doc content=" + groupDoc.content + " id=" + i + " group=" + (groupDoc.group == null ? "null" : groupDoc.group.Utf8ToString()) + " sort1=" + groupDoc.sort1.Utf8ToString() + " sort2=" + groupDoc.sort2.Utf8ToString());
}
@@ -918,7 +918,7 @@ namespace Lucene.Net.Search.Grouping
try
{
IndexSearcher s = NewSearcher(r);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("\nTEST: searcher=" + s);
}
@@ -990,7 +990,7 @@ namespace Lucene.Net.Search.Grouping
for (int searchIter = 0; searchIter < 100; searchIter++)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("\nTEST: searchIter=" + searchIter);
}
@@ -1034,7 +1034,7 @@ namespace Lucene.Net.Search.Grouping
bool doCache = Random.nextBoolean();
bool doAllGroups = Random.nextBoolean();
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: groupSort=" + groupSort + " docSort=" + docSort + " searchTerm=" + searchTerm + " dF=" + r.DocFreq(new Term("content", searchTerm)) + " dFBlock=" + rBlocks.DocFreq(new Term("content", searchTerm)) + " topNGroups=" + topNGroups + " groupOffset=" + groupOffset + " docOffset=" + docOffset + " doCache=" + doCache + " docsPerGroup=" + docsPerGroup + " doAllGroups=" + doAllGroups + " getScores=" + getScores + " getMaxScores=" + getMaxScores);
}
@@ -1044,7 +1044,7 @@ namespace Lucene.Net.Search.Grouping
{
groupField += "_dv";
}
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" groupField=" + groupField);
}
@@ -1067,7 +1067,7 @@ namespace Lucene.Net.Search.Grouping
if (doCache)
{
double maxCacheMB = Random.NextDouble();
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: maxCacheMB=" + maxCacheMB);
}
@@ -1136,7 +1136,7 @@ namespace Lucene.Net.Search.Grouping
// covariant in order to mimic Java's wildcard generics
IEnumerable<ISearchGroup<BytesRef>> topGroups = GetSearchGroups(c1, groupOffset, fillFields);
ITopGroups<BytesRef> groupsResult;
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: first pass topGroups");
if (topGroups == null)
@@ -1161,7 +1161,7 @@ namespace Lucene.Net.Search.Grouping
if (topGroups != null)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: topGroups");
foreach (SearchGroup<BytesRef> searchGroup in topGroups)
@@ -1175,7 +1175,7 @@ namespace Lucene.Net.Search.Grouping
{
if (cCache.IsCached)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: cache is intact");
}
@@ -1183,7 +1183,7 @@ namespace Lucene.Net.Search.Grouping
}
else
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: cache was too large");
}
@@ -1209,7 +1209,7 @@ namespace Lucene.Net.Search.Grouping
{
c2 = null;
groupsResult = null;
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: no results");
}
@@ -1217,7 +1217,7 @@ namespace Lucene.Net.Search.Grouping
TopGroups<BytesRef> expectedGroups = SlowGrouping(groupDocs, searchTerm, fillFields, getScores, getMaxScores, doAllGroups, groupSort, docSort, topNGroups, docsPerGroup, groupOffset, docOffset);
- if (VERBOSE)
+ if (Verbose)
{
if (expectedGroups == null)
{
@@ -1319,7 +1319,7 @@ namespace Lucene.Net.Search.Grouping
groupsResultBlocks = tempTopGroupsBlocks;
}
- if (VERBOSE)
+ if (Verbose)
{
if (groupsResultBlocks == null)
{
@@ -1445,7 +1445,7 @@ namespace Lucene.Net.Search.Grouping
// TODO: swap in caching, all groups collector hereassertEquals(expected.totalHitCount, actual.totalHitCount);
// too...
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: " + subSearchers.Length + " shards: " + Arrays.ToString(subSearchers) + " canUseIDV=" + canUseIDV);
}
@@ -1491,7 +1491,7 @@ namespace Lucene.Net.Search.Grouping
{
firstPassCollector = CreateFirstPassCollector(groupField, groupSort, groupOffset + topNGroups, firstPassCollector);
}
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" shard=" + shardIDX + " groupField=" + groupField);
Console.WriteLine(" 1st pass collector=" + firstPassCollector);
@@ -1501,7 +1501,7 @@ namespace Lucene.Net.Search.Grouping
IEnumerable<ISearchGroup<BytesRef>> topGroups = GetSearchGroups(firstPassCollector, 0, true);
if (topGroups != null)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" shard " + shardIDX + " s=" + subSearchers[shardIDX] + " totalGroupedHitCount=?" + " " + topGroups.Count() + " groups:");
foreach (SearchGroup<BytesRef> group in topGroups)
@@ -1514,7 +1514,7 @@ namespace Lucene.Net.Search.Grouping
}
ICollection<SearchGroup<BytesRef>> mergedTopGroups = SearchGroup.Merge(shardGroups, groupOffset, topNGroups, groupSort);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" top groups merged:");
if (mergedTopGroups == null)
@@ -1541,7 +1541,7 @@ namespace Lucene.Net.Search.Grouping
groupField, mergedTopGroups, groupSort, docSort, docOffset + topNDocs, getScores, getMaxScores, true);
subSearchers[shardIDX].Search(w, secondPassCollector);
shardTopGroups[shardIDX] = GetTopGroups(secondPassCollector, 0);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" " + shardTopGroups[shardIDX].Groups.Length + " shard[" + shardIDX + "] groups:");
foreach (GroupDocs<BytesRef> group in shardTopGroups[shardIDX].Groups)
@@ -1552,7 +1552,7 @@ namespace Lucene.Net.Search.Grouping
}
TopGroups<BytesRef> mergedGroups = TopGroups.Merge(shardTopGroups, groupSort, docSort, docOffset, topNDocs, TopGroups.ScoreMergeMode.None);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" " + mergedGroups.Groups.Length + " merged groups:");
foreach (GroupDocs<BytesRef> group in mergedGroups.Groups)
@@ -1587,7 +1587,7 @@ namespace Lucene.Net.Search.Grouping
for (int groupIDX = 0; groupIDX < expected.Groups.Length; groupIDX++)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" check groupIDX=" + groupIDX);
}
diff --git a/src/Lucene.Net.Tests.Highlighter/Highlight/Custom/HighlightCustomQueryTest.cs b/src/Lucene.Net.Tests.Highlighter/Highlight/Custom/HighlightCustomQueryTest.cs
index 9cb1192..095a2ad 100644
--- a/src/Lucene.Net.Tests.Highlighter/Highlight/Custom/HighlightCustomQueryTest.cs
+++ b/src/Lucene.Net.Tests.Highlighter/Highlight/Custom/HighlightCustomQueryTest.cs
@@ -46,7 +46,7 @@ namespace Lucene.Net.Search.Highlight.Custom
String expected = "I call our <B>world</B> Flatland, not because we call it so,";
String observed = highlightField(q, "SOME_FIELD_NAME", s1);
- if (VERBOSE)
+ if (Verbose)
Console.WriteLine("Expected: \"" + expected + "\n" + "Observed: \""
+ observed);
assertEquals(
@@ -62,7 +62,7 @@ namespace Lucene.Net.Search.Highlight.Custom
expected = s1;
observed = highlightField(q, FIELD_NAME, s1);
- if (VERBOSE)
+ if (Verbose)
Console.WriteLine("Expected: \"" + expected + "\n" + "Observed: \""
+ observed);
assertEquals(
diff --git a/src/Lucene.Net.Tests.Highlighter/Highlight/HighlighterTest.cs b/src/Lucene.Net.Tests.Highlighter/Highlight/HighlighterTest.cs
index 7cf6f0b..9f615ce 100644
--- a/src/Lucene.Net.Tests.Highlighter/Highlight/HighlighterTest.cs
+++ b/src/Lucene.Net.Tests.Highlighter/Highlight/HighlighterTest.cs
@@ -92,7 +92,7 @@ namespace Lucene.Net.Search.Highlight
String fragment = highlighter.GetBestFragment(stream, storedField);
- if (VERBOSE) Console.WriteLine(fragment);
+ if (Verbose) Console.WriteLine(fragment);
}
}
@@ -209,7 +209,7 @@ namespace Lucene.Net.Search.Highlight
String expected = "I call our <B>world</B> <B>Flatland</B>, not because we call it so,";
String observed = highlightField(q, "SOME_FIELD_NAME", s1);
- if (VERBOSE) Console.WriteLine("Expected: \"" + expected + "\n" + "Observed: \"" + observed);
+ if (Verbose) Console.WriteLine("Expected: \"" + expected + "\n" + "Observed: \"" + observed);
assertEquals("Query in the default field results in text for *ANY* field being highlighted",
expected, observed);
@@ -225,7 +225,7 @@ namespace Lucene.Net.Search.Highlight
expected = s1;
observed = highlightField(q, FIELD_NAME, s1);
- if (VERBOSE) Console.WriteLine("Expected: \"" + expected + "\n" + "Observed: \"" + observed);
+ if (Verbose) Console.WriteLine("Expected: \"" + expected + "\n" + "Observed: \"" + observed);
assertEquals(
"Query in a named field does not result in highlighting when that field isn't in the query",
s1, highlightField(q, FIELD_NAME, s1));
@@ -266,7 +266,7 @@ namespace Lucene.Net.Search.Highlight
String result = highlighter.GetBestFragments(tokenStream, text, maxNumFragmentsRequired,
"...");
- if (VERBOSE) Console.WriteLine("\t" + result);
+ if (Verbose) Console.WriteLine("\t" + result);
}
// Not sure we can assert anything here - just running to check we dont
@@ -350,7 +350,7 @@ namespace Lucene.Net.Search.Highlight
String result = highlighter.GetBestFragments(tokenStream, text, maxNumFragmentsRequired,
"...");
- if (VERBOSE) Console.WriteLine("\t" + result);
+ if (Verbose) Console.WriteLine("\t" + result);
}
assertTrue("Failed to find correct number of highlights " + numHighlights + " found",
@@ -380,7 +380,7 @@ namespace Lucene.Net.Search.Highlight
String result = highlighter.GetBestFragments(tokenStream, text, maxNumFragmentsRequired,
"...");
- if (VERBOSE) Console.WriteLine("\t" + result);
+ if (Verbose) Console.WriteLine("\t" + result);
}
assertTrue("Failed to find correct number of highlights " + numHighlights + " found",
@@ -410,7 +410,7 @@ namespace Lucene.Net.Search.Highlight
String result = highlighter.GetBestFragments(tokenStream, text, maxNumFragmentsRequired,
"...");
- if (VERBOSE) Console.WriteLine("\t" + result);
+ if (Verbose) Console.WriteLine("\t" + result);
}
assertTrue("Failed to find correct number of highlights " + numHighlights + " found",
@@ -438,7 +438,7 @@ namespace Lucene.Net.Search.Highlight
String result = highlighter.GetBestFragments(tokenStream, text, maxNumFragmentsRequired,
"...");
- if (VERBOSE) Console.WriteLine("\t" + result);
+ if (Verbose) Console.WriteLine("\t" + result);
}
@@ -466,7 +466,7 @@ namespace Lucene.Net.Search.Highlight
String result = highlighter.GetBestFragments(tokenStream, text, maxNumFragmentsRequired,
"...");
- if (VERBOSE) Console.WriteLine("\t" + result);
+ if (Verbose) Console.WriteLine("\t" + result);
}
@@ -494,7 +494,7 @@ namespace Lucene.Net.Search.Highlight
String result = highlighter.GetBestFragments(tokenStream, text, maxNumFragmentsRequired,
"...");
- if (VERBOSE) Console.WriteLine("\t" + result);
+ if (Verbose) Console.WriteLine("\t" + result);
}
@@ -551,7 +551,7 @@ namespace Lucene.Net.Search.Highlight
String result = highlighter.GetBestFragments(tokenStream, text, maxNumFragmentsRequired,
"...");
- if (VERBOSE) Console.WriteLine("\t" + result);
+ if (Verbose) Console.WriteLine("\t" + result);
}
assertTrue("Failed to find correct number of highlights " + numHighlights + " found",
@@ -580,7 +580,7 @@ namespace Lucene.Net.Search.Highlight
String result = highlighter.GetBestFragments(tokenStream, text, maxNumFragmentsRequired,
"...");
- if (VERBOSE) Console.WriteLine("\t" + result);
+ if (Verbose) Console.WriteLine("\t" + result);
assertTrue("Failed to find correct number of highlights " + numHighlights + " found",
numHighlights == 3);
@@ -611,7 +611,7 @@ namespace Lucene.Net.Search.Highlight
String result = highlighter.GetBestFragments(tokenStream, text,
maxNumFragmentsRequired, "...");
- if (VERBOSE) Console.WriteLine("\t" + result);
+ if (Verbose) Console.WriteLine("\t" + result);
}
@@ -635,7 +635,7 @@ namespace Lucene.Net.Search.Highlight
String result = highlighter.GetBestFragments(tokenStream, text,
maxNumFragmentsRequired, "...");
- if (VERBOSE) Console.WriteLine("\t" + result);
+ if (Verbose) Console.WriteLine("\t" + result);
}
}
@@ -669,7 +669,7 @@ namespace Lucene.Net.Search.Highlight
String result = highlighter.GetBestFragments(tokenStream, text, maxNumFragmentsRequired,
"...");
- if (VERBOSE) Console.WriteLine("\t" + result);
+ if (Verbose) Console.WriteLine("\t" + result);
assertTrue("Failed to find correct number of highlights " + numHighlights + " found",
numHighlights == 4);
@@ -744,7 +744,7 @@ namespace Lucene.Net.Search.Highlight
String result = highlighter.GetBestFragments(tokenStream, text, maxNumFragmentsRequired,
"...");
- if (VERBOSE) Console.WriteLine("\t" + result);
+ if (Verbose) Console.WriteLine("\t" + result);
}
// Not sure we can assert anything here - just running to check we dont
// throw any exceptions
@@ -929,7 +929,7 @@ namespace Lucene.Net.Search.Highlight
// can't rewrite ConstantScore if you want to highlight it -
// it rewrites to ConstantScoreQuery which cannot be highlighted
// query = unReWrittenQuery.rewrite(reader);
- if (VERBOSE) Console.WriteLine("Searching for: " + query.ToString(FIELD_NAME));
+ if (Verbose) Console.WriteLine("Searching for: " + query.ToString(FIELD_NAME));
hits = searcher.Search(query, null, 1000);
for (int i = 0; i < hits.TotalHits; i++)
@@ -946,7 +946,7 @@ namespace Lucene.Net.Search.Highlight
String result = highlighter.GetBestFragments(tokenStream, text, maxNumFragmentsRequired,
fragmentSeparator);
- if (VERBOSE) Console.WriteLine("\t" + result);
+ if (Verbose) Console.WriteLine("\t" + result);
}
assertTrue("Failed to find correct number of highlights " + numHighlights + " found",
numHighlights == 5);
@@ -971,7 +971,7 @@ namespace Lucene.Net.Search.Highlight
String result = highlighter.GetBestFragments(tokenStream, text, maxNumFragmentsRequired,
fragmentSeparator);
- if (VERBOSE) Console.WriteLine("\t" + result);
+ if (Verbose) Console.WriteLine("\t" + result);
}
assertTrue("Failed to find correct number of highlights " + numHighlights + " found",
numHighlights == 5);
@@ -996,7 +996,7 @@ namespace Lucene.Net.Search.Highlight
String result = highlighter.GetBestFragments(tokenStream, text, maxNumFragmentsRequired,
fragmentSeparator);
- if (VERBOSE) Console.WriteLine("\t" + result);
+ if (Verbose) Console.WriteLine("\t" + result);
}
assertTrue("Failed to find correct number of highlights " + numHighlights + " found",
numHighlights == 5);
@@ -1160,7 +1160,7 @@ namespace Lucene.Net.Search.Highlight
this);
highlighter.TextFragmenter = (new SimpleFragmenter(40));
String result = highlighter.GetBestFragment(tokenStream, text);
- if (VERBOSE) Console.WriteLine("\t" + result);
+ if (Verbose) Console.WriteLine("\t" + result);
}
assertTrue("Failed to find correct number of highlights " + numHighlights + " found",
numHighlights == 4);
@@ -1285,7 +1285,7 @@ namespace Lucene.Net.Search.Highlight
Highlighter highlighter = instance.GetHighlighter(query, FIELD_NAME,
this);
String result = highlighter.GetBestFragment(tokenStream, text);
- if (VERBOSE) Console.WriteLine("\t" + result);
+ if (Verbose) Console.WriteLine("\t" + result);
}
assertTrue("Failed to find correct number of highlights " + numHighlights + " found",
numHighlights == 4);
@@ -1320,7 +1320,7 @@ namespace Lucene.Net.Search.Highlight
+ " vs " + stringResults.Length, fragmentResults.Length == stringResults.Length);
for (int j = 0; j < stringResults.Length; j++)
{
- if (VERBOSE) Console.WriteLine(fragmentResults[j]);
+ if (Verbose) Console.WriteLine(fragmentResults[j]);
assertTrue("Failed to find same text Fragments: " + fragmentResults[j] + " found",
fragmentResults[j].toString().Equals(stringResults[j], StringComparison.Ordinal));
@@ -1442,7 +1442,7 @@ namespace Lucene.Net.Search.Highlight
query.Add(new WildcardQuery(new Term(FIELD_NAME, "jf?")), Occur.SHOULD);
query.Add(new WildcardQuery(new Term(FIELD_NAME, "kenned*")), Occur.SHOULD);
- if (VERBOSE) Console.WriteLine("Searching with primitive query");
+ if (Verbose) Console.WriteLine("Searching with primitive query");
// forget to set this and...
// query=query.rewrite(reader);
TopDocs hits = searcher.Search(query, null, 1000);
@@ -1466,7 +1466,7 @@ namespace Lucene.Net.Search.Highlight
String highlightedText = highlighter.GetBestFragments(tokenStream, text,
maxNumFragmentsRequired, "...");
- if (VERBOSE) Console.WriteLine(highlightedText);
+ if (Verbose) Console.WriteLine(highlightedText);
}
// We expect to have zero highlights if the query is multi-terms and is
// not
@@ -1880,7 +1880,7 @@ namespace Lucene.Net.Search.Highlight
{
Document doc = searcher.Doc(hits.ScoreDocs[i].Doc);
String result = h.GetBestFragment(a, "t_text1", doc.Get("t_text1"));
- if (VERBOSE) Console.WriteLine("result:" + result);
+ if (Verbose) Console.WriteLine("result:" + result);
assertEquals("more <B>random</B> words for second field", result);
}
reader.Dispose();
@@ -1929,7 +1929,7 @@ namespace Lucene.Net.Search.Highlight
// for any multi-term queries to work (prefix, wildcard, range,fuzzy etc)
// you must use a rewritten query!
query = unReWrittenQuery.Rewrite(reader);
- if (VERBOSE) Console.WriteLine("Searching for: " + query.ToString(FIELD_NAME));
+ if (Verbose) Console.WriteLine("Searching for: " + query.ToString(FIELD_NAME));
hits = searcher.Search(query, null, 1000);
}
@@ -1947,7 +1947,7 @@ namespace Lucene.Net.Search.Highlight
String result = highlighter.GetBestFragments(tokenStream, text, maxNumFragmentsRequired,
"...");
- if (VERBOSE) Console.WriteLine("\t" + result);
+ if (Verbose) Console.WriteLine("\t" + result);
assertTrue("Failed to find correct number of highlights " + numHighlights + " found",
numHighlights == expectedHighlights);
@@ -2265,7 +2265,7 @@ namespace Lucene.Net.Search.Highlight
String result = highlighter.GetBestFragments(tokenStream, text, maxNumFragmentsRequired,
fragmentSeparator);
- if (LuceneTestCase.VERBOSE) Console.WriteLine("\t" + result);
+ if (LuceneTestCase.Verbose) Console.WriteLine("\t" + result);
}
}
@@ -2273,9 +2273,9 @@ namespace Lucene.Net.Search.Highlight
internal void Start()
{
- if (LuceneTestCase.VERBOSE) Console.WriteLine("Run QueryScorer");
+ if (LuceneTestCase.Verbose) Console.WriteLine("Run QueryScorer");
run(this);
- if (LuceneTestCase.VERBOSE) Console.WriteLine("Run QueryTermScorer");
+ if (LuceneTestCase.Verbose) Console.WriteLine("Run QueryTermScorer");
mode = QUERY_TERM;
run(this);
}
diff --git a/src/Lucene.Net.Tests.Highlighter/VectorHighlight/SimpleFragListBuilderTest.cs b/src/Lucene.Net.Tests.Highlighter/VectorHighlight/SimpleFragListBuilderTest.cs
index 0d596b7..0d5d312 100644
--- a/src/Lucene.Net.Tests.Highlighter/VectorHighlight/SimpleFragListBuilderTest.cs
+++ b/src/Lucene.Net.Tests.Highlighter/VectorHighlight/SimpleFragListBuilderTest.cs
@@ -68,7 +68,7 @@ namespace Lucene.Net.Search.VectorHighlight
FieldFragList ffl = sflb.CreateFieldFragList(fpl(phraseQuery, "abcdefgh jklmnopqrs"), sflb.minFragCharSize);
assertEquals(1, ffl.FragInfos.size());
- if (VERBOSE) Console.WriteLine(ffl.FragInfos[0].toString());
+ if (Verbose) Console.WriteLine(ffl.FragInfos[0].toString());
assertEquals("subInfos=(abcdefghjklmnopqrs((0,21)))/1.0(0,21)", ffl.FragInfos[0].toString());
}
diff --git a/src/Lucene.Net.Tests.Highlighter/VectorHighlight/SimpleFragmentsBuilderTest.cs b/src/Lucene.Net.Tests.Highlighter/VectorHighlight/SimpleFragmentsBuilderTest.cs
index 110a38e..f27698c 100644
--- a/src/Lucene.Net.Tests.Highlighter/VectorHighlight/SimpleFragmentsBuilderTest.cs
+++ b/src/Lucene.Net.Tests.Highlighter/VectorHighlight/SimpleFragmentsBuilderTest.cs
@@ -239,7 +239,7 @@ namespace Lucene.Net.Search.VectorHighlight
[Test]
public void TestRandomDiscreteMultiValueHighlighting()
{
- String[] randomValues = new String[3 + Random.nextInt(10 * RANDOM_MULTIPLIER)];
+ String[] randomValues = new String[3 + Random.nextInt(10 * RandomMultiplier)];
for (int i = 0; i < randomValues.Length; i++)
{
String randomValue;
@@ -294,7 +294,7 @@ namespace Lucene.Net.Search.VectorHighlight
try
{
- int highlightIters = 1 + Random.nextInt(120 * RANDOM_MULTIPLIER);
+ int highlightIters = 1 + Random.nextInt(120 * RandomMultiplier);
for (int highlightIter = 0; highlightIter < highlightIters; highlightIter++)
{
Console.WriteLine($"Highlighter iter: {highlightIter}");
diff --git a/src/Lucene.Net.Tests.Join/TestBlockJoin.cs b/src/Lucene.Net.Tests.Join/TestBlockJoin.cs
index ce3fb10..dfe0a0f 100644
--- a/src/Lucene.Net.Tests.Join/TestBlockJoin.cs
+++ b/src/Lucene.Net.Tests.Join/TestBlockJoin.cs
@@ -531,7 +531,7 @@ namespace Lucene.Net.Tests.Join
Directory dir = NewDirectory();
Directory joinDir = NewDirectory();
- int numParentDocs = TestUtil.NextInt32(Random, 100 * RANDOM_MULTIPLIER, 300 * RANDOM_MULTIPLIER);
+ int numParentDocs = TestUtil.NextInt32(Random, 100 * RandomMultiplier, 300 * RandomMultiplier);
//final int numParentDocs = 30;
// Values for parent fields:
@@ -579,7 +579,7 @@ namespace Lucene.Net.Tests.Join
IList<Document> joinDocs = new List<Document>();
- if (VERBOSE)
+ if (Verbose)
{
StringBuilder sb = new StringBuilder();
sb.Append("parentID=").Append(parentDoc.Get("parentID"));
@@ -616,7 +616,7 @@ namespace Lucene.Net.Tests.Join
}
}
- if (VERBOSE)
+ if (Verbose)
{
StringBuilder sb = new StringBuilder();
sb.Append("childID=").Append(joinChildDoc.Get("childID"));
@@ -651,7 +651,7 @@ namespace Lucene.Net.Tests.Join
foreach (int deleteID in toDelete)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("DELETE parentID=" + deleteID);
}
@@ -664,7 +664,7 @@ namespace Lucene.Net.Tests.Join
IndexReader joinR = joinW.GetReader();
joinW.Dispose();
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: reader=" + r);
Console.WriteLine("TEST: joinReader=" + joinR);
@@ -681,11 +681,11 @@ namespace Lucene.Net.Tests.Join
Filter parentsFilter = new FixedBitSetCachingWrapperFilter(new QueryWrapperFilter(new TermQuery(new Term("isParent", "x"))));
- int iters = 200 * RANDOM_MULTIPLIER;
+ int iters = 200 * RandomMultiplier;
for (int iter = 0; iter < iters; iter++)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: iter=" + (1 + iter) + " of " + iters);
}
@@ -799,7 +799,7 @@ namespace Lucene.Net.Tests.Join
Sort parentSort = GetRandomSort("parent", parentFields.Length);
Sort childSort = GetRandomSort("child", childFields.Length);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("\nTEST: query=" + parentQuery + " joinQuery=" + parentJoinQuery + " parentSort=" + parentSort + " childSort=" + childSort);
}
@@ -811,7 +811,7 @@ namespace Lucene.Net.Tests.Join
TopDocs results = s.Search(parentQuery, null, r.NumDocs, parentAndChildSort);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("\nTEST: normal index gets " + results.TotalHits + " hits");
ScoreDoc[] hits = results.ScoreDocs;
@@ -860,7 +860,7 @@ namespace Lucene.Net.Tests.Join
//final int hitsPerGroup = 100;
ITopGroups<int> joinResults = c.GetTopGroups(childJoinQuery, childSort, 0, hitsPerGroup, 0, true);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("\nTEST: block join index gets " + (joinResults == null ? 0 : joinResults.Groups.Length) + " groups; hitsPerGroup=" + hitsPerGroup);
if (joinResults != null)
@@ -963,7 +963,7 @@ namespace Lucene.Net.Tests.Join
bq.Add(new TermQuery(new Term("parent" + fieldID, parentFields[fieldID][Random.Next(parentFields[fieldID].Length)])), Random.NextBoolean() ? Occur.MUST : Occur.MUST_NOT);
}
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("\nTEST: top down: parentQuery2=" + parentQuery2);
}
@@ -1043,12 +1043,12 @@ namespace Lucene.Net.Tests.Join
Sort childSort2 = GetRandomSort("child", childFields.Length);
// Search denormalized index:
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: run top down query=" + childQuery2 + " filter=" + childFilter2 + " sort=" + childSort2);
}
TopDocs results2 = s.Search(childQuery2, childFilter2, r.NumDocs, childSort2);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" " + results2.TotalHits + " totalHits:");
foreach (ScoreDoc sd in results2.ScoreDocs)
@@ -1059,12 +1059,12 @@ namespace Lucene.Net.Tests.Join
}
// Search join index:
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: run top down join query=" + childJoinQuery2 + " filter=" + childJoinFilter2 + " sort=" + childSort2);
}
TopDocs joinResults2 = joinS.Search(childJoinQuery2, childJoinFilter2, joinR.NumDocs, childSort2);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" " + joinResults2.TotalHits + " totalHits:");
foreach (ScoreDoc sd in joinResults2.ScoreDocs)
diff --git a/src/Lucene.Net.Tests.Join/TestJoinUtil.cs b/src/Lucene.Net.Tests.Join/TestJoinUtil.cs
index bb80aff..a52fa62 100644
--- a/src/Lucene.Net.Tests.Join/TestJoinUtil.cs
+++ b/src/Lucene.Net.Tests.Join/TestJoinUtil.cs
@@ -409,7 +409,7 @@ namespace Lucene.Net.Tests.Join
{
for (int indexIter = 1; indexIter <= maxIndexIter; indexIter++)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("indexIter=" + indexIter);
}
@@ -425,7 +425,7 @@ namespace Lucene.Net.Tests.Join
w.Dispose();
for (int searchIter = 1; searchIter <= maxSearchIter; searchIter++)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("searchIter=" + searchIter);
}
@@ -438,14 +438,14 @@ namespace Lucene.Net.Tests.Join
context);
Query actualQuery = new TermQuery(new Term("value", randomValue));
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("actualQuery=" + actualQuery);
}
var scoreModeLength = Enum.GetNames(typeof(ScoreMode)).Length;
ScoreMode scoreMode = (ScoreMode) Random.Next(scoreModeLength);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("scoreMode=" + scoreMode);
}
@@ -461,7 +461,7 @@ namespace Lucene.Net.Tests.Join
joinQuery = JoinUtil.CreateJoinQuery("to", multipleValuesPerDocument, "from", actualQuery,
indexSearcher, scoreMode);
}
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("joinQuery=" + joinQuery);
}
@@ -473,7 +473,7 @@ namespace Lucene.Net.Tests.Join
new CollectorAnonymousInnerClassHelper2(this, scoreDocsInOrder, context, actualResult,
topScoreDocCollector));
// Asserting bit set...
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("expected cardinality:" + expectedResult.Cardinality());
DocIdSetIterator iterator = expectedResult.GetIterator();
@@ -507,7 +507,7 @@ namespace Lucene.Net.Tests.Join
assertEquals(expectedTopDocs.MaxScore, actualTopDocs.MaxScore, 0.0f);
for (int i = 0; i < expectedTopDocs.ScoreDocs.Length; i++)
{
- if (VERBOSE)
+ if (Verbose)
{
string.Format("Expected doc: {0} | Actual doc: {1}\n", expectedTopDocs.ScoreDocs[i].Doc, actualTopDocs.ScoreDocs[i].Doc);
string.Format("Expected score: {0} | Actual score: {1}\n", expectedTopDocs.ScoreDocs[i].Score, actualTopDocs.ScoreDocs[i].Score);
@@ -658,7 +658,7 @@ namespace Lucene.Net.Tests.Join
{
w.Commit();
}
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("Added document[" + docs[i].id + "]: " + document);
}
diff --git a/src/Lucene.Net.Tests.Memory/Index/Memory/MemoryIndexTest.cs b/src/Lucene.Net.Tests.Memory/Index/Memory/MemoryIndexTest.cs
index b6a8f42..123945a 100644
--- a/src/Lucene.Net.Tests.Memory/Index/Memory/MemoryIndexTest.cs
+++ b/src/Lucene.Net.Tests.Memory/Index/Memory/MemoryIndexTest.cs
@@ -44,7 +44,7 @@ namespace Lucene.Net.Index.Memory
{
private ISet<string> queries = new JCG.HashSet<string>();
- public static readonly int ITERATIONS = 100 * RANDOM_MULTIPLIER;
+ public static readonly int ITERATIONS = 100 * RandomMultiplier;
public override void SetUp()
@@ -100,7 +100,7 @@ namespace Lucene.Net.Index.Memory
StringBuilder termField = new StringBuilder();
// add up to 250 terms to field "foo"
- int numFooTerms = Random.nextInt(250 * RANDOM_MULTIPLIER);
+ int numFooTerms = Random.nextInt(250 * RandomMultiplier);
for (int i = 0; i < numFooTerms; i++)
{
fooField.append(" ");
@@ -108,7 +108,7 @@ namespace Lucene.Net.Index.Memory
}
// add up to 250 terms to field "term"
- int numTermTerms = Random.nextInt(250 * RANDOM_MULTIPLIER);
+ int numTermTerms = Random.nextInt(250 * RandomMultiplier);
for (int i = 0; i < numTermTerms; i++)
{
termField.append(" ");
@@ -130,7 +130,7 @@ namespace Lucene.Net.Index.Memory
memory.AddField("foo", fooField.toString(), analyzer);
memory.AddField("term", termField.toString(), analyzer);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("Random MemoryIndex:\n" + memory.toString());
Console.WriteLine("Same index as RAMDirectory: " +
diff --git a/src/Lucene.Net.Tests.Misc/Index/Sorter/IndexSortingTest.cs b/src/Lucene.Net.Tests.Misc/Index/Sorter/IndexSortingTest.cs
index d57bd0b..64cd63a 100644
--- a/src/Lucene.Net.Tests.Misc/Index/Sorter/IndexSortingTest.cs
+++ b/src/Lucene.Net.Tests.Misc/Index/Sorter/IndexSortingTest.cs
@@ -66,7 +66,7 @@ namespace Lucene.Net.Index.Sorter
}
}
sortedValues = values.ToArray();
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("sortedValues: " + sortedValues);
Console.WriteLine("Sorter: " + sorter);
diff --git a/src/Lucene.Net.Tests.Misc/Index/Sorter/SorterTestBase.cs b/src/Lucene.Net.Tests.Misc/Index/Sorter/SorterTestBase.cs
index 8152467..f09b96d 100644
--- a/src/Lucene.Net.Tests.Misc/Index/Sorter/SorterTestBase.cs
+++ b/src/Lucene.Net.Tests.Misc/Index/Sorter/SorterTestBase.cs
@@ -184,7 +184,7 @@ namespace Lucene.Net.Index.Sorter
// shuffle them for indexing
ids.Shuffle(Random);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("Shuffled IDs for indexing: " + Arrays.ToString(ids.ToArray()));
}
@@ -206,7 +206,7 @@ namespace Lucene.Net.Index.Sorter
{
if (random.NextDouble() < 0.2)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("delete doc_id " + id);
}
diff --git a/src/Lucene.Net.Tests.Misc/Index/Sorter/SortingAtomicReaderTest.cs b/src/Lucene.Net.Tests.Misc/Index/Sorter/SortingAtomicReaderTest.cs
index 17ff558..8a8f80a 100644
--- a/src/Lucene.Net.Tests.Misc/Index/Sorter/SortingAtomicReaderTest.cs
+++ b/src/Lucene.Net.Tests.Misc/Index/Sorter/SortingAtomicReaderTest.cs
@@ -42,7 +42,7 @@ namespace Lucene.Net.Index.Sorter
{
sortedValues[docMap.OldToNew(i)] = (int)dv.Get(i);
}
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("docMap: " + docMap);
Console.WriteLine("sortedValues: " + Arrays.ToString(sortedValues));
@@ -51,7 +51,7 @@ namespace Lucene.Net.Index.Sorter
// sort the index by id (as integer, in NUMERIC_DV_FIELD)
reader = SortingAtomicReader.Wrap(reader, sort);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("mapped-deleted-docs: ");
IBits mappedLiveDocs = reader.LiveDocs;
diff --git a/src/Lucene.Net.Tests.Misc/Util/Fst/TestFSTsMisc.cs b/src/Lucene.Net.Tests.Misc/Util/Fst/TestFSTsMisc.cs
index f468ef0..59ebe9d 100644
--- a/src/Lucene.Net.Tests.Misc/Util/Fst/TestFSTsMisc.cs
+++ b/src/Lucene.Net.Tests.Misc/Util/Fst/TestFSTsMisc.cs
@@ -59,7 +59,7 @@ namespace Lucene.Net.Util.Fst
Random random = new Random(Random.Next());
for (int iter = 0; iter < numIter; iter++)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("\nTEST: iter " + iter);
}
@@ -86,7 +86,7 @@ namespace Lucene.Net.Util.Fst
// Up to two positive ints, shared, generally but not
// monotonically increasing
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: now test UpToTwoPositiveIntOutputs");
}
@@ -125,7 +125,7 @@ namespace Lucene.Net.Util.Fst
// ListOfOutputs(PositiveIntOutputs), generally but not
// monotonically increasing
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: now test OneOrMoreOutputs");
}
diff --git a/src/Lucene.Net.Tests.Queries/Function/FunctionTestSetup.cs b/src/Lucene.Net.Tests.Queries/Function/FunctionTestSetup.cs
index 82b3170..c9decbd 100644
--- a/src/Lucene.Net.Tests.Queries/Function/FunctionTestSetup.cs
+++ b/src/Lucene.Net.Tests.Queries/Function/FunctionTestSetup.cs
@@ -96,7 +96,7 @@ namespace Lucene.Net.Tests.Queries.Function
/// </summary>
protected internal void CreateIndex(bool doMultiSegment)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: setUp");
}
@@ -126,14 +126,14 @@ namespace Lucene.Net.Tests.Queries.Function
}
if (!doMultiSegment)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: setUp full merge");
}
iw.ForceMerge(1);
}
iw.Dispose();
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: setUp done close");
}
@@ -195,7 +195,7 @@ namespace Lucene.Net.Tests.Queries.Function
// debug messages (change DBG to true for anything to print)
protected internal static void Log(object o)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(o.ToString());
}
diff --git a/src/Lucene.Net.Tests.QueryParser/Flexible/Spans/TestSpanQueryParserSimpleSample.cs b/src/Lucene.Net.Tests.QueryParser/Flexible/Spans/TestSpanQueryParserSimpleSample.cs
index ef3c22d..10fcf32 100644
--- a/src/Lucene.Net.Tests.QueryParser/Flexible/Spans/TestSpanQueryParserSimpleSample.cs
+++ b/src/Lucene.Net.Tests.QueryParser/Flexible/Spans/TestSpanQueryParserSimpleSample.cs
@@ -105,13 +105,13 @@ namespace Lucene.Net.QueryParsers.Flexible.Spans
spanProcessorPipeline.Add(new UniqueFieldQueryNodeProcessor());
// print to show out the QueryNode tree before being processed
- if (VERBOSE) Console.WriteLine(queryTree);
+ if (Verbose) Console.WriteLine(queryTree);
// Process the QueryTree using our new Processors
queryTree = spanProcessorPipeline.Process(queryTree);
// print to show out the QueryNode tree after being processed
- if (VERBOSE) Console.WriteLine(queryTree);
+ if (Verbose) Console.WriteLine(queryTree);
// create a instance off the Builder
SpansQueryTreeBuilder spansQueryTreeBuilder = new SpansQueryTreeBuilder();
diff --git a/src/Lucene.Net.Tests.QueryParser/Flexible/Standard/TestNumericQueryParser.cs b/src/Lucene.Net.Tests.QueryParser/Flexible/Standard/TestNumericQueryParser.cs
index a48fd2f..090857b 100644
--- a/src/Lucene.Net.Tests.QueryParser/Flexible/Standard/TestNumericQueryParser.cs
+++ b/src/Lucene.Net.Tests.QueryParser/Flexible/Standard/TestNumericQueryParser.cs
@@ -250,7 +250,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard
foreach (NumberType numberType in Enum.GetValues(typeof(NumberType)))
{
setFieldValues(numberType, numericFieldMap);
- if (VERBOSE) Console.WriteLine("Indexing document: " + doc);
+ if (Verbose) Console.WriteLine("Indexing document: " + doc);
writer.AddDocument(doc);
}
@@ -574,16 +574,16 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard
private void TestQuery(String queryStr, int expectedDocCount)
{
- if (VERBOSE) Console.WriteLine("Parsing: " + queryStr);
+ if (Verbose) Console.WriteLine("Parsing: " + queryStr);
Query query = qp.Parse(queryStr, FIELD_NAME);
- if (VERBOSE) Console.WriteLine("Querying: " + query);
+ if (Verbose) Console.WriteLine("Querying: " + query);
TopDocs topDocs = searcher.Search(query, 1000);
String msg = "Query <" + queryStr + "> retrieved " + topDocs.TotalHits
+ " document(s), " + expectedDocCount + " document(s) expected.";
- if (VERBOSE) Console.WriteLine(msg);
+ if (Verbose) Console.WriteLine(msg);
assertEquals(msg, expectedDocCount, topDocs.TotalHits);
diff --git a/src/Lucene.Net.Tests.QueryParser/Flexible/Standard/TestQPHelper.cs b/src/Lucene.Net.Tests.QueryParser/Flexible/Standard/TestQPHelper.cs
index 3408c97..dd3e9b5 100644
--- a/src/Lucene.Net.Tests.QueryParser/Flexible/Standard/TestQPHelper.cs
+++ b/src/Lucene.Net.Tests.QueryParser/Flexible/Standard/TestQPHelper.cs
@@ -1310,7 +1310,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard
"a");
assertNotNull("result is null and it shouldn't be", result);
assertTrue("result is not a BooleanQuery", result is BooleanQuery);
- if (VERBOSE)
+ if (Verbose)
Console.WriteLine("Result: " + result);
assertTrue(((BooleanQuery)result).Clauses.size() + " does not equal: "
+ 2, ((BooleanQuery)result).Clauses.size() == 2);
diff --git a/src/Lucene.Net.Tests.QueryParser/Util/QueryParserTestBase.cs b/src/Lucene.Net.Tests.QueryParser/Util/QueryParserTestBase.cs
index 4419a31..67d8d10 100644
--- a/src/Lucene.Net.Tests.QueryParser/Util/QueryParserTestBase.cs
+++ b/src/Lucene.Net.Tests.QueryParser/Util/QueryParserTestBase.cs
@@ -1132,7 +1132,7 @@ namespace Lucene.Net.QueryParsers.Util
result = GetQuery("(fieldX:xxxxx OR fieldy:xxxxxxxx)^2 AND (fieldx:the OR fieldy:foo)", qp);
assertNotNull("result is null and it shouldn't be", result);
assertTrue("result is not a BooleanQuery", result is BooleanQuery);
- if (VERBOSE) Console.WriteLine("Result: " + result);
+ if (Verbose) Console.WriteLine("Result: " + result);
assertTrue(((BooleanQuery)result).Clauses.Count + " does not equal: " + 2, ((BooleanQuery)result).Clauses.Count == 2);
}
diff --git a/src/Lucene.Net.Tests.QueryParser/Xml/TestParser.cs b/src/Lucene.Net.Tests.QueryParser/Xml/TestParser.cs
index 3a3c535..734f34c 100644
--- a/src/Lucene.Net.Tests.QueryParser/Xml/TestParser.cs
+++ b/src/Lucene.Net.Tests.QueryParser/Xml/TestParser.cs
@@ -157,7 +157,7 @@ namespace Lucene.Net.QueryParsers.Xml
{
Query q = Parse("FuzzyLikeThisQuery.xml");
//show rewritten fuzzyLikeThisQuery - see what is being matched on
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(q.Rewrite(reader));
}
@@ -257,13 +257,13 @@ namespace Lucene.Net.QueryParsers.Xml
private void DumpResults(String qType, Query q, int numDocs)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: query=" + q);
}
TopDocs hits = searcher.Search(q, null, numDocs);
assertTrue(qType + " should produce results ", hits.TotalHits > 0);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("=========" + qType + "============");
ScoreDoc[] scoreDocs = hits.ScoreDocs;
diff --git a/src/Lucene.Net.Tests.Replicator/IndexAndTaxonomyReplicationClientTest.cs b/src/Lucene.Net.Tests.Replicator/IndexAndTaxonomyReplicationClientTest.cs
index cf043f4..9d82b6d 100644
--- a/src/Lucene.Net.Tests.Replicator/IndexAndTaxonomyReplicationClientTest.cs
+++ b/src/Lucene.Net.Tests.Replicator/IndexAndTaxonomyReplicationClientTest.cs
@@ -430,7 +430,7 @@ namespace Lucene.Net.Replicator
{
try
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("hit exception during update: " + exception);
}
@@ -459,7 +459,7 @@ namespace Lucene.Net.Replicator
// count-down number of failures
failures.DecrementAndGet();
Debug.Assert(failures >= 0, "handler failed too many times: " + failures);
- if (VERBOSE)
+ if (Verbose)
{
if (failures == 0)
{
diff --git a/src/Lucene.Net.Tests.Replicator/IndexReplicationClientTest.cs b/src/Lucene.Net.Tests.Replicator/IndexReplicationClientTest.cs
index 1d54a37..6cd84e2 100644
--- a/src/Lucene.Net.Tests.Replicator/IndexReplicationClientTest.cs
+++ b/src/Lucene.Net.Tests.Replicator/IndexReplicationClientTest.cs
@@ -107,7 +107,7 @@ namespace Lucene.Net.Replicator
{
return;
}
- else if (VERBOSE)
+ else if (Verbose)
{
Console.WriteLine("expectedID=" + expectedId + " actual=" + handlerId + " generation=" + reader.IndexCommit.Generation);
}
@@ -339,7 +339,7 @@ namespace Lucene.Net.Replicator
{
if (exception is IOException)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("hit exception during update: " + exception);
}
@@ -366,7 +366,7 @@ namespace Lucene.Net.Replicator
// count-down number of failures
failures.DecrementAndGet();
Debug.Assert(failures >= 0, "handler failed too many times: " + failures);
- if (VERBOSE)
+ if (Verbose)
{
if (failures == 0)
{
diff --git a/src/Lucene.Net.Tests.Sandbox/Queries/TestSlowFuzzyQuery2.cs b/src/Lucene.Net.Tests.Sandbox/Queries/TestSlowFuzzyQuery2.cs
index c359dc1..949a57c 100644
--- a/src/Lucene.Net.Tests.Sandbox/Queries/TestSlowFuzzyQuery2.cs
+++ b/src/Lucene.Net.Tests.Sandbox/Queries/TestSlowFuzzyQuery2.cs
@@ -84,7 +84,7 @@ namespace Lucene.Net.Sandbox.Queries
public void assertFromTestData(int[] codePointTable)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: codePointTable=" + codePointTable);
}
@@ -109,7 +109,7 @@ namespace Lucene.Net.Sandbox.Queries
IndexReader r = writer.GetReader();
IndexSearcher searcher = NewSearcher(r);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: searcher=" + searcher);
}
diff --git a/src/Lucene.Net.Tests.Suggest/Spell/TestWordBreakSpellChecker.cs b/src/Lucene.Net.Tests.Suggest/Spell/TestWordBreakSpellChecker.cs
index 1568297..f286e4d 100644
--- a/src/Lucene.Net.Tests.Suggest/Spell/TestWordBreakSpellChecker.cs
+++ b/src/Lucene.Net.Tests.Suggest/Spell/TestWordBreakSpellChecker.cs
@@ -280,8 +280,8 @@ namespace Lucene.Net.Search.Spell
[Test]
public void TestRandom()
{
- int numDocs = TestUtil.NextInt32(Random, (10 * RANDOM_MULTIPLIER),
- (100 * RANDOM_MULTIPLIER));
+ int numDocs = TestUtil.NextInt32(Random, (10 * RandomMultiplier),
+ (100 * RandomMultiplier));
Directory dir = null;
RandomIndexWriter writer = null;
IndexReader ir = null;
diff --git a/src/Lucene.Net.Tests.Suggest/Suggest/Analyzing/AnalyzingInfixSuggesterTest.cs b/src/Lucene.Net.Tests.Suggest/Suggest/Analyzing/AnalyzingInfixSuggesterTest.cs
index e50d546..bd49561 100644
--- a/src/Lucene.Net.Tests.Suggest/Suggest/Analyzing/AnalyzingInfixSuggesterTest.cs
+++ b/src/Lucene.Net.Tests.Suggest/Suggest/Analyzing/AnalyzingInfixSuggesterTest.cs
@@ -645,7 +645,7 @@ namespace Lucene.Net.Search.Suggest.Analyzing
DirectoryInfo tempDir = CreateTempDir("AnalyzingInfixSuggesterTest");
Analyzer a = new MockAnalyzer(Random, MockTokenizer.WHITESPACE, false);
int minPrefixChars = Random.nextInt(7);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" minPrefixChars=" + minPrefixChars);
}
@@ -706,7 +706,7 @@ namespace Lucene.Net.Search.Suggest.Analyzing
update.weight = weight;
Input input = inputs[update.index];
pendingUpdates.Add(update);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: iter=" + iter + " update input=" + input.term.Utf8ToString() + "/" + weight);
}
@@ -717,7 +717,7 @@ namespace Lucene.Net.Search.Suggest.Analyzing
{
// Add a new suggestion
inputs.Add(new Input(text, weight, new BytesRef(text)));
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: iter=" + iter + " add input=" + text + "/" + weight);
}
@@ -727,7 +727,7 @@ namespace Lucene.Net.Search.Suggest.Analyzing
if (Random.nextInt(15) == 7)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: now refresh suggester");
}
@@ -744,7 +744,7 @@ namespace Lucene.Net.Search.Suggest.Analyzing
if (Random.nextInt(50) == 7)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: now close/reopen suggester");
}
@@ -780,7 +780,7 @@ namespace Lucene.Net.Search.Suggest.Analyzing
bool allTermsRequired = Random.nextInt(10) == 7;
bool doHilite = Random.nextBoolean();
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: lookup \"" + query + "\" allTermsRequired=" + allTermsRequired + " doHilite=" + doHilite);
}
@@ -858,7 +858,7 @@ namespace Lucene.Net.Search.Suggest.Analyzing
int expectedCount = Math.Min(topN, expected.size());
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" expected:");
for (int i = 0; i < expectedCount; i++)
@@ -883,7 +883,7 @@ namespace Lucene.Net.Search.Suggest.Analyzing
}
else
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" no expected matches");
}
diff --git a/src/Lucene.Net.Tests.Suggest/Suggest/Analyzing/AnalyzingSuggesterTest.cs b/src/Lucene.Net.Tests.Suggest/Suggest/Analyzing/AnalyzingSuggesterTest.cs
index 76afd2d..27a6954 100644
--- a/src/Lucene.Net.Tests.Suggest/Suggest/Analyzing/AnalyzingSuggesterTest.cs
+++ b/src/Lucene.Net.Tests.Suggest/Suggest/Analyzing/AnalyzingSuggesterTest.cs
@@ -347,7 +347,7 @@ namespace Lucene.Net.Search.Suggest.Analyzing
AnalyzingSuggester suggester = new AnalyzingSuggester(analyzer);
suggester.Build(new InputArrayIterator(keys));
IList<Lookup.LookupResult> results = suggester.DoLookup("wifi network", false, 10);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("Results: " + results);
}
@@ -799,7 +799,7 @@ namespace Lucene.Net.Search.Suggest.Analyzing
int numStopChars = Random.nextInt(10);
bool preserveHoles = Random.nextBoolean();
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: " + numQueries + " words; preserveSep=" + preserveSep + " numStopChars=" + numStopChars + " preserveHoles=" + preserveHoles);
}
@@ -889,7 +889,7 @@ namespace Lucene.Net.Search.Suggest.Analyzing
slowCompletor.Add(new TermFreq2(key, analyzedKey, weight, payload));
}
- if (VERBOSE)
+ if (Verbose)
{
// Don't just sort original list, to avoid VERBOSE
// altering the test:
@@ -917,7 +917,7 @@ namespace Lucene.Net.Search.Suggest.Analyzing
foreach (string prefix in allPrefixes)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("\nTEST: prefix=" + prefix);
}
@@ -982,7 +982,7 @@ namespace Lucene.Net.Search.Suggest.Analyzing
analyzedKey += SEP;
}
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" analyzed: " + analyzedKey);
}
@@ -1009,7 +1009,7 @@ namespace Lucene.Net.Search.Suggest.Analyzing
matches = matches.GetRange(0, topN);
}
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" expected:");
foreach (TermFreq2 lr in matches)
diff --git a/src/Lucene.Net.Tests.Suggest/Suggest/Analyzing/FuzzySuggesterTest.cs b/src/Lucene.Net.Tests.Suggest/Suggest/Analyzing/FuzzySuggesterTest.cs
index 5042412..c56e61b 100644
--- a/src/Lucene.Net.Tests.Suggest/Suggest/Analyzing/FuzzySuggesterTest.cs
+++ b/src/Lucene.Net.Tests.Suggest/Suggest/Analyzing/FuzzySuggesterTest.cs
@@ -297,7 +297,7 @@ namespace Lucene.Net.Search.Suggest.Analyzing
suggester.Build(new InputArrayIterator(keys));
IList<Lookup.LookupResult> results = suggester.DoLookup("wifi network", false, 10);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("Results: " + results);
}
@@ -734,7 +734,7 @@ namespace Lucene.Net.Search.Suggest.Analyzing
int numStopChars = Random.nextInt(10);
bool preserveHoles = Random.nextBoolean();
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: " + numQueries + " words; preserveSep=" + preserveSep + " ; unicodeAware=" + unicodeAware + " numStopChars=" + numStopChars + " preserveHoles=" + preserveHoles);
}
@@ -812,7 +812,7 @@ namespace Lucene.Net.Search.Suggest.Analyzing
slowCompletor.Add(new TermFreqPayload2(key, analyzedKey, weight));
}
- if (VERBOSE)
+ if (Verbose)
{
// Don't just sort original list, to avoid VERBOSE
// altering the test:
@@ -833,7 +833,7 @@ namespace Lucene.Net.Search.Suggest.Analyzing
foreach (string prefix in allPrefixes)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("\nTEST: prefix=" + prefix);
}
@@ -899,7 +899,7 @@ namespace Lucene.Net.Search.Suggest.Analyzing
analyzedKey += " ";
}
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" analyzed: " + analyzedKey);
}
@@ -956,7 +956,7 @@ namespace Lucene.Net.Search.Suggest.Analyzing
matches = new List<Lookup.LookupResult>(matches.SubList(0, topN));
}
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" expected:");
foreach (Lookup.LookupResult lr in matches)
@@ -1131,7 +1131,7 @@ namespace Lucene.Net.Search.Suggest.Analyzing
answers.Sort(new TestRandom2Comparer());
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("\nTEST: targets");
foreach (Input tf in answers)
@@ -1148,7 +1148,7 @@ namespace Lucene.Net.Search.Suggest.Analyzing
// TODO: test exactFirst / preserveSep permutations
FuzzySuggester suggest = new FuzzySuggester(a, a, 0, 256, -1, true, maxEdits, transpositions, prefixLen, prefixLen, false);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: maxEdits=" + maxEdits + " prefixLen=" + prefixLen + " transpositions=" + transpositions + " num=" + NUM);
}
@@ -1160,12 +1160,12 @@ namespace Lucene.Net.Search.Suggest.Analyzing
for (int iter = 0; iter < ITERS; iter++)
{
string frag = RandomSimpleString(6);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("\nTEST: iter frag=" + frag);
}
List<Lookup.LookupResult> expected = SlowFuzzyMatch(prefixLen, maxEdits, transpositions, answers, frag);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" expected: " + expected.size());
foreach (Lookup.LookupResult c in expected)
@@ -1174,7 +1174,7 @@ namespace Lucene.Net.Search.Suggest.Analyzing
}
}
List<Lookup.LookupResult> actual = new List<Lookup.LookupResult>(suggest.DoLookup(frag, false, NUM));
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" actual: " + actual.size());
foreach (Lookup.LookupResult c in actual)
diff --git a/src/Lucene.Net.Tests.Suggest/Suggest/Analyzing/TestFreeTextSuggester.cs b/src/Lucene.Net.Tests.Suggest/Suggest/Analyzing/TestFreeTextSuggester.cs
index fff7d26..bbe4e8a 100644
--- a/src/Lucene.Net.Tests.Suggest/Suggest/Analyzing/TestFreeTextSuggester.cs
+++ b/src/Lucene.Net.Tests.Suggest/Suggest/Analyzing/TestFreeTextSuggester.cs
@@ -184,7 +184,7 @@ namespace Lucene.Net.Search.Suggest.Analyzing
lfd.NextDoc();
FreeTextSuggester sug = new FreeTextSuggester(new MockAnalyzer(Random));
sug.Build(new TestWikiInputIterator(this, lfd));
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(sug.GetSizeInBytes() + " bytes");
@@ -389,19 +389,19 @@ namespace Lucene.Net.Search.Suggest.Analyzing
for (int i = 0; i < numDocs; i++)
{
docs[i] = new string[AtLeast(100)];
- if (VERBOSE)
+ if (Verbose)
{
Console.Write(" doc " + i + ":");
}
for (int j = 0; j < docs[i].Length; j++)
{
docs[i][j] = GetZipfToken(terms);
- if (VERBOSE)
+ if (Verbose)
{
Console.Write(" " + docs[i][j]);
}
}
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine();
}
@@ -410,7 +410,7 @@ namespace Lucene.Net.Search.Suggest.Analyzing
int grams = TestUtil.NextInt32(Random, 1, 4);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: " + terms.Length + " terms; " + numDocs + " docs; " + grams + " grams");
}
@@ -423,7 +423,7 @@ namespace Lucene.Net.Search.Suggest.Analyzing
List<IDictionary<string, int?>> gramCounts = new List<IDictionary<string, int?>>(grams);
for (int gram = 0; gram < grams; gram++)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: build model for gram=" + gram);
}
@@ -451,7 +451,7 @@ namespace Lucene.Net.Search.Suggest.Analyzing
{
model.Put(token, 1 + curCount);
}
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" add '" + token + "' -> count=" + (model.TryGetValue(token, out int? count) ? (count.HasValue ? count.ToString() : "null") : ""));
}
@@ -492,7 +492,7 @@ namespace Lucene.Net.Search.Suggest.Analyzing
string query = b.toString();
query = query.Substring(1);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("\nTEST: iter=" + iter + " query='" + query + "' num=" + num);
}
@@ -502,13 +502,13 @@ namespace Lucene.Net.Search.Suggest.Analyzing
double backoff = 1.0;
seen = new JCG.HashSet<string>();
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" compute expected");
}
for (int i = grams - 1; i >= 0; i--)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" grams=" + i);
}
@@ -516,7 +516,7 @@ namespace Lucene.Net.Search.Suggest.Analyzing
if (tokens.Length < i + 1)
{
// Don't have enough tokens to use this model
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" skip");
}
@@ -526,7 +526,7 @@ namespace Lucene.Net.Search.Suggest.Analyzing
if (i == 0 && tokens[tokens.Length - 1].Length == 0)
{
// Never suggest unigrams from empty string:
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" skip unigram priors only");
}
@@ -545,7 +545,7 @@ namespace Lucene.Net.Search.Suggest.Analyzing
{
context = context.Substring(1);
}
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" context='" + context + "'");
}
@@ -562,7 +562,7 @@ namespace Lucene.Net.Search.Suggest.Analyzing
{
// We never saw this context:
backoff *= FreeTextSuggester.ALPHA;
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" skip: never saw context");
}
@@ -570,14 +570,14 @@ namespace Lucene.Net.Search.Suggest.Analyzing
}
contextCount = count.GetValueOrDefault();
}
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" contextCount=" + contextCount);
}
IDictionary<string, int?> model = gramCounts[i];
// First pass, gather all predictions for this model:
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" find terms w/ prefix=" + tokens[tokens.Length - 1]);
}
@@ -586,13 +586,13 @@ namespace Lucene.Net.Search.Suggest.Analyzing
{
if (term.StartsWith(tokens[tokens.Length - 1], StringComparison.Ordinal))
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" term=" + term);
}
if (seen.contains(term))
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" skip seen");
}
@@ -607,7 +607,7 @@ namespace Lucene.Net.Search.Suggest.Analyzing
// This is also the way it is being done in the FreeTextSuggester to work around the issue.
Lookup.LookupResult lr = new Lookup.LookupResult(ngram, (long)(long.MaxValue * ((decimal)backoff * (decimal)count / contextCount)));
tmp.Add(lr);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" add tmp key='" + lr.Key + "' score=" + lr.Value);
}
@@ -640,7 +640,7 @@ namespace Lucene.Net.Search.Suggest.Analyzing
{
seen.add(lastToken);
expected.Add(result);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" keep key='" + result.Key + "' score=" + result.Value);
}
@@ -660,7 +660,7 @@ namespace Lucene.Net.Search.Suggest.Analyzing
// Actual:
IList<Lookup.LookupResult> actual = sug.DoLookup(query, num);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" expected: " + expected);
Console.WriteLine(" actual: " + actual);
diff --git a/src/Lucene.Net.Tests.TestFramework/Analysis/TestLookaheadTokenFilter.cs b/src/Lucene.Net.Tests.TestFramework/Analysis/TestLookaheadTokenFilter.cs
index 8fc8ee6..f8cfdac 100644
--- a/src/Lucene.Net.Tests.TestFramework/Analysis/TestLookaheadTokenFilter.cs
+++ b/src/Lucene.Net.Tests.TestFramework/Analysis/TestLookaheadTokenFilter.cs
@@ -56,8 +56,8 @@ namespace Lucene.Net.Analysis
TokenStream output = new MockRandomLookaheadTokenFilter(random, tokenizer);
return new TokenStreamComponents(tokenizer, output);
});
- int maxLength = TEST_NIGHTLY ? 8192 : 1024;
- CheckRandomData(Random, a, 50 * RANDOM_MULTIPLIER, maxLength);
+ int maxLength = TestNightly ? 8192 : 1024;
+ CheckRandomData(Random, a, 50 * RandomMultiplier, maxLength);
}
private sealed class NeverPeeksLookaheadTokenFilter : LookaheadTokenFilter<LookaheadTokenFilter.Position>
@@ -87,8 +87,8 @@ namespace Lucene.Net.Analysis
TokenStream output = new NeverPeeksLookaheadTokenFilter(tokenizer);
return new TokenStreamComponents(tokenizer, output);
});
- int maxLength = TEST_NIGHTLY ? 8192 : 1024;
- CheckRandomData(Random, a, 50 * RANDOM_MULTIPLIER, maxLength);
+ int maxLength = TestNightly ? 8192 : 1024;
+ CheckRandomData(Random, a, 50 * RandomMultiplier, maxLength);
}
[Test]
diff --git a/src/Lucene.Net.Tests.TestFramework/Analysis/TestMockAnalyzer.cs b/src/Lucene.Net.Tests.TestFramework/Analysis/TestMockAnalyzer.cs
index d9b15b2..a61b47b 100644
--- a/src/Lucene.Net.Tests.TestFramework/Analysis/TestMockAnalyzer.cs
+++ b/src/Lucene.Net.Tests.TestFramework/Analysis/TestMockAnalyzer.cs
@@ -265,7 +265,7 @@ namespace Lucene.Net.Analysis
[Test]
public void TestRandomRegexps()
{
- int iters = TEST_NIGHTLY ? AtLeast(30) : AtLeast(1);
+ int iters = TestNightly ? AtLeast(30) : AtLeast(1);
for (int i = 0; i < iters; i++)
{
CharacterRunAutomaton dfa = new CharacterRunAutomaton(AutomatonTestUtil.RandomAutomaton(Random) /*, int.MaxValue*/);
diff --git a/src/Lucene.Net.Tests.TestFramework/Configuration/TestConfigurationSettings.cs b/src/Lucene.Net.Tests.TestFramework/Configuration/TestConfigurationSettings.cs
index 00b866c..ac3b7ca 100644
--- a/src/Lucene.Net.Tests.TestFramework/Configuration/TestConfigurationSettings.cs
+++ b/src/Lucene.Net.Tests.TestFramework/Configuration/TestConfigurationSettings.cs
@@ -32,26 +32,28 @@ namespace Lucene.Net.Configuration
// settings from the current test framework setup, and only get the mock values.
private const string TestJsonFileName = "lucene.testsettings.mock.json";
private const string TestParentJsonFileName = "parent.lucene.testsettings.mock.json";
- private readonly static string ParentDirectory = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
- private readonly static string TestDirectory = Path.Combine(ParentDirectory, "SubDirectory");
- private readonly static string CurrentJsonFilePath = Path.Combine(TestDirectory, TestJsonFileName);
- private readonly static string ParentJsonFilePath = Path.Combine(ParentDirectory, TestJsonFileName);
+ private readonly static string parentDirectory = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
+ private readonly static string testDirectory = Path.Combine(parentDirectory, "SubDirectory");
+ private readonly static string currentJsonFilePath = Path.Combine(testDirectory, TestJsonFileName);
+ private readonly static string parentJsonFilePath = Path.Combine(parentDirectory, TestJsonFileName);
public override void BeforeClass()
{
+
+
// Create directories if they do not exist
- Directory.CreateDirectory(TestDirectory);
+ Directory.CreateDirectory(testDirectory);
// Output the current test file to the file system
using (var input = this.GetType().FindAndGetManifestResourceStream(TestJsonFileName))
- using (var output = new FileStream(CurrentJsonFilePath, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.ReadWrite | FileShare.Delete))
+ using (var output = new FileStream(currentJsonFilePath, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.ReadWrite | FileShare.Delete))
{
input.CopyTo(output);
}
// Output the parent test file to the file system
using (var input = this.GetType().FindAndGetManifestResourceStream(TestParentJsonFileName))
- using (var output = new FileStream(ParentJsonFilePath, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.ReadWrite | FileShare.Delete))
+ using (var output = new FileStream(parentJsonFilePath, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.ReadWrite | FileShare.Delete))
{
input.CopyTo(output);
}
@@ -71,7 +73,7 @@ namespace Lucene.Net.Configuration
try
{
- dir = new DirectoryInfo(TestDirectory);
+ dir = new DirectoryInfo(testDirectory);
}
catch { }
@@ -97,13 +99,13 @@ namespace Lucene.Net.Configuration
try
{
- File.Delete(ParentJsonFilePath);
+ File.Delete(parentJsonFilePath);
}
catch { }
try
{
- Directory.Delete(ParentDirectory);
+ Directory.Delete(parentDirectory);
}
catch { }
@@ -112,7 +114,7 @@ namespace Lucene.Net.Configuration
private static readonly IConfigurationFactory ConfigurationFactory = new TestConfigurationFactory
{
- TestDirectory = TestDirectory,
+ TestDirectory = testDirectory,
JsonTestSettingsFileName = TestJsonFileName,
EnvironmentVariablePrefix = EnvironmentVariablePrefix
};
diff --git a/src/Lucene.Net.Tests.TestFramework/Configuration/TestSystemProperties.cs b/src/Lucene.Net.Tests.TestFramework/Configuration/TestSystemProperties.cs
index d50f08d..f212385 100644
--- a/src/Lucene.Net.Tests.TestFramework/Configuration/TestSystemProperties.cs
+++ b/src/Lucene.Net.Tests.TestFramework/Configuration/TestSystemProperties.cs
@@ -30,26 +30,26 @@ namespace Lucene.Net.Configuration
// settings from the current test framework setup, and only get the mock values.
private const string TestJsonFileName = "lucene.testsettings.mock.json";
private const string TestParentJsonFileName = "parent.lucene.testsettings.mock.json";
- private readonly static string ParentDirectory = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
- private readonly static string TestDirectory = Path.Combine(ParentDirectory, "SubDirectory");
- private readonly static string CurrentJsonFilePath = Path.Combine(TestDirectory, TestJsonFileName);
- private readonly static string ParentJsonFilePath = Path.Combine(ParentDirectory, TestJsonFileName);
+ private readonly static string parentDirectory = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
+ private readonly static string testDirectory = Path.Combine(parentDirectory, "SubDirectory");
+ private readonly static string currentJsonFilePath = Path.Combine(testDirectory, TestJsonFileName);
+ private readonly static string parentJsonFilePath = Path.Combine(parentDirectory, TestJsonFileName);
public override void BeforeClass()
{
// Create directories if they do not exist
- Directory.CreateDirectory(TestDirectory);
+ Directory.CreateDirectory(testDirectory);
// Output the current test file to the file system
using (var input = this.GetType().FindAndGetManifestResourceStream(TestJsonFileName))
- using (var output = new FileStream(CurrentJsonFilePath, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.ReadWrite | FileShare.Delete))
+ using (var output = new FileStream(currentJsonFilePath, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.ReadWrite | FileShare.Delete))
{
input.CopyTo(output);
}
// Output the parent test file to the file system
using (var input = this.GetType().FindAndGetManifestResourceStream(TestParentJsonFileName))
- using (var output = new FileStream(ParentJsonFilePath, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.ReadWrite | FileShare.Delete))
+ using (var output = new FileStream(parentJsonFilePath, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.ReadWrite | FileShare.Delete))
{
input.CopyTo(output);
}
@@ -63,7 +63,7 @@ namespace Lucene.Net.Configuration
try
{
- dir = new DirectoryInfo(TestDirectory);
+ dir = new DirectoryInfo(testDirectory);
}
catch { }
@@ -89,13 +89,13 @@ namespace Lucene.Net.Configuration
try
{
- File.Delete(ParentJsonFilePath);
+ File.Delete(parentJsonFilePath);
}
catch { }
try
{
- Directory.Delete(ParentDirectory);
+ Directory.Delete(parentDirectory);
}
catch { }
@@ -114,7 +114,7 @@ namespace Lucene.Net.Configuration
private static readonly TestConfigurationFactory ConfigurationFactory = new TestConfigurationFactory
{
- TestDirectory = TestDirectory,
+ TestDirectory = testDirectory,
JsonTestSettingsFileName = TestJsonFileName
};
diff --git a/src/Lucene.Net.Tests/Analysis/TestGraphTokenizers.cs b/src/Lucene.Net.Tests/Analysis/TestGraphTokenizers.cs
index 58dbad8..cfbc957 100644
--- a/src/Lucene.Net.Tests/Analysis/TestGraphTokenizers.cs
+++ b/src/Lucene.Net.Tests/Analysis/TestGraphTokenizers.cs
@@ -182,9 +182,9 @@ namespace Lucene.Net.Analysis
[Test]
public virtual void TestMockGraphTokenFilterBasic()
{
- for (int iter = 0; iter < 10 * RANDOM_MULTIPLIER; iter++)
+ for (int iter = 0; iter < 10 * RandomMultiplier; iter++)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("\nTEST: iter=" + iter);
}
@@ -204,9 +204,9 @@ namespace Lucene.Net.Analysis
[Test]
public virtual void TestMockGraphTokenFilterOnGraphInput()
{
- for (int iter = 0; iter < 100 * RANDOM_MULTIPLIER; iter++)
+ for (int iter = 0; iter < 100 * RandomMultiplier; iter++)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("\nTEST: iter=" + iter);
}
@@ -277,9 +277,9 @@ namespace Lucene.Net.Analysis
[Test]
public virtual void TestMockGraphTokenFilterBeforeHoles()
{
- for (int iter = 0; iter < 100 * RANDOM_MULTIPLIER; iter++)
+ for (int iter = 0; iter < 100 * RandomMultiplier; iter++)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("\nTEST: iter=" + iter);
}
@@ -305,9 +305,9 @@ namespace Lucene.Net.Analysis
[Test]
public virtual void TestMockGraphTokenFilterAfterHoles()
{
- for (int iter = 0; iter < 100 * RANDOM_MULTIPLIER; iter++)
+ for (int iter = 0; iter < 100 * RandomMultiplier; iter++)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("\nTEST: iter=" + iter);
}
@@ -333,9 +333,9 @@ namespace Lucene.Net.Analysis
[Test]
public virtual void TestMockGraphTokenFilterRandom()
{
- for (int iter = 0; iter < 10 * RANDOM_MULTIPLIER; iter++)
+ for (int iter = 0; iter < 10 * RandomMultiplier; iter++)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("\nTEST: iter=" + iter);
}
@@ -358,9 +358,9 @@ namespace Lucene.Net.Analysis
[Test]
public virtual void TestDoubleMockGraphTokenFilterRandom()
{
- for (int iter = 0; iter < 10 * RANDOM_MULTIPLIER; iter++)
+ for (int iter = 0; iter < 10 * RandomMultiplier; iter++)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("\nTEST: iter=" + iter);
}
@@ -391,9 +391,9 @@ namespace Lucene.Net.Analysis
[Test]
public virtual void TestMockGraphTokenFilterBeforeHolesRandom()
{
- for (int iter = 0; iter < 10 * RANDOM_MULTIPLIER; iter++)
+ for (int iter = 0; iter < 10 * RandomMultiplier; iter++)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("\nTEST: iter=" + iter);
}
@@ -416,9 +416,9 @@ namespace Lucene.Net.Analysis
[Test]
public virtual void TestMockGraphTokenFilterAfterHolesRandom()
{
- for (int iter = 0; iter < 10 * RANDOM_MULTIPLIER; iter++)
+ for (int iter = 0; iter < 10 * RandomMultiplier; iter++)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("\nTEST: iter=" + iter);
}
diff --git a/src/Lucene.Net.Tests/Analysis/TestLookaheadTokenFilter.cs b/src/Lucene.Net.Tests/Analysis/TestLookaheadTokenFilter.cs
index 3f53380..1a662ea 100644
--- a/src/Lucene.Net.Tests/Analysis/TestLookaheadTokenFilter.cs
+++ b/src/Lucene.Net.Tests/Analysis/TestLookaheadTokenFilter.cs
@@ -34,7 +34,7 @@ namespace Lucene.Net.Analysis
TokenStream output = new MockRandomLookaheadTokenFilter(random, tokenizer);
return new TokenStreamComponents(tokenizer, output);
});
- CheckRandomData(Random, a, 200 * RANDOM_MULTIPLIER, 8192);
+ CheckRandomData(Random, a, 200 * RandomMultiplier, 8192);
}
private class NeverPeeksLookaheadTokenFilter : LookaheadTokenFilter<LookaheadTokenFilter.Position>
@@ -65,7 +65,7 @@ namespace Lucene.Net.Analysis
TokenStream output = new NeverPeeksLookaheadTokenFilter(tokenizer);
return new TokenStreamComponents(tokenizer, output);
});
- CheckRandomData(Random, a, 200 * RANDOM_MULTIPLIER, 8192);
+ CheckRandomData(Random, a, 200 * RandomMultiplier, 8192);
}
[Test]
diff --git a/src/Lucene.Net.Tests/Codecs/Lucene3x/TestSurrogates.cs b/src/Lucene.Net.Tests/Codecs/Lucene3x/TestSurrogates.cs
index 897020b..8fd368d 100644
--- a/src/Lucene.Net.Tests/Codecs/Lucene3x/TestSurrogates.cs
+++ b/src/Lucene.Net.Tests/Codecs/Lucene3x/TestSurrogates.cs
@@ -126,7 +126,7 @@ namespace Lucene.Net.Codecs.Lucene3x
// single straight enum
private void DoTestStraightEnum(IList<Term> fieldTerms, IndexReader reader, int uniqueTermCount)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("\nTEST: top now enum reader=" + reader);
}
@@ -144,7 +144,7 @@ namespace Lucene.Net.Codecs.Lucene3x
while ((text = termsEnum.Next()) != null)
{
Term exp = fieldTerms[termCount];
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" got term=" + field + ":" + UnicodeUtil.ToHexString(text.Utf8ToString()));
Console.WriteLine(" exp=" + exp.Field + ":" + UnicodeUtil.ToHexString(exp.Text()));
@@ -163,7 +163,7 @@ namespace Lucene.Net.Codecs.Lucene3x
Assert.AreEqual(exp.Bytes, text);
termCount++;
}
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" no more terms for field=" + field);
}
@@ -179,7 +179,7 @@ namespace Lucene.Net.Codecs.Lucene3x
IDictionary<string, TermsEnum> tes = new Dictionary<string, TermsEnum>();
// Test random seek to existing term, then enum:
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("\nTEST: top now seek");
}
@@ -192,7 +192,7 @@ namespace Lucene.Net.Codecs.Lucene3x
Term term = fieldTerms[spot];
string field = term.Field;
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: exist seek field=" + field + " term=" + UnicodeUtil.ToHexString(term.Text()));
}
@@ -205,7 +205,7 @@ namespace Lucene.Net.Codecs.Lucene3x
tes[field] = te;
}
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" done get enum");
}
@@ -217,7 +217,7 @@ namespace Lucene.Net.Codecs.Lucene3x
int ct = TestUtil.NextInt32(r, 5, 100);
for (int i = 0; i < ct; i++)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: now next()");
}
@@ -235,7 +235,7 @@ namespace Lucene.Net.Codecs.Lucene3x
{
BytesRef t = te.Next();
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" got term=" + (t == null ? null : UnicodeUtil.ToHexString(t.Utf8ToString())));
Console.WriteLine(" exp=" + UnicodeUtil.ToHexString(term.Text().ToString()));
@@ -251,7 +251,7 @@ namespace Lucene.Net.Codecs.Lucene3x
{
IDictionary<string, TermsEnum> tes = new Dictionary<string, TermsEnum>();
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: top random seeks");
}
@@ -268,7 +268,7 @@ namespace Lucene.Net.Codecs.Lucene3x
if (spot < 0)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: non-exist seek to " + field + ":" + UnicodeUtil.ToHexString(tx.Text()));
}
@@ -281,7 +281,7 @@ namespace Lucene.Net.Codecs.Lucene3x
tes[field] = te;
}
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" got enum");
}
@@ -296,7 +296,7 @@ namespace Lucene.Net.Codecs.Lucene3x
{
Assert.AreEqual(TermsEnum.SeekStatus.NOT_FOUND, te.SeekCeil(tx.Bytes));
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" got term=" + UnicodeUtil.ToHexString(te.Term.Utf8ToString()));
Console.WriteLine(" exp term=" + UnicodeUtil.ToHexString(fieldTerms[spot].Text()));
@@ -308,7 +308,7 @@ namespace Lucene.Net.Codecs.Lucene3x
int ct = TestUtil.NextInt32(r, 5, 100);
for (int i = 0; i < ct; i++)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: now next()");
}
@@ -326,7 +326,7 @@ namespace Lucene.Net.Codecs.Lucene3x
{
BytesRef t = te.Next();
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" got term=" + (t == null ? null : UnicodeUtil.ToHexString(t.Utf8ToString())));
Console.WriteLine(" exp=" + UnicodeUtil.ToHexString(term.Text().ToString()));
@@ -378,7 +378,7 @@ namespace Lucene.Net.Codecs.Lucene3x
IndexReader reader = w.GetReader();
- if (VERBOSE)
+ if (Verbose)
{
fieldTerms.Sort(termAsUTF16Comparer);
@@ -392,7 +392,7 @@ namespace Lucene.Net.Codecs.Lucene3x
// sorts in code point order:
fieldTerms.Sort();
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("\nTEST: codepoint order");
foreach (Term t in fieldTerms)
diff --git a/src/Lucene.Net.Tests/Codecs/PerField/TestPerFieldPostingsFormat2.cs b/src/Lucene.Net.Tests/Codecs/PerField/TestPerFieldPostingsFormat2.cs
index e2c81de..5e6c3a3 100644
--- a/src/Lucene.Net.Tests/Codecs/PerField/TestPerFieldPostingsFormat2.cs
+++ b/src/Lucene.Net.Tests/Codecs/PerField/TestPerFieldPostingsFormat2.cs
@@ -116,7 +116,7 @@ namespace Lucene.Net.Codecs.PerField
public virtual void TestChangeCodecAndMerge()
{
Directory dir = NewDirectory();
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: make new index");
}
@@ -129,7 +129,7 @@ namespace Lucene.Net.Codecs.PerField
AddDocs(writer, 10);
writer.Commit();
AssertQuery(new Term("content", "aaa"), dir, 10);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: addDocs3");
}
@@ -150,7 +150,7 @@ namespace Lucene.Net.Codecs.PerField
iwconf.SetCodec(new MockCodec2()); // uses standard for field content
writer = NewWriter(dir, iwconf);
// swap in new codec for currently written segments
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: add docs w/ Standard codec for content field");
}
@@ -162,7 +162,7 @@ namespace Lucene.Net.Codecs.PerField
AssertQuery(new Term("content", "ccc"), dir, 10); ////
AssertQuery(new Term("content", "aaa"), dir, 10);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: add more docs w/ new codec");
}
@@ -173,7 +173,7 @@ namespace Lucene.Net.Codecs.PerField
AssertQuery(new Term("content", "aaa"), dir, 10);
Assert.AreEqual(40, writer.MaxDoc);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: now optimize");
}
@@ -189,7 +189,7 @@ namespace Lucene.Net.Codecs.PerField
public virtual void AssertQuery(Term t, Directory dir, int num)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("\nTEST: assertQuery " + t);
}
diff --git a/src/Lucene.Net.Tests/Index/Test2BPositions.cs b/src/Lucene.Net.Tests/Index/Test2BPositions.cs
index 3ff81c8..f56a056 100644
--- a/src/Lucene.Net.Tests/Index/Test2BPositions.cs
+++ b/src/Lucene.Net.Tests/Index/Test2BPositions.cs
@@ -74,7 +74,7 @@ namespace Lucene.Net.Index
for (int i = 0; i < numDocs; i++)
{
w.AddDocument(doc);
- if (VERBOSE && i % 100000 == 0)
+ if (Verbose && i % 100000 == 0)
{
Console.WriteLine(i + " of " + numDocs + "...");
}
diff --git a/src/Lucene.Net.Tests/Index/Test2BPostings.cs b/src/Lucene.Net.Tests/Index/Test2BPostings.cs
index c58e9a5..42c80c4 100644
--- a/src/Lucene.Net.Tests/Index/Test2BPostings.cs
+++ b/src/Lucene.Net.Tests/Index/Test2BPostings.cs
@@ -80,7 +80,7 @@ namespace Lucene.Net.Index
for (int i = 0; i < numDocs; i++)
{
w.AddDocument(doc);
- if (VERBOSE && i % 100000 == 0)
+ if (Verbose && i % 100000 == 0)
{
Console.WriteLine(i + " of " + numDocs + "...");
}
diff --git a/src/Lucene.Net.Tests/Index/Test4GBStoredFields.cs b/src/Lucene.Net.Tests/Index/Test4GBStoredFields.cs
index 7b09f1c..f2e959c 100644
--- a/src/Lucene.Net.Tests/Index/Test4GBStoredFields.cs
+++ b/src/Lucene.Net.Tests/Index/Test4GBStoredFields.cs
@@ -84,14 +84,14 @@ namespace Lucene.Net.Index
for (int i = 0; i < numDocs; ++i)
{
w.AddDocument(doc);
- if (VERBOSE && i % (numDocs / 10) == 0)
+ if (Verbose && i % (numDocs / 10) == 0)
{
Console.WriteLine(i + " of " + numDocs + "...");
}
}
w.ForceMerge(1);
w.Dispose();
- if (VERBOSE)
+ if (Verbose)
{
bool found = false;
foreach (string file in dir.ListAll())
diff --git a/src/Lucene.Net.Tests/Index/TestAddIndexes.cs b/src/Lucene.Net.Tests/Index/TestAddIndexes.cs
index 475b621..bf712d2 100644
--- a/src/Lucene.Net.Tests/Index/TestAddIndexes.cs
+++ b/src/Lucene.Net.Tests/Index/TestAddIndexes.cs
@@ -423,7 +423,7 @@ namespace Lucene.Net.Index
writer = NewWriter(dir, NewIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(Random)).SetOpenMode(OpenMode.APPEND).SetMaxBufferedDocs(4).SetMergePolicy(NewLogMergePolicy(4)));
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("\nTEST: now addIndexes");
}
@@ -774,7 +774,7 @@ namespace Lucene.Net.Index
switch (j % 5)
{
case 0:
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(Thread.CurrentThread.Name + ": TEST: addIndexes(Dir[]) then full merge");
}
@@ -783,7 +783,7 @@ namespace Lucene.Net.Index
break;
case 1:
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(Thread.CurrentThread.Name + ": TEST: addIndexes(Dir[])");
}
@@ -791,7 +791,7 @@ namespace Lucene.Net.Index
break;
case 2:
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(Thread.CurrentThread.Name + ": TEST: addIndexes(IndexReader[])");
}
@@ -799,7 +799,7 @@ namespace Lucene.Net.Index
break;
case 3:
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(Thread.CurrentThread.Name + ": TEST: addIndexes(Dir[]) then maybeMerge");
}
@@ -808,7 +808,7 @@ namespace Lucene.Net.Index
break;
case 4:
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(Thread.CurrentThread.Name + ": TEST: commit");
}
@@ -823,7 +823,7 @@ namespace Lucene.Net.Index
[Test]
public virtual void TestAddIndexesWithThreads()
{
- int NUM_ITER = TEST_NIGHTLY ? 15 : 5;
+ int NUM_ITER = TestNightly ? 15 : 5;
const int NUM_COPY = 3;
CommitAndAddIndexes c = new CommitAndAddIndexes(this, NUM_COPY);
c.LaunchThreads(NUM_ITER);
@@ -908,7 +908,7 @@ namespace Lucene.Net.Index
switch (j % 5)
{
case 0:
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: " + Thread.CurrentThread.Name + ": addIndexes + full merge");
}
@@ -917,7 +917,7 @@ namespace Lucene.Net.Index
break;
case 1:
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: " + Thread.CurrentThread.Name + ": addIndexes");
}
@@ -925,7 +925,7 @@ namespace Lucene.Net.Index
break;
case 2:
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: " + Thread.CurrentThread.Name + ": addIndexes(IR[])");
}
@@ -933,7 +933,7 @@ namespace Lucene.Net.Index
break;
case 3:
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: " + Thread.CurrentThread.Name + ": full merge");
}
@@ -941,7 +941,7 @@ namespace Lucene.Net.Index
break;
case 4:
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: " + Thread.CurrentThread.Name + ": commit");
}
@@ -995,7 +995,7 @@ namespace Lucene.Net.Index
Thread.Sleep(TestUtil.NextInt32(Random, 10, 500));
// Close w/o first stopping/joining the threads
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: now close(false)");
}
@@ -1003,7 +1003,7 @@ namespace Lucene.Net.Index
c.JoinThreads();
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: done join threads");
}
@@ -1016,14 +1016,14 @@ namespace Lucene.Net.Index
[Test]
public virtual void TestAddIndexesWithRollback()
{
- int NUM_COPY = TEST_NIGHTLY ? 50 : 5;
+ int NUM_COPY = TestNightly ? 50 : 5;
CommitAndAddIndexes3 c = new CommitAndAddIndexes3(this, NUM_COPY);
c.LaunchThreads(-1);
Thread.Sleep(TestUtil.NextInt32(Random, 10, 500));
// Close w/o first stopping/joining the threads
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: now force rollback");
}
diff --git a/src/Lucene.Net.Tests/Index/TestBackwardsCompatibility.cs b/src/Lucene.Net.Tests/Index/TestBackwardsCompatibility.cs
index 9845166..e1ebc0e 100644
--- a/src/Lucene.Net.Tests/Index/TestBackwardsCompatibility.cs
+++ b/src/Lucene.Net.Tests/Index/TestBackwardsCompatibility.cs
@@ -234,7 +234,7 @@ namespace Lucene.Net.Index
{
for (int i = 0; i < unsupportedNames.Length; i++)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: index " + unsupportedNames[i]);
}
@@ -277,7 +277,7 @@ namespace Lucene.Net.Index
catch (IndexFormatTooOldException e)
{
// pass
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: got expected exc:");
Console.WriteLine(e.StackTrace);
@@ -320,7 +320,7 @@ namespace Lucene.Net.Index
{
foreach (string name in oldNames)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("\nTEST: index=" + name);
}
@@ -338,14 +338,14 @@ namespace Lucene.Net.Index
{
foreach (string name in oldNames)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("\nTEST: old index " + name);
}
Directory targetDir = NewDirectory();
IndexWriter w = new IndexWriter(targetDir, NewIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(Random)));
w.AddIndexes(oldIndexDirs[name]);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("\nTEST: done adding indices; now close");
}
@@ -397,7 +397,7 @@ namespace Lucene.Net.Index
{
foreach (string name in oldNames)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: oldName=" + name);
}
@@ -905,7 +905,7 @@ namespace Lucene.Net.Index
{
SegmentInfos infos = new SegmentInfos();
infos.Read(dir);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("checkAllSegmentsUpgraded: " + infos);
}
@@ -931,7 +931,7 @@ namespace Lucene.Net.Index
names.AddRange(oldSingleSegmentNames);
foreach (string name in names)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("testUpgradeOldIndex: index=" + name);
}
@@ -1010,7 +1010,7 @@ namespace Lucene.Net.Index
{
foreach (string name in oldSingleSegmentNames)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("testUpgradeOldSingleSegmentIndexWithAdditions: index=" + name);
}
@@ -1028,7 +1028,7 @@ namespace Lucene.Net.Index
IndexWriterConfig iwc = (new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(Random))).SetMergePolicy(mp);
IndexWriter w = new IndexWriter(ramDir, iwc);
// add few more docs:
- for (int j = 0; j < RANDOM_MULTIPLIER * Random.Next(30); j++)
+ for (int j = 0; j < RandomMultiplier * Random.Next(30); j++)
{
AddDoc(w, id++);
}
diff --git a/src/Lucene.Net.Tests/Index/TestBackwardsCompatibility3x.cs b/src/Lucene.Net.Tests/Index/TestBackwardsCompatibility3x.cs
index f95a9eb..8e84317 100644
--- a/src/Lucene.Net.Tests/Index/TestBackwardsCompatibility3x.cs
+++ b/src/Lucene.Net.Tests/Index/TestBackwardsCompatibility3x.cs
@@ -167,7 +167,7 @@ namespace Lucene.Net.Index
{
for (int i = 0; i < unsupportedNames.Length; i++)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: index " + unsupportedNames[i]);
}
@@ -210,7 +210,7 @@ namespace Lucene.Net.Index
catch (IndexFormatTooOldException e)
{
// pass
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: got expected exc:");
Console.WriteLine(e.StackTrace);
@@ -249,7 +249,7 @@ namespace Lucene.Net.Index
{
foreach (string name in oldNames)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("\nTEST: index=" + name);
}
@@ -267,14 +267,14 @@ namespace Lucene.Net.Index
{
foreach (string name in oldNames)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("\nTEST: old index " + name);
}
Directory targetDir = NewDirectory();
IndexWriter w = new IndexWriter(targetDir, NewIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(Random)));
w.AddIndexes(oldIndexDirs[name]);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("\nTEST: done adding indices; now close");
}
@@ -326,7 +326,7 @@ namespace Lucene.Net.Index
{
foreach (string name in oldNames)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: oldName=" + name);
}
@@ -343,7 +343,7 @@ namespace Lucene.Net.Index
{
foreach (string name in oldNames)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: oldName=" + name);
}
@@ -867,7 +867,7 @@ namespace Lucene.Net.Index
{
SegmentInfos infos = new SegmentInfos();
infos.Read(dir);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("checkAllSegmentsUpgraded: " + infos);
}
@@ -893,7 +893,7 @@ namespace Lucene.Net.Index
names.AddRange(oldSingleSegmentNames);
foreach (string name in names)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("testUpgradeOldIndex: index=" + name);
}
@@ -912,7 +912,7 @@ namespace Lucene.Net.Index
{
foreach (string name in oldSingleSegmentNames)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("testUpgradeOldSingleSegmentIndexWithAdditions: index=" + name);
}
@@ -930,7 +930,7 @@ namespace Lucene.Net.Index
IndexWriterConfig iwc = (new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(Random))).SetMergePolicy(mp);
IndexWriter w = new IndexWriter(ramDir, iwc);
// add few more docs:
- for (int j = 0; j < RANDOM_MULTIPLIER * Random.Next(30); j++)
+ for (int j = 0; j < RandomMultiplier * Random.Next(30); j++)
{
AddDoc(w, id++);
}
diff --git a/src/Lucene.Net.Tests/Index/TestBagOfPositions.cs b/src/Lucene.Net.Tests/Index/TestBagOfPositions.cs
index d1d350a..f21b7f7 100644
--- a/src/Lucene.Net.Tests/Index/TestBagOfPositions.cs
+++ b/src/Lucene.Net.Tests/Index/TestBagOfPositions.cs
@@ -61,12 +61,12 @@ namespace Lucene.Net.Index
IndexWriterConfig iwc = NewIndexWriterConfig(Random, TEST_VERSION_CURRENT, new MockAnalyzer(Random));
- if ((isSimpleText || iwc.MergePolicy is MockRandomMergePolicy) && (TEST_NIGHTLY || RANDOM_MULTIPLIER > 1))
+ if ((isSimpleText || iwc.MergePolicy is MockRandomMergePolicy) && (TestNightly || RandomMultiplier > 1))
{
// Otherwise test can take way too long (> 2 hours)
numTerms /= 2;
}
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("maxTermsPerDoc=" + maxTermsPerDoc);
Console.WriteLine("numTerms=" + numTerms);
@@ -89,7 +89,7 @@ namespace Lucene.Net.Index
RandomIndexWriter iw = new RandomIndexWriter(Random, dir, iwc);
int threadCount = TestUtil.NextInt32(Random, 1, 5);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("config: " + iw.IndexWriter.Config);
Console.WriteLine("threadCount=" + threadCount);
diff --git a/src/Lucene.Net.Tests/Index/TestBagOfPostings.cs b/src/Lucene.Net.Tests/Index/TestBagOfPostings.cs
index 16c008a..21b769f 100644
--- a/src/Lucene.Net.Tests/Index/TestBagOfPostings.cs
+++ b/src/Lucene.Net.Tests/Index/TestBagOfPostings.cs
@@ -59,13 +59,13 @@ namespace Lucene.Net.Index
IndexWriterConfig iwc = NewIndexWriterConfig(Random, TEST_VERSION_CURRENT, new MockAnalyzer(Random));
- if ((isSimpleText || iwc.MergePolicy is MockRandomMergePolicy) && (TEST_NIGHTLY || RANDOM_MULTIPLIER > 1))
+ if ((isSimpleText || iwc.MergePolicy is MockRandomMergePolicy) && (TestNightly || RandomMultiplier > 1))
{
// Otherwise test can take way too long (> 2 hours)
numTerms /= 2;
}
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("maxTermsPerDoc=" + maxTermsPerDoc);
Console.WriteLine("numTerms=" + numTerms);
@@ -87,7 +87,7 @@ namespace Lucene.Net.Index
RandomIndexWriter iw = new RandomIndexWriter(Random, dir, iwc);
int threadCount = TestUtil.NextInt32(Random, 1, 5);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("config: " + iw.IndexWriter.Config);
Console.WriteLine("threadCount=" + threadCount);
diff --git a/src/Lucene.Net.Tests/Index/TestCheckIndex.cs b/src/Lucene.Net.Tests/Index/TestCheckIndex.cs
index 7c017ab..6bc5ae2 100644
--- a/src/Lucene.Net.Tests/Index/TestCheckIndex.cs
+++ b/src/Lucene.Net.Tests/Index/TestCheckIndex.cs
@@ -63,7 +63,7 @@ namespace Lucene.Net.Index
ByteArrayOutputStream bos = new ByteArrayOutputStream(1024);
CheckIndex checker = new CheckIndex(dir);
checker.InfoStream = new StreamWriter(bos, Encoding.UTF8);
- if (VERBOSE)
+ if (Verbose)
{
checker.InfoStream = Console.Out;
}
diff --git a/src/Lucene.Net.Tests/Index/TestCodecs.cs b/src/Lucene.Net.Tests/Index/TestCodecs.cs
index c583619..332f635 100644
--- a/src/Lucene.Net.Tests/Index/TestCodecs.cs
+++ b/src/Lucene.Net.Tests/Index/TestCodecs.cs
@@ -415,7 +415,7 @@ namespace Lucene.Net.Index
{
FieldInfos fieldInfos = builder.Finish();
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: now write postings");
}
@@ -424,7 +424,7 @@ namespace Lucene.Net.Index
Codec codec = Codec.Default;
SegmentInfo si = new SegmentInfo(dir, Constants.LUCENE_MAIN_VERSION, SEGMENT, 10000, false, codec, null);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: now read postings");
}
@@ -661,7 +661,7 @@ namespace Lucene.Net.Index
}
// Test seek to non-existent terms:
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: seek non-exist terms");
}
@@ -673,7 +673,7 @@ namespace Lucene.Net.Index
}
// Seek to each term, backwards:
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: seek terms backwards");
}
@@ -809,7 +809,7 @@ namespace Lucene.Net.Index
int termIndexInterval = TestUtil.NextInt32(Random, 13, 27);
Codec codec = Codec.Default;
SegmentInfo si = new SegmentInfo(dir, Constants.LUCENE_MAIN_VERSION, SEGMENT, 10000, false, codec, null);
- SegmentWriteState state = new SegmentWriteState(InfoStream.Default, dir, si, fieldInfos, termIndexInterval, null, NewIOContext(Random));
+ SegmentWriteState state = new SegmentWriteState((InfoStream)InfoStream.Default, dir, si, fieldInfos, termIndexInterval, null, NewIOContext(Random));
// LUCENENET specific - BUG: we must wrap this in a using block in case anything in the below loop throws
using (FieldsConsumer consumer = codec.PostingsFormat.FieldsConsumer(state))
diff --git a/src/Lucene.Net.Tests/Index/TestConcurrentMergeScheduler.cs b/src/Lucene.Net.Tests/Index/TestConcurrentMergeScheduler.cs
index e395e11..d061d0c 100644
--- a/src/Lucene.Net.Tests/Index/TestConcurrentMergeScheduler.cs
+++ b/src/Lucene.Net.Tests/Index/TestConcurrentMergeScheduler.cs
@@ -104,7 +104,7 @@ namespace Lucene.Net.Index
for (int i = 0; i < 10; i++)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: iter=" + i);
}
@@ -133,7 +133,7 @@ namespace Lucene.Net.Index
}
catch (IOException ioe)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(ioe.StackTrace);
}
@@ -170,7 +170,7 @@ namespace Lucene.Net.Index
doc.Add(idField);
for (int i = 0; i < 10; i++)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("\nTEST: cycle");
}
@@ -183,7 +183,7 @@ namespace Lucene.Net.Index
int delID = i;
while (delID < 100 * (1 + i))
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: del " + delID);
}
@@ -210,7 +210,7 @@ namespace Lucene.Net.Index
for (int iter = 0; iter < 7; iter++)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: iter=" + iter);
}
@@ -292,7 +292,7 @@ namespace Lucene.Net.Index
AtomicInt32 runningMergeCount = new AtomicInt32(0);
AtomicBoolean failed = new AtomicBoolean();
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: maxMergeCount=" + maxMergeCount + " maxMergeThreads=" + maxMergeThreads);
}
diff --git a/src/Lucene.Net.Tests/Index/TestCrashCausesCorruptIndex.cs b/src/Lucene.Net.Tests/Index/TestCrashCausesCorruptIndex.cs
index 4d0a0cb..772a8c8 100644
--- a/src/Lucene.Net.Tests/Index/TestCrashCausesCorruptIndex.cs
+++ b/src/Lucene.Net.Tests/Index/TestCrashCausesCorruptIndex.cs
@@ -185,7 +185,7 @@ namespace Lucene.Net.Index
{
// CRASH!
indexOutput.Dispose();
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: now crash");
Console.WriteLine(new Exception().StackTrace);
diff --git a/src/Lucene.Net.Tests/Index/TestDeletionPolicy.cs b/src/Lucene.Net.Tests/Index/TestDeletionPolicy.cs
index a281690..9db32e1 100644
--- a/src/Lucene.Net.Tests/Index/TestDeletionPolicy.cs
+++ b/src/Lucene.Net.Tests/Index/TestDeletionPolicy.cs
@@ -157,7 +157,7 @@ namespace Lucene.Net.Index
public override void OnInit<T>(IList<T> commits)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: onInit");
}
@@ -169,7 +169,7 @@ namespace Lucene.Net.Index
public override void OnCommit<T>(IList<T> commits)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: onCommit");
}
@@ -357,7 +357,7 @@ namespace Lucene.Net.Index
{
for (int pass = 0; pass < 2; pass++)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: cycle pass=" + pass);
}
@@ -388,7 +388,7 @@ namespace Lucene.Net.Index
conf = NewIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(Random)).SetOpenMode(OpenMode.APPEND).SetIndexDeletionPolicy(policy);
mp = conf.MergePolicy;
mp.NoCFSRatio = useCompoundFile ? 1.0 : 0.0;
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: open writer for forceMerge");
}
diff --git a/src/Lucene.Net.Tests/Index/TestDirectoryReaderReopen.cs b/src/Lucene.Net.Tests/Index/TestDirectoryReaderReopen.cs
index 95c4c13..578649f 100644
--- a/src/Lucene.Net.Tests/Index/TestDirectoryReaderReopen.cs
+++ b/src/Lucene.Net.Tests/Index/TestDirectoryReaderReopen.cs
@@ -632,7 +632,7 @@ namespace Lucene.Net.Index
{
case 0:
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: modify index");
}
diff --git a/src/Lucene.Net.Tests/Index/TestDoc.cs b/src/Lucene.Net.Tests/Index/TestDoc.cs
index 014b594..7e3ec61 100644
--- a/src/Lucene.Net.Tests/Index/TestDoc.cs
+++ b/src/Lucene.Net.Tests/Index/TestDoc.cs
@@ -57,7 +57,7 @@ namespace Lucene.Net.Index
public override void SetUp()
{
base.SetUp();
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: setUp");
}
@@ -216,7 +216,7 @@ namespace Lucene.Net.Index
TrackingDirectoryWrapper trackingDir = new TrackingDirectoryWrapper(si1.Info.Dir);
SegmentInfo si = new SegmentInfo(si1.Info.Dir, Constants.LUCENE_MAIN_VERSION, merged, -1, false, codec, null);
- SegmentMerger merger = new SegmentMerger(new List<AtomicReader> { r1, r2 }, si, InfoStream.Default, trackingDir, IndexWriterConfig.DEFAULT_TERM_INDEX_INTERVAL, CheckAbort.NONE, new FieldInfos.FieldNumbers(), context, true);
+ SegmentMerger merger = new SegmentMerger(new List<AtomicReader> { r1, r2 }, si, (InfoStream)InfoStream.Default, trackingDir, IndexWriterConfig.DEFAULT_TERM_INDEX_INTERVAL, CheckAbort.NONE, new FieldInfos.FieldNumbers(), context, true);
MergeState mergeState = merger.Merge();
r1.Dispose();
@@ -226,7 +226,7 @@ namespace Lucene.Net.Index
if (useCompoundFile)
{
- ICollection<string> filesToDelete = IndexWriter.CreateCompoundFile(InfoStream.Default, dir, CheckAbort.NONE, info, NewIOContext(Random));
+ ICollection<string> filesToDelete = IndexWriter.CreateCompoundFile((InfoStream)InfoStream.Default, dir, CheckAbort.NONE, info, NewIOContext(Random));
info.UseCompoundFile = true;
foreach (String fileToDelete in filesToDelete)
{
diff --git a/src/Lucene.Net.Tests/Index/TestDocTermOrds.cs b/src/Lucene.Net.Tests/Index/TestDocTermOrds.cs
index acd2823..23775e8 100644
--- a/src/Lucene.Net.Tests/Index/TestDocTermOrds.cs
+++ b/src/Lucene.Net.Tests/Index/TestDocTermOrds.cs
@@ -138,14 +138,14 @@ namespace Lucene.Net.Index
doc.Add(new Int32Field("id", id, Field.Store.NO));
- int termCount = TestUtil.NextInt32(Random, 0, 20 * RANDOM_MULTIPLIER);
+ int termCount = TestUtil.NextInt32(Random, 0, 20 * RandomMultiplier);
while (ordsForDocSet.Count < termCount)
{
ordsForDocSet.Add(Random.Next(termsArray.Length));
}
int[] ordsForDoc = new int[termCount];
int upto = 0;
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: doc id=" + id);
}
@@ -153,7 +153,7 @@ namespace Lucene.Net.Index
{
ordsForDoc[upto++] = ord;
Field field = NewStringField("field", termsArray[ord].Utf8ToString(), Field.Store.NO);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" f=" + termsArray[ord].Utf8ToString());
}
@@ -168,14 +168,14 @@ namespace Lucene.Net.Index
DirectoryReader r = w.GetReader();
w.Dispose();
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: reader=" + r);
}
foreach (AtomicReaderContext ctx in r.Leaves)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("\nTEST: sub=" + ctx.Reader);
}
@@ -184,7 +184,7 @@ namespace Lucene.Net.Index
// Also test top-level reader: its enum does not support
// ord, so this forces the OrdWrapper to run:
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: top reader");
}
@@ -204,7 +204,7 @@ namespace Lucene.Net.Index
ISet<string> prefixes = new JCG.HashSet<string>();
int numPrefix = TestUtil.NextInt32(Random, 2, 7);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: use " + numPrefix + " prefixes");
}
@@ -251,14 +251,14 @@ namespace Lucene.Net.Index
doc.Add(new Int32Field("id", id, Field.Store.NO));
- int termCount = TestUtil.NextInt32(Random, 0, 20 * RANDOM_MULTIPLIER);
+ int termCount = TestUtil.NextInt32(Random, 0, 20 * RandomMultiplier);
while (ordsForDocSet.Count < termCount)
{
ordsForDocSet.Add(Random.Next(termsArray.Length));
}
int[] ordsForDoc = new int[termCount];
int upto = 0;
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: doc id=" + id);
}
@@ -266,7 +266,7 @@ namespace Lucene.Net.Index
{
ordsForDoc[upto++] = ord;
Field field = NewStringField("field", termsArray[ord].Utf8ToString(), Field.Store.NO);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" f=" + termsArray[ord].Utf8ToString());
}
@@ -281,7 +281,7 @@ namespace Lucene.Net.Index
DirectoryReader r = w.GetReader();
w.Dispose();
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: reader=" + r);
}
@@ -314,7 +314,7 @@ namespace Lucene.Net.Index
foreach (AtomicReaderContext ctx in r.Leaves)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("\nTEST: sub=" + ctx.Reader);
}
@@ -323,7 +323,7 @@ namespace Lucene.Net.Index
// Also test top-level reader: its enum does not support
// ord, so this forces the OrdWrapper to run:
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: top reader");
}
@@ -347,7 +347,7 @@ namespace Lucene.Net.Index
}
*/
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: verify prefix=" + (prefixRef == null ? "null" : prefixRef.Utf8ToString()));
Console.WriteLine("TEST: all TERMS:");
@@ -391,7 +391,7 @@ namespace Lucene.Net.Index
return;
}
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: TERMS:");
te.SeekExact(0);
@@ -408,7 +408,7 @@ namespace Lucene.Net.Index
SortedSetDocValues iter = dto.GetIterator(r);
for (int docID = 0; docID < r.MaxDoc; docID++)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: docID=" + docID + " of " + r.MaxDoc + " (id=" + docIDToID.Get(docID) + ")");
}
@@ -420,7 +420,7 @@ namespace Lucene.Net.Index
{
te.SeekExact(ord);
BytesRef expected = termsArray[answers[upto++]];
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" exp=" + expected.Utf8ToString() + " actual=" + te.Term.Utf8ToString());
}
diff --git a/src/Lucene.Net.Tests/Index/TestDocValuesWithThreads.cs b/src/Lucene.Net.Tests/Index/TestDocValuesWithThreads.cs
index ad15d52..ce57426 100644
--- a/src/Lucene.Net.Tests/Index/TestDocValuesWithThreads.cs
+++ b/src/Lucene.Net.Tests/Index/TestDocValuesWithThreads.cs
@@ -193,7 +193,7 @@ namespace Lucene.Net.Index
random, dir);
bool allowDups = random.NextBoolean();
ISet<string> seen = new JCG.HashSet<string>();
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: NUM_DOCS=" + NUM_DOCS + " allowDups=" + allowDups);
}
@@ -223,7 +223,7 @@ namespace Lucene.Net.Index
seen.Add(s);
}
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" " + numDocs + ": s=" + s);
}
@@ -248,7 +248,7 @@ namespace Lucene.Net.Index
AtomicReader sr = GetOnlySegmentReader(r);
- long END_TIME = Environment.TickCount + (TEST_NIGHTLY ? 30 : 1);
+ long END_TIME = Environment.TickCount + (TestNightly ? 30 : 1);
int NUM_THREADS = TestUtil.NextInt32(LuceneTestCase.Random, 1, 10);
ThreadJob[] threads = new ThreadJob[NUM_THREADS];
diff --git a/src/Lucene.Net.Tests/Index/TestDocumentsWriterDeleteQueue.cs b/src/Lucene.Net.Tests/Index/TestDocumentsWriterDeleteQueue.cs
index 2a3235c..0b1b8e6 100644
--- a/src/Lucene.Net.Tests/Index/TestDocumentsWriterDeleteQueue.cs
+++ b/src/Lucene.Net.Tests/Index/TestDocumentsWriterDeleteQueue.cs
@@ -44,7 +44,7 @@ namespace Lucene.Net.Index
public virtual void TestUpdateDelteSlices()
{
DocumentsWriterDeleteQueue queue = new DocumentsWriterDeleteQueue();
- int size = 200 + Random.Next(500) * RANDOM_MULTIPLIER;
+ int size = 200 + Random.Next(500) * RandomMultiplier;
int?[] ids = new int?[size];
for (int i = 0; i < ids.Length; i++)
{
@@ -150,7 +150,7 @@ namespace Lucene.Net.Index
Assert.IsFalse(queue.AnyChanges());
queue.Clear();
Assert.IsFalse(queue.AnyChanges());
- int size = 200 + Random.Next(500) * RANDOM_MULTIPLIER;
+ int size = 200 + Random.Next(500) * RandomMultiplier;
int termsSinceFreeze = 0;
int queriesSinceFreeze = 0;
for (int i = 0; i < size; i++)
@@ -180,7 +180,7 @@ namespace Lucene.Net.Index
public virtual void TestAnyChanges()
{
DocumentsWriterDeleteQueue queue = new DocumentsWriterDeleteQueue();
- int size = 200 + Random.Next(500) * RANDOM_MULTIPLIER;
+ int size = 200 + Random.Next(500) * RandomMultiplier;
int termsSinceFreeze = 0;
int queriesSinceFreeze = 0;
for (int i = 0; i < size; i++)
@@ -254,7 +254,7 @@ namespace Lucene.Net.Index
{
DocumentsWriterDeleteQueue queue = new DocumentsWriterDeleteQueue();
ISet<Term> uniqueValues = new JCG.HashSet<Term>();
- int size = 10000 + Random.Next(500) * RANDOM_MULTIPLIER;
+ int size = 10000 + Random.Next(500) * RandomMultiplier;
int?[] ids = new int?[size];
for (int i = 0; i < ids.Length; i++)
{
diff --git a/src/Lucene.Net.Tests/Index/TestDocumentsWriterStallControl.cs b/src/Lucene.Net.Tests/Index/TestDocumentsWriterStallControl.cs
index 291fa85..61eccf8 100644
--- a/src/Lucene.Net.Tests/Index/TestDocumentsWriterStallControl.cs
+++ b/src/Lucene.Net.Tests/Index/TestDocumentsWriterStallControl.cs
@@ -144,7 +144,7 @@ namespace Lucene.Net.Index
Start(threads);
int iters = AtLeast(10000);
- float checkPointProbability = TEST_NIGHTLY ? 0.5f : 0.1f;
+ float checkPointProbability = TestNightly ? 0.5f : 0.1f;
for (int i = 0; i < iters; i++)
{
if (checkPoint)
diff --git a/src/Lucene.Net.Tests/Index/TestFlushByRamOrCountsPolicy.cs b/src/Lucene.Net.Tests/Index/TestFlushByRamOrCountsPolicy.cs
index 9af7f58..5f29a2e 100644
--- a/src/Lucene.Net.Tests/Index/TestFlushByRamOrCountsPolicy.cs
+++ b/src/Lucene.Net.Tests/Index/TestFlushByRamOrCountsPolicy.cs
@@ -61,15 +61,15 @@ namespace Lucene.Net.Index
[Test]
public virtual void TestFlushByRam()
{
- double ramBuffer = (TEST_NIGHTLY ? 1 : 10) + AtLeast(2) + Random.NextDouble();
- RunFlushByRam(1 + Random.Next(TEST_NIGHTLY ? 5 : 1), ramBuffer, false);
+ double ramBuffer = (TestNightly ? 1 : 10) + AtLeast(2) + Random.NextDouble();
+ RunFlushByRam(1 + Random.Next(TestNightly ? 5 : 1), ramBuffer, false);
}
[Test]
public virtual void TestFlushByRamLargeBuffer()
{
// with a 256 mb ram buffer we should never stall
- RunFlushByRam(1 + Random.Next(TEST_NIGHTLY ? 5 : 1), 256d, true);
+ RunFlushByRam(1 + Random.Next(TestNightly ? 5 : 1), 256d, true);
}
protected internal virtual void RunFlushByRam(int numThreads, double maxRamMB, bool ensureNotStalled)
diff --git a/src/Lucene.Net.Tests/Index/TestForceMergeForever.cs b/src/Lucene.Net.Tests/Index/TestForceMergeForever.cs
index e9b894e..c78ce68 100644
--- a/src/Lucene.Net.Tests/Index/TestForceMergeForever.cs
+++ b/src/Lucene.Net.Tests/Index/TestForceMergeForever.cs
@@ -49,7 +49,7 @@ namespace Lucene.Net.Index
if (merge.MaxNumSegments != -1 && (first || merge.Segments.Count == 1))
{
first = false;
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: maxNumSegments merge");
}
diff --git a/src/Lucene.Net.Tests/Index/TestIndexInput.cs b/src/Lucene.Net.Tests/Index/TestIndexInput.cs
index 3a2393d..3cdea38 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexInput.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexInput.cs
@@ -36,7 +36,7 @@ namespace Lucene.Net.Index
{
internal static readonly byte[] READ_TEST_BYTES = new byte[] { unchecked((byte)(sbyte)0x80), 0x01, unchecked((byte)(sbyte)0xFF), 0x7F, unchecked((byte)(sbyte)0x80), unchecked((byte)(sbyte)0x80), 0x01, unchecked((byte)(sbyte)0x81), unchecked((byte)(sbyte)0x80), 0x01, unchecked((byte)(sbyte)0xFF), unchecked((byte)(sbyte)0xFF), unchecked((byte)(sbyte)0xFF), unchecked((byte)(sbyte)0xFF), 0x07, unchecked((byte)(sbyte)0xFF), unchecked((byte)(sbyte)0xFF), unchecked((byte)(sbyte)0xFF), u [...]
- internal static readonly int COUNT = RANDOM_MULTIPLIER * 65536;
+ internal static readonly int COUNT = RandomMultiplier * 65536;
internal static int[] INTS;
internal static long[] LONGS;
internal static byte[] RANDOM_TEST_BYTES;
diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriter.cs b/src/Lucene.Net.Tests/Index/TestIndexWriter.cs
index 3a83581..b0c6bae 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexWriter.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexWriter.cs
@@ -756,7 +756,7 @@ namespace Lucene.Net.Index
doc.Add(NewField("field", "aaa", customType));
writer.AddDocument(doc);
writer.Commit();
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("\nTEST: now add empty doc");
}
@@ -825,7 +825,7 @@ namespace Lucene.Net.Index
Directory dir = NewDirectory();
for (int i = 0; i < 20; i++)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: iter=" + i);
}
@@ -1365,7 +1365,7 @@ namespace Lucene.Net.Index
if (!failed)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: now rollback");
}
@@ -2477,7 +2477,7 @@ namespace Lucene.Net.Index
docCount++;
}
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: iter=" + iter + " flushed after docCount=" + docCount);
}
@@ -2707,7 +2707,7 @@ namespace Lucene.Net.Index
iwc.SetOpenMode(OpenMode.CREATE_OR_APPEND);
}
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("\nTEST: i=" + i);
}
@@ -2738,7 +2738,7 @@ namespace Lucene.Net.Index
}
}
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" at close: " + Arrays.ToString(dir.ListAll()));
}
diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterCommit.cs b/src/Lucene.Net.Tests/Index/TestIndexWriterCommit.cs
index 53c89a2..2b7a16a 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexWriterCommit.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexWriterCommit.cs
@@ -305,7 +305,7 @@ namespace Lucene.Net.Index
Assert.IsTrue(reader.Leaves.Count > 1, "Reader incorrectly sees one segment");
reader.Dispose();
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: do real full merge");
}
@@ -313,7 +313,7 @@ namespace Lucene.Net.Index
writer.ForceMerge(1);
writer.Dispose();
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: writer closed");
}
diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterConfig.cs b/src/Lucene.Net.Tests/Index/TestIndexWriterConfig.cs
index 4dc6950..11b761c 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexWriterConfig.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexWriterConfig.cs
@@ -85,7 +85,7 @@ namespace Lucene.Net.Index
Assert.AreEqual(typeof(FlushByRamOrCountsPolicy), conf.FlushPolicy.GetType());
Assert.AreEqual(IndexWriterConfig.DEFAULT_RAM_PER_THREAD_HARD_LIMIT_MB, conf.RAMPerThreadHardLimitMB);
Assert.AreEqual(Codec.Default, conf.Codec);
- Assert.AreEqual(InfoStream.Default, conf.InfoStream);
+ Assert.AreEqual((object)InfoStream.Default, conf.InfoStream);
Assert.AreEqual(IndexWriterConfig.DEFAULT_USE_COMPOUND_FILE_SYSTEM, conf.UseCompoundFile);
// Sanity check - validate that all getters are covered.
ISet<string> getters = new JCG.HashSet<string>();
diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterDelete.cs b/src/Lucene.Net.Tests/Index/TestIndexWriterDelete.cs
index 8400265..36c34df 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexWriterDelete.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexWriterDelete.cs
@@ -85,14 +85,14 @@ namespace Lucene.Net.Index
Term term = new Term("city", "Amsterdam");
int hitCount = GetHitCount(dir, term);
Assert.AreEqual(1, hitCount);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("\nTEST: now delete by term=" + term);
}
modifier.DeleteDocuments(term);
modifier.Commit();
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("\nTEST: now getHitCount");
}
@@ -159,7 +159,7 @@ namespace Lucene.Net.Index
{
for (int t = 0; t < 2; t++)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: t=" + t);
}
@@ -357,7 +357,7 @@ namespace Lucene.Net.Index
while (!doneLatch.Wait(new TimeSpan(0, 0, 0, 0, 1)))
{
modifier.DeleteAll();
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("del all");
}
@@ -415,7 +415,7 @@ namespace Lucene.Net.Index
doc.Add(new NumericDocValuesField("dv", value));
}
modifier.AddDocument(doc);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("\tThread[" + offset + "]: add doc: " + id);
}
@@ -428,7 +428,7 @@ namespace Lucene.Net.Index
finally
{
doneLatch.Signal();
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("\tThread[" + offset + "]: done indexing");
}
@@ -602,7 +602,7 @@ namespace Lucene.Net.Index
// Iterate w/ ever increasing free disk space:
while (!done)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: cycle");
}
@@ -631,7 +631,7 @@ namespace Lucene.Net.Index
for (int x = 0; x < 2; x++)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: x=" + x);
}
@@ -656,7 +656,7 @@ namespace Lucene.Net.Index
{
rate = 0.0;
}
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("\ncycle: " + diskFree + " bytes");
}
@@ -667,7 +667,7 @@ namespace Lucene.Net.Index
{
thisDiskFree = 0;
rate = 0.0;
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("\ncycle: same writer: unlimited disk space");
}
@@ -713,7 +713,7 @@ namespace Lucene.Net.Index
}
catch (IOException e)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" hit IOException: " + e);
Console.WriteLine(e.StackTrace);
@@ -736,7 +736,7 @@ namespace Lucene.Net.Index
{
// Must force the close else the writer can have
// open files which cause exc in MockRAMDir.close
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: now rollback");
}
@@ -860,13 +860,13 @@ namespace Lucene.Net.Index
}
// flush (and commit if ac)
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: now full merge");
}
modifier.ForceMerge(1);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: now commit");
}
@@ -883,7 +883,7 @@ namespace Lucene.Net.Index
// delete the doc
// max buf del terms is two, so this is buffered
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: delete term=" + term);
}
@@ -893,7 +893,7 @@ namespace Lucene.Net.Index
// add a doc (needed for the !ac case; see below)
// doc remains buffered
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: add empty doc");
}
@@ -915,7 +915,7 @@ namespace Lucene.Net.Index
bool failed = false;
try
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: now commit for failure");
}
@@ -987,7 +987,7 @@ namespace Lucene.Net.Index
{
// Only fail once we are no longer in applyDeletes
failed = true;
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: mock failure: now fail");
Console.WriteLine(Environment.StackTrace);
@@ -1001,7 +1001,7 @@ namespace Lucene.Net.Index
// to each possible target of the StackTraceHelper. If these change, so must the attribute on the target methods.
if (StackTraceHelper.DoesStackTraceContainMethod("ApplyDeletesAndUpdates"))
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: mock failure: saw applyDeletes");
Console.WriteLine(Environment.StackTrace);
@@ -1046,7 +1046,7 @@ namespace Lucene.Net.Index
}
catch (IOException io)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: got expected exc:");
Console.WriteLine(io.StackTrace);
@@ -1173,7 +1173,7 @@ namespace Lucene.Net.Index
int count = 0;
bool doIndexing = r.NextBoolean();
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: iter doIndexing=" + doIndexing);
}
@@ -1236,7 +1236,7 @@ namespace Lucene.Net.Index
// TODO: fix this test
if (SlowFileExists(dir, "_0_1.del") || SlowFileExists(dir, "_0_1.liv"))
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: deletes created @ count=" + count);
}
@@ -1334,7 +1334,7 @@ namespace Lucene.Net.Index
// TODO: fix this test
if (SlowFileExists(dir, "_0_1.del") || SlowFileExists(dir, "_0_1.liv"))
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: deletes created @ id=" + id);
}
diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterExceptions.cs b/src/Lucene.Net.Tests/Index/TestIndexWriterExceptions.cs
index 06480d9..ebc0ec2 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexWriterExceptions.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexWriterExceptions.cs
@@ -207,7 +207,7 @@ namespace Lucene.Net.Index
do
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(Thread.CurrentThread.Name + ": TEST: IndexerThread: cycle");
}
@@ -228,7 +228,7 @@ namespace Lucene.Net.Index
}
catch (TestPoint1Exception re)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(Thread.CurrentThread.Name + ": EXC: ");
Console.WriteLine(re.StackTrace);
@@ -290,7 +290,7 @@ namespace Lucene.Net.Index
{
if (outerInstance.doFail.Value != null && !name.Equals("startDoFlush", StringComparison.Ordinal) && r.Next(40) == 17)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(Thread.CurrentThread.Name + ": NOW FAIL: " + name);
Console.WriteLine((new Exception()).StackTrace);
@@ -310,7 +310,7 @@ namespace Lucene.Net.Index
[Test]
public virtual void TestRandomExceptions([ValueSource(typeof(ConcurrentMergeSchedulerFactories), "Values")]Func<IConcurrentMergeScheduler> newScheduler)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("\nTEST: start testRandomExceptions");
}
@@ -333,7 +333,7 @@ namespace Lucene.Net.Index
IndexWriter writer = RandomIndexWriter.MockIndexWriter(dir, config , new TestPoint1(this));
//writer.SetMaxBufferedDocs(10);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: initial commit");
}
@@ -347,7 +347,7 @@ namespace Lucene.Net.Index
Assert.Fail("thread " + thread.Name + ": hit unexpected failure");
}
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: commit after thread start");
}
@@ -771,7 +771,7 @@ namespace Lucene.Net.Index
for (int i = 0; i < 2; i++)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: cycle i=" + i);
}
@@ -796,7 +796,7 @@ namespace Lucene.Net.Index
}
catch (IOException ioe)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: hit expected exception");
Console.WriteLine(ioe.StackTrace);
@@ -812,7 +812,7 @@ namespace Lucene.Net.Index
}
writer.Dispose();
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: open reader");
}
@@ -1034,7 +1034,7 @@ namespace Lucene.Net.Index
if (m_doFail && foundMethod)
{
didFail = true;
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: now throw exc:");
Console.WriteLine(Environment.StackTrace);
@@ -1192,10 +1192,10 @@ namespace Lucene.Net.Index
}
w.Dispose();
- int iter = TEST_NIGHTLY ? 200 : 10;
+ int iter = TestNightly ? 200 : 10;
for (int i = 0; i < iter; i++)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: iter " + i);
}
@@ -2166,10 +2166,10 @@ namespace Lucene.Net.Index
RandomIndexWriter w = null;
- for (int iter = 0; iter < 10 * RANDOM_MULTIPLIER; iter++)
+ for (int iter = 0; iter < 10 * RandomMultiplier; iter++)
{
int numDocs = AtLeast(100);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("\nTEST: iter=" + iter + " numDocs=" + numDocs + ".DocBase=" + docBase + " delCount=" + deleteCount);
}
@@ -2228,7 +2228,7 @@ namespace Lucene.Net.Index
if (fieldUpdate)
{
long value = iter;
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" update id=" + docBase + i + " to value " + value);
}
@@ -2254,7 +2254,7 @@ namespace Lucene.Net.Index
// sometimes do both deletes and updates
if (!fieldUpdate || Random.NextBoolean())
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" delete id=" + (docBase + i).ToString());
}
@@ -2275,7 +2275,7 @@ namespace Lucene.Net.Index
// Sometimes close, so the disk full happens on close:
if (Random.NextBoolean())
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" now close writer");
}
@@ -2292,7 +2292,7 @@ namespace Lucene.Net.Index
if (ioe is FakeIOException || (ioe.InnerException != null && ioe.InnerException is FakeIOException))
{
// expected
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: w.Dispose() hit expected IOE");
}
@@ -2308,7 +2308,7 @@ namespace Lucene.Net.Index
if (doClose && w != null)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" now 2nd close writer");
}
@@ -2320,7 +2320,7 @@ namespace Lucene.Net.Index
{
// Open non-NRT reader, to make sure the "on
// disk" bits are good:
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: verify against non-NRT reader");
}
@@ -2332,7 +2332,7 @@ namespace Lucene.Net.Index
}
else
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: verify against NRT reader");
}
@@ -2366,7 +2366,7 @@ namespace Lucene.Net.Index
// Sometimes re-use RIW, other times open new one:
if (w != null && Random.NextBoolean())
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: close writer");
}
@@ -2419,7 +2419,7 @@ namespace Lucene.Net.Index
// Only sometimes throw the exc, so we get
// it sometimes on creating the file, on
// flushing buffer, on closing the file:
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: now fail; thread=" + Thread.CurrentThread.Name + " exc:");
Console.WriteLine((new Exception()).StackTrace);
@@ -2546,7 +2546,7 @@ namespace Lucene.Net.Index
public virtual void TestRandomExceptionDuringRollback()
{
// fail in random places on i/o
- int numIters = RANDOM_MULTIPLIER * 75;
+ int numIters = RandomMultiplier * 75;
for (int iter = 0; iter < numIters; iter++)
{
MockDirectoryWrapper dir = NewMockDirectory();
@@ -2617,7 +2617,7 @@ namespace Lucene.Net.Index
if (maybeFail && Random.Next(10) == 0)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: now fail; thread=" + Thread.CurrentThread.Name + " exc:");
Console.WriteLine((new Exception()).StackTrace);
diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterForceMerge.cs b/src/Lucene.Net.Tests/Index/TestIndexWriterForceMerge.cs
index 7b9fcb8..e388c66 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexWriterForceMerge.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexWriterForceMerge.cs
@@ -44,7 +44,7 @@ namespace Lucene.Net.Index
Document doc = new Document();
doc.Add(NewStringField("content", "aaa", Field.Store.NO));
- int incrMin = TEST_NIGHTLY ? 15 : 40;
+ int incrMin = TestNightly ? 15 : 40;
for (int numDocs = 10; numDocs < 500; numDocs += TestUtil.NextInt32(Random, incrMin, 5 * incrMin))
{
LogDocMergePolicy ldmp = new LogDocMergePolicy();
@@ -146,7 +146,7 @@ namespace Lucene.Net.Index
{
MockDirectoryWrapper dir = NewMockDirectory();
IndexWriter writer = new IndexWriter(dir, NewIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(Random)).SetMaxBufferedDocs(10).SetMergePolicy(NewLogMergePolicy()));
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: config1=" + writer.Config);
}
@@ -162,7 +162,7 @@ namespace Lucene.Net.Index
AddDocWithIndex(writer, 500);
writer.Dispose();
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: start disk usage");
}
@@ -171,7 +171,7 @@ namespace Lucene.Net.Index
for (int i = 0; i < files.Length; i++)
{
startDiskUsage += dir.FileLength(files[i]);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(files[i] + ": " + dir.FileLength(files[i]));
}
diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterMerging.cs b/src/Lucene.Net.Tests/Index/TestIndexWriterMerging.cs
index a6402e0..0d1ce4d 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexWriterMerging.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexWriterMerging.cs
@@ -366,7 +366,7 @@ namespace Lucene.Net.Index
for (int pass = 0; pass < 2; pass++)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: pass=" + pass);
}
@@ -382,7 +382,7 @@ namespace Lucene.Net.Index
for (int iter = 0; iter < 10; iter++)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: iter=" + iter);
}
diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterNRTIsCurrent.cs b/src/Lucene.Net.Tests/Index/TestIndexWriterNRTIsCurrent.cs
index 936fcd1..6ac70cb 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexWriterNRTIsCurrent.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexWriterNRTIsCurrent.cs
@@ -176,7 +176,7 @@ namespace Lucene.Net.Index
}
}
}
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("writer stopped - forced by reader: " + holder.stop);
}
@@ -219,7 +219,7 @@ namespace Lucene.Net.Index
try
{
bool current = reader.IsCurrent();
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("Thread: " + Thread.CurrentThread + " Reader: " + reader + " isCurrent:" + current);
}
@@ -228,7 +228,7 @@ namespace Lucene.Net.Index
}
catch (Exception e)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("FAILED Thread: " + Thread.CurrentThread + " Reader: " + reader + " isCurrent: false");
}
diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterOnDiskFull.cs b/src/Lucene.Net.Tests/Index/TestIndexWriterOnDiskFull.cs
index 941d35c..ad0b9c9 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexWriterOnDiskFull.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexWriterOnDiskFull.cs
@@ -60,7 +60,7 @@ namespace Lucene.Net.Index
{
for (int pass = 0; pass < 2; pass++)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: pass=" + pass);
}
@@ -68,7 +68,7 @@ namespace Lucene.Net.Index
long diskFree = TestUtil.NextInt32(Random, 100, 300);
while (true)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: cycle: diskFree=" + diskFree);
}
@@ -91,7 +91,7 @@ namespace Lucene.Net.Index
{
AddDoc(writer);
}
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: done adding docs; now commit");
}
@@ -99,7 +99,7 @@ namespace Lucene.Net.Index
}
catch (IOException e)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: exception on addDoc");
Console.WriteLine(e.StackTrace);
@@ -111,7 +111,7 @@ namespace Lucene.Net.Index
{
if (doAbort)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: now rollback");
}
@@ -121,7 +121,7 @@ namespace Lucene.Net.Index
{
try
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: now close");
}
@@ -129,7 +129,7 @@ namespace Lucene.Net.Index
}
catch (IOException e)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: exception on close; retry w/ no disk space limit");
Console.WriteLine(e.StackTrace);
@@ -152,7 +152,7 @@ namespace Lucene.Net.Index
dir.Dispose();
// Now try again w/ more space:
- diskFree += TEST_NIGHTLY ? TestUtil.NextInt32(Random, 400, 600) : TestUtil.NextInt32(Random, 3000, 5000);
+ diskFree += TestNightly ? TestUtil.NextInt32(Random, 400, 600) : TestUtil.NextInt32(Random, 3000, 5000);
}
else
{
@@ -195,8 +195,8 @@ namespace Lucene.Net.Index
AssumeFalse("this test cannot run with Memory codec", idFormat.Equals("Memory", StringComparison.Ordinal) || contentFormat.Equals("Memory", StringComparison.Ordinal));
int START_COUNT = 57;
- int NUM_DIR = TEST_NIGHTLY ? 50 : 5;
- int END_COUNT = START_COUNT + NUM_DIR * (TEST_NIGHTLY ? 25 : 5);
+ int NUM_DIR = TestNightly ? 50 : 5;
+ int END_COUNT = START_COUNT + NUM_DIR * (TestNightly ? 25 : 5);
// Build up a bunch of dirs that have indexes which we
// will then merge together by calling addIndexes(*):
@@ -261,7 +261,7 @@ namespace Lucene.Net.Index
for (int iter = 0; iter < 3; iter++)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: iter=" + iter);
}
@@ -290,7 +290,7 @@ namespace Lucene.Net.Index
while (!done)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: cycle...");
}
@@ -344,7 +344,7 @@ namespace Lucene.Net.Index
{
rate = 0.0;
}
- if (VERBOSE)
+ if (Verbose)
{
testName = "disk full test " + methodName + " with disk full at " + diskFree + " bytes";
}
@@ -354,13 +354,13 @@ namespace Lucene.Net.Index
dir.RandomIOExceptionRateOnOpen = 0.0;
thisDiskFree = 0;
rate = 0.0;
- if (VERBOSE)
+ if (Verbose)
{
testName = "disk full test " + methodName + " with unlimited disk space";
}
}
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("\ncycle: " + testName);
}
@@ -373,12 +373,12 @@ namespace Lucene.Net.Index
{
if (0 == method)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: now addIndexes count=" + dirs.Length);
}
indWriter.AddIndexes(dirs);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: now forceMerge");
}
@@ -409,7 +409,7 @@ namespace Lucene.Net.Index
}
success = true;
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" success!");
}
@@ -423,7 +423,7 @@ namespace Lucene.Net.Index
{
success = false;
err = e;
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" hit IOException: " + e);
Console.WriteLine(e.StackTrace);
@@ -440,7 +440,7 @@ namespace Lucene.Net.Index
// ConcurrentMergeScheduler are done
TestUtil.SyncConcurrentMerges(indWriter);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" now test readers");
}
@@ -508,7 +508,7 @@ namespace Lucene.Net.Index
}
reader.Dispose();
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" count is " + result);
}
@@ -519,7 +519,7 @@ namespace Lucene.Net.Index
}
}
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" start disk = " + startDiskUsage + "; input disk = " + inputDiskUsage + "; max used = " + dir.MaxUsedSizeInBytes);
}
@@ -547,7 +547,7 @@ namespace Lucene.Net.Index
dir.Dispose();
// Try again with more free space:
- diskFree += TEST_NIGHTLY ? TestUtil.NextInt32(Random, 4000, 8000) : TestUtil.NextInt32(Random, 40000, 80000);
+ diskFree += TestNightly ? TestUtil.NextInt32(Random, 4000, 8000) : TestUtil.NextInt32(Random, 40000, 80000);
}
}
diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterOutOfFileDescriptors.cs b/src/Lucene.Net.Tests/Index/TestIndexWriterOutOfFileDescriptors.cs
index abf17bd..85a67c2 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexWriterOutOfFileDescriptors.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexWriterOutOfFileDescriptors.cs
@@ -54,7 +54,7 @@ namespace Lucene.Net.Index
for (int iter = 0; iter < iters; iter++)
{
IndexWriter w = null;
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: iter=" + iter);
}
@@ -64,7 +64,7 @@ namespace Lucene.Net.Index
analyzer.MaxTokenLength = TestUtil.NextInt32(Random, 1, IndexWriter.MAX_TERM_LENGTH);
IndexWriterConfig iwc = NewIndexWriterConfig(TEST_VERSION_CURRENT, analyzer);
- if (VERBOSE)
+ if (Verbose)
{
// Do this ourselves instead of relying on LTC so
// we see incrementing messageID:
@@ -80,7 +80,7 @@ namespace Lucene.Net.Index
{
if (Random.NextBoolean())
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: addIndexes IR[]");
}
@@ -88,7 +88,7 @@ namespace Lucene.Net.Index
}
else
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: addIndexes Directory[]");
}
@@ -97,7 +97,7 @@ namespace Lucene.Net.Index
}
else
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: addDocument");
}
@@ -135,14 +135,14 @@ namespace Lucene.Net.Index
dir.RandomIOExceptionRateOnOpen = rate;
any = true;
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: iter=" + iter + ": success");
}
}
catch (IOException ioe)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: iter=" + iter + ": exception");
Console.WriteLine(ioe.ToString());
diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterReader.cs b/src/Lucene.Net.Tests/Index/TestIndexWriterReader.cs
index 1cc0f95..5aa6318 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexWriterReader.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexWriterReader.cs
@@ -52,7 +52,7 @@ namespace Lucene.Net.Index
[TestFixture]
public class TestIndexWriterReader : LuceneTestCase
{
- private readonly int numThreads = TEST_NIGHTLY ? 5 : 3;
+ private readonly int numThreads = TestNightly ? 5 : 3;
public static int Count(Term t, IndexReader r)
{
@@ -150,7 +150,7 @@ namespace Lucene.Net.Index
{
iwc.SetMergePolicy(NoMergePolicy.COMPOUND_FILES);
}
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: make index");
}
@@ -176,7 +176,7 @@ namespace Lucene.Net.Index
DirectoryReader r2 = writer.GetReader();
Assert.IsTrue(r2.IsCurrent());
Assert.AreEqual(0, Count(new Term("id", id10), r2));
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: verify id");
}
@@ -1383,7 +1383,7 @@ namespace Lucene.Net.Index
#pragma warning restore 168
{
// expected
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("hit expected fake IOE");
}
@@ -1409,7 +1409,7 @@ namespace Lucene.Net.Index
// to each possible target of the StackTraceHelper. If these change, so must the attribute on the target methods.
if (shouldFail && StackTraceHelper.DoesStackTraceContainMethod("GetReadOnlyClone"))
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: now fail; exc:");
Console.WriteLine((new Exception()).StackTrace);
diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterWithThreads.cs b/src/Lucene.Net.Tests/Index/TestIndexWriterWithThreads.cs
index 77b1bc1..46b1788 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexWriterWithThreads.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexWriterWithThreads.cs
@@ -105,7 +105,7 @@ namespace Lucene.Net.Index
}
catch (IOException ioe)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: expected exc:");
Console.WriteLine(ioe.StackTrace);
@@ -165,10 +165,10 @@ namespace Lucene.Net.Index
public virtual void TestImmediateDiskFullWithThreads([ValueSource(typeof(ConcurrentMergeSchedulerFactories), "Values")]Func<IConcurrentMergeScheduler> newScheduler)
{
int NUM_THREADS = 3;
- int numIterations = TEST_NIGHTLY ? 10 : 3;
+ int numIterations = TestNightly ? 10 : 3;
for (int iter = 0; iter < numIterations; iter++)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("\nTEST: iter=" + iter);
}
@@ -221,10 +221,10 @@ namespace Lucene.Net.Index
public virtual void TestCloseWithThreads([ValueSource(typeof(ConcurrentMergeSchedulerFactories), "Values")]Func<IConcurrentMergeScheduler> newScheduler)
{
int NUM_THREADS = 3;
- int numIterations = TEST_NIGHTLY ? 7 : 3;
+ int numIterations = TestNightly ? 7 : 3;
for (int iter = 0; iter < numIterations; iter++)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("\nTEST: iter=" + iter);
}
@@ -277,7 +277,7 @@ namespace Lucene.Net.Index
}
}
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("\nTEST: now close");
}
@@ -318,7 +318,7 @@ namespace Lucene.Net.Index
for (int iter = 0; iter < 2; iter++)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: iter=" + iter);
}
@@ -368,7 +368,7 @@ namespace Lucene.Net.Index
failure.ClearDoFail();
writer.Dispose(false);
}
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: success=" + success);
}
@@ -742,14 +742,14 @@ namespace Lucene.Net.Index
{
case 0:
rollbackLock.@Lock();
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("\nTEST: " + Thread.CurrentThread.Name + ": now rollback");
}
try
{
writerRef.Value.Rollback();
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: " + Thread.CurrentThread.Name + ": rollback done; now open new writer");
}
@@ -768,7 +768,7 @@ namespace Lucene.Net.Index
case 1:
commitLock.@Lock();
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("\nTEST: " + Thread.CurrentThread.Name + ": now commit");
}
@@ -795,7 +795,7 @@ namespace Lucene.Net.Index
break;
case 2:
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("\nTEST: " + Thread.CurrentThread.Name + ": now add");
}
diff --git a/src/Lucene.Net.Tests/Index/TestIndexableField.cs b/src/Lucene.Net.Tests/Index/TestIndexableField.cs
index e7468d3..8d65685 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexableField.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexableField.cs
@@ -240,7 +240,7 @@ namespace Lucene.Net.Index
Random, dir);
int NUM_DOCS = AtLeast(27);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: " + NUM_DOCS + " docs");
}
@@ -253,7 +253,7 @@ namespace Lucene.Net.Index
fieldsPerDoc[docCount] = fieldCount - 1;
int finalDocCount = docCount;
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: " + fieldCount + " fields in doc " + docCount);
}
@@ -271,7 +271,7 @@ namespace Lucene.Net.Index
int counter = 0;
for (int id = 0; id < NUM_DOCS; id++)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: verify doc id=" + id + " (" + fieldsPerDoc[id] + " fields) counter=" + counter);
}
diff --git a/src/Lucene.Net.Tests/Index/TestLongPostings.cs b/src/Lucene.Net.Tests/Index/TestLongPostings.cs
index dae7c91..ef3a68c 100644
--- a/src/Lucene.Net.Tests/Index/TestLongPostings.cs
+++ b/src/Lucene.Net.Tests/Index/TestLongPostings.cs
@@ -108,7 +108,7 @@ namespace Lucene.Net.Index
int NUM_DOCS = AtLeast(2000);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: NUM_DOCS=" + NUM_DOCS);
}
@@ -116,7 +116,7 @@ namespace Lucene.Net.Index
string s1 = GetRandomTerm(null);
string s2 = GetRandomTerm(s1);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("\nTEST: s1=" + s1 + " s2=" + s2);
/*
@@ -197,7 +197,7 @@ namespace Lucene.Net.Index
doS1 = false;
}
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("\nTEST: iter=" + iter + " doS1=" + doS1);
}
@@ -210,7 +210,7 @@ namespace Lucene.Net.Index
int what = Random.Next(3);
if (what == 0)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: docID=" + docID + "; do next()");
}
@@ -233,7 +233,7 @@ namespace Lucene.Net.Index
}
}
docID = postings.NextDoc();
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" got docID=" + docID);
}
@@ -273,7 +273,7 @@ namespace Lucene.Net.Index
{
targetDocID = docID + TestUtil.NextInt32(Random, 1, NUM_DOCS - docID);
}
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: docID=" + docID + "; do advance(" + targetDocID + ")");
}
@@ -296,7 +296,7 @@ namespace Lucene.Net.Index
}
docID = postings.Advance(targetDocID);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" got docID=" + docID);
}
@@ -346,7 +346,7 @@ namespace Lucene.Net.Index
int NUM_DOCS = AtLeast(2000);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: NUM_DOCS=" + NUM_DOCS);
}
@@ -354,7 +354,7 @@ namespace Lucene.Net.Index
string s1 = GetRandomTerm(null);
string s2 = GetRandomTerm(s1);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("\nTEST: s1=" + s1 + " s2=" + s2);
/*
@@ -446,7 +446,7 @@ namespace Lucene.Net.Index
doS1 = false;
}
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("\nTEST: iter=" + iter + " doS1=" + doS1 + " term=" + term);
}
@@ -472,7 +472,7 @@ namespace Lucene.Net.Index
int what = Random.Next(3);
if (what == 0)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: docID=" + docID + "; do next()");
}
@@ -495,7 +495,7 @@ namespace Lucene.Net.Index
}
}
docID = docs.NextDoc();
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" got docID=" + docID);
}
@@ -523,7 +523,7 @@ namespace Lucene.Net.Index
{
targetDocID = docID + TestUtil.NextInt32(Random, 1, NUM_DOCS - docID);
}
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: docID=" + docID + "; do advance(" + targetDocID + ")");
}
@@ -546,7 +546,7 @@ namespace Lucene.Net.Index
}
docID = docs.Advance(targetDocID);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" got docID=" + docID);
}
diff --git a/src/Lucene.Net.Tests/Index/TestMixedCodecs.cs b/src/Lucene.Net.Tests/Index/TestMixedCodecs.cs
index b6c092c..0bee4b7 100644
--- a/src/Lucene.Net.Tests/Index/TestMixedCodecs.cs
+++ b/src/Lucene.Net.Tests/Index/TestMixedCodecs.cs
@@ -51,7 +51,7 @@ namespace Lucene.Net.Index
int docUpto = 0;
while (docUpto < NUM_DOCS)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: " + docUpto + " of " + NUM_DOCS);
}
@@ -79,7 +79,7 @@ namespace Lucene.Net.Index
docsLeftInthisSegment--;
}
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("\nTEST: now delete...");
}
diff --git a/src/Lucene.Net.Tests/Index/TestMultiFields.cs b/src/Lucene.Net.Tests/Index/TestMultiFields.cs
index 705a3fb..52ef84a 100644
--- a/src/Lucene.Net.Tests/Index/TestMultiFields.cs
+++ b/src/Lucene.Net.Tests/Index/TestMultiFields.cs
@@ -40,7 +40,7 @@ namespace Lucene.Net.Index
int num = AtLeast(2);
for (int iter = 0; iter < num; iter++)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: iter=" + iter);
}
@@ -55,7 +55,7 @@ namespace Lucene.Net.Index
ISet<int?> deleted = new JCG.HashSet<int?>();
IList<BytesRef> terms = new List<BytesRef>();
- int numDocs = TestUtil.NextInt32(Random, 1, 100 * RANDOM_MULTIPLIER);
+ int numDocs = TestUtil.NextInt32(Random, 1, 100 * RandomMultiplier);
Documents.Document doc = new Documents.Document();
Field f = NewStringField("field", "", Field.Store.NO);
doc.Add(f);
@@ -63,7 +63,7 @@ namespace Lucene.Net.Index
doc.Add(id);
bool onlyUniqueTerms = Random.NextBoolean();
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: onlyUniqueTerms=" + onlyUniqueTerms + " numDocs=" + numDocs);
}
@@ -101,14 +101,14 @@ namespace Lucene.Net.Index
int delID = Random.Next(i);
deleted.Add(delID);
w.DeleteDocuments(new Term("id", "" + delID));
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: delete " + delID);
}
}
}
- if (VERBOSE)
+ if (Verbose)
{
List<BytesRef> termsList = new List<BytesRef>(uniqueTerms);
#pragma warning disable 612, 618
@@ -134,7 +134,7 @@ namespace Lucene.Net.Index
IndexReader reader = w.GetReader();
w.Dispose();
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: reader=" + reader);
}
@@ -148,7 +148,7 @@ namespace Lucene.Net.Index
for (int i = 0; i < 100; i++)
{
BytesRef term = terms[Random.Next(terms.Count)];
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: seek term=" + UnicodeUtil.ToHexString(term.Utf8ToString()) + " " + term);
}
diff --git a/src/Lucene.Net.Tests/Index/TestNRTThreads.cs b/src/Lucene.Net.Tests/Index/TestNRTThreads.cs
index 6e219d2..4c7e05d 100644
--- a/src/Lucene.Net.Tests/Index/TestNRTThreads.cs
+++ b/src/Lucene.Net.Tests/Index/TestNRTThreads.cs
@@ -55,7 +55,7 @@ namespace Lucene.Net.Index
{
if (Random.NextBoolean())
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: now reopen r=" + r);
}
@@ -68,7 +68,7 @@ namespace Lucene.Net.Index
}
else
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: now close reader=" + r);
}
@@ -81,13 +81,13 @@ namespace Lucene.Net.Index
}
anyOpenDelFiles |= openDeletedFiles.Count > 0;
//Assert.AreEqual("open but deleted: " + openDeletedFiles, 0, openDeletedFiles.Size());
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: now open");
}
r = DirectoryReader.Open(m_writer, true);
}
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: got new reader=" + r);
}
diff --git a/src/Lucene.Net.Tests/Index/TestNeverDelete.cs b/src/Lucene.Net.Tests/Index/TestNeverDelete.cs
index a205dc7..3fdbef5 100644
--- a/src/Lucene.Net.Tests/Index/TestNeverDelete.cs
+++ b/src/Lucene.Net.Tests/Index/TestNeverDelete.cs
@@ -74,7 +74,7 @@ namespace Lucene.Net.Index
while (Environment.TickCount < stopTime)
{
IndexCommit ic = r.IndexCommit;
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: check files: " + ic.FileNames);
}
diff --git a/src/Lucene.Net.Tests/Index/TestParallelReaderEmptyIndex.cs b/src/Lucene.Net.Tests/Index/TestParallelReaderEmptyIndex.cs
index 3ea5a28..9f10064 100644
--- a/src/Lucene.Net.Tests/Index/TestParallelReaderEmptyIndex.cs
+++ b/src/Lucene.Net.Tests/Index/TestParallelReaderEmptyIndex.cs
@@ -90,7 +90,7 @@ namespace Lucene.Net.Index
{
Directory rd1 = NewDirectory();
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("\nTEST: make 1st writer");
}
@@ -109,7 +109,7 @@ namespace Lucene.Net.Index
iw.Dispose();
IndexWriterConfig dontMergeConfig = (new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(Random))).SetMergePolicy(NoMergePolicy.COMPOUND_FILES);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("\nTEST: make 2nd writer");
}
diff --git a/src/Lucene.Net.Tests/Index/TestRollingUpdates.cs b/src/Lucene.Net.Tests/Index/TestRollingUpdates.cs
index 95c762a..5092583 100644
--- a/src/Lucene.Net.Tests/Index/TestRollingUpdates.cs
+++ b/src/Lucene.Net.Tests/Index/TestRollingUpdates.cs
@@ -62,8 +62,8 @@ namespace Lucene.Net.Index
int id = 0;
IndexReader r = null;
IndexSearcher s = null;
- int numUpdates = (int)(SIZE * (2 + (TEST_NIGHTLY ? 200 * LuceneTestCase.Random.NextDouble() : 5 * LuceneTestCase.Random.NextDouble())));
- if (VERBOSE)
+ int numUpdates = (int)(SIZE * (2 + (TestNightly ? 200 * LuceneTestCase.Random.NextDouble() : 5 * LuceneTestCase.Random.NextDouble())));
+ if (Verbose)
{
Console.WriteLine("TEST: numUpdates=" + numUpdates);
}
@@ -81,7 +81,7 @@ namespace Lucene.Net.Index
{
id++;
}
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" docIter=" + docIter + " id=" + id);
}
@@ -95,7 +95,7 @@ namespace Lucene.Net.Index
TopDocs hits = s.Search(new TermQuery(idTerm), 1);
Assert.AreEqual(1, hits.TotalHits);
doUpdate = !w.TryDeleteDocument(r, hits.ScoreDocs[0].Doc);
- if (VERBOSE)
+ if (Verbose)
{
if (doUpdate)
{
@@ -110,7 +110,7 @@ namespace Lucene.Net.Index
else
{
doUpdate = true;
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine(" no searcher: doUpdate=true");
}
@@ -136,7 +136,7 @@ namespace Lucene.Net.Index
bool applyDeletions = LuceneTestCase.Random.NextBoolean();
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("TEST: reopen applyDeletions=" + applyDeletions);
}
diff --git a/src/Lucene.Net.Tests/Index/TestSegmentMerger.cs b/src/Lucene.Net.Tests/Index/TestSegmentMerger.cs
index 2f73939..cd836da 100644
--- a/src/Lucene.Net.Tests/Index/TestSegmentMerger.cs
+++ b/src/Lucene.Net.Tests/Index/TestSegmentMerger.cs
@@ -97,7 +97,7 @@ namespace Lucene.Net.Index
Codec codec = Codec.Default;
SegmentInfo si = new SegmentInfo(mergedDir, Constants.LUCENE_MAIN_VERSION, mergedSegment, -1, false, codec, null);
- SegmentMerger merger = new SegmentMerger(new List<AtomicReader> { reader1, reader2 }, si, InfoStream.Default, mergedDir, IndexWriterConfig.DEFAULT_TERM_INDEX_INTERVAL, CheckAbort.NONE, new FieldInfos.FieldNumbers(), NewIOContext(Random), true);
+ SegmentMerger merger = new SegmentMerger(new List<AtomicReader> { reader1, reader2 }, si, (InfoStream)InfoStream.Default, mergedDir, IndexWriterConfig.DEFAULT_TERM_INDEX_INTERVAL, CheckAbort.NONE, new FieldInfos.FieldNumbers(), NewIOContext(Random), true);
MergeState mergeState = merger.Merge();
int docsMerged = mergeState.SegmentInfo.DocCount;
Assert.IsTrue(docsMerged == 2);
diff --git a/src/Lucene.Net.Tests/Index/TestStressAdvance.cs b/src/Lucene.Net.Tests/Index/TestStressAdvance.cs
index 1004d93..4a4e6dc 100644
--- a/src/Lucene.Net.Tests/Index/TestStressAdvance.cs
+++ b/src/Lucene.Net.Tests/Index/TestStressAdvance.cs
@@ -37,7 +37,7 @@ namespace Lucene.Net.Index
{
for (int iter = 0; iter < 3; iter++)
{
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("\nTEST: iter=" + iter);
}
@@ -54,7 +54,7 @@ namespace Lucene.Net.Index
Field idField = NewStringField("id", "", Field.Store.YES);
doc.Add(idField);
int num = AtLeast(4097);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("\nTEST: numDocs=" + num);
}
@@ -71,7 +71,7 @@ namespace Lucene.Net.Index
}
idField.SetStringValue("" + id);
w.AddDocument(doc);
- if (VERBOSE)
+ if (Verbose)
{
Console.WriteLine("\nTEST: doc upto " + id);
}
@@ -101,7 +101,7 @@ namespace Lucene.Net.Index
DocsEnum de = null;
for (int iter2 = 0; iter2 < 10; iter2++)
{
- if (VERBOSE)
... 2302 lines suppressed ...
[lucenenet] 06/14: Applied the Slow and Nightly attributes to all
tests that they apply to
Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nightowl888 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucenenet.git
commit f8256b51763591dbfd8b0d18c0ec6a1e9535b32d
Author: Shad Storhaug <sh...@shadstorhaug.com>
AuthorDate: Mon Jul 13 11:43:44 2020 +0700
Applied the Slow and Nightly attributes to all tests that they apply to
---
.../Index/BaseStoredFieldsFormatTestCase.cs | 1 +
.../Support/Attributes/LongRunningTestAttribute.cs | 40 ----------------------
.../Analysis/Core/TestAnalyzers.cs | 4 +--
.../Analysis/Core/TestBugInSomething.cs | 4 +--
.../Analysis/Core/TestFactories.cs | 4 +--
.../Analysis/Core/TestRandomChains.cs | 11 +++---
.../TestRemoveDuplicatesTokenFilter.cs | 4 +--
.../Miscellaneous/TestWordDelimiterFilter.cs | 4 +--
.../Analysis/NGram/EdgeNGramTokenFilterTest.cs | 3 +-
.../Analysis/NGram/EdgeNGramTokenizerTest.cs | 6 ++--
.../Analysis/NGram/NGramTokenFilterTest.cs | 3 +-
.../Analysis/NGram/NGramTokenizerTest.cs | 7 ++--
.../Pattern/TestPatternReplaceCharFilter.cs | 6 ++--
.../Analysis/Shingle/ShingleFilterTest.cs | 3 +-
.../Analysis/Snowball/TestSnowball.cs | 3 +-
.../Analysis/Snowball/TestSnowballVocab.cs | 4 +--
.../Analysis/Util/TestRollingCharBuffer.cs | 8 ++---
.../Analysis/Icu/TestICUNormalizer2CharFilter.cs | 1 +
.../TestExtendedMode.cs | 1 +
.../TestJapaneseAnalyzer.cs | 1 +
.../TestJapaneseTokenizer.cs | 9 ++---
.../Language/Bm/CacheSubSequencePerformanceTest.cs | 8 ++---
.../Language/Bm/PhoneticEnginePerformanceTest.cs | 9 +++--
.../TestPhoneticFilter.cs | 4 +--
.../TestSmartChineseAnalyzer.cs | 4 +--
.../ByTask/TestPerfTasksLogic.cs | 3 +-
.../Pulsing/Test10KPulsings.cs | 4 +--
.../SimpleText/TestSimpleTextPostingsFormat.cs | 1 +
.../Taxonomy/Directory/TestAddTaxonomy.cs | 1 +
.../Directory/TestDirectoryTaxonomyWriter.cs | 1 +
.../Taxonomy/TestSearcherTaxonomyManager.cs | 7 ++--
.../Taxonomy/TestTaxonomyCombined.cs | 4 +--
.../Taxonomy/WriterCache/TestCharBlockArray.cs | 6 ++--
.../TestPostingsHighlighterRanking.cs | 1 +
src/Lucene.Net.Tests.Join/TestJoinUtil.cs | 10 +++---
.../Index/Memory/MemoryIndexTest.cs | 3 +-
.../IndexAndTaxonomyReplicationClientTest.cs | 1 +
.../Analyzing/AnalyzingInfixSuggesterTest.cs | 4 +--
.../Suggest/Analyzing/FuzzySuggesterTest.cs | 4 +--
.../Lucene.Net.Tests._E-I.csproj | 1 +
.../Analysis/TestGraphTokenizers.cs | 9 +++--
.../Analysis/TestLookaheadTokenFilter.cs | 7 ++--
src/Lucene.Net.Tests/Analysis/TestMockAnalyzer.cs | 4 +--
.../Codecs/Lucene41/TestBlockPostingsFormat3.cs | 4 +--
src/Lucene.Net.Tests/Index/Test2BPostings.cs | 2 +-
src/Lucene.Net.Tests/Index/Test4GBStoredFields.cs | 4 +--
src/Lucene.Net.Tests/Index/TestAddIndexes.cs | 1 +
src/Lucene.Net.Tests/Index/TestAtomicUpdate.cs | 1 +
.../Index/TestBackwardsCompatibility.cs | 4 +--
src/Lucene.Net.Tests/Index/TestBagOfPositions.cs | 1 +
.../Index/TestBinaryDocValuesUpdates.cs | 3 +-
.../Index/TestDocumentsWriterDeleteQueue.cs | 1 +
.../Index/TestFlushByRamOrCountsPolicy.cs | 1 +
src/Lucene.Net.Tests/Index/TestIndexWriter.cs | 7 ++--
.../Index/TestIndexWriterDelete.cs | 4 +--
.../Index/TestIndexWriterExceptions.cs | 6 ++--
.../Index/TestIndexWriterMerging.cs | 7 ++--
.../Index/TestIndexWriterReader.cs | 7 ++--
.../Index/TestIndexWriterUnicode.cs | 5 ++-
.../Index/TestIndexWriterWithThreads.cs | 1 +
src/Lucene.Net.Tests/Index/TestIntBlockPool.cs | 3 +-
.../Index/TestMixedDocValuesUpdates.cs | 4 +--
.../Index/TestNRTReaderWithThreads.cs | 6 ++--
src/Lucene.Net.Tests/Index/TestNRTThreads.cs | 1 +
src/Lucene.Net.Tests/Index/TestNorms.cs | 1 +
.../Index/TestNumericDocValuesUpdates.cs | 4 +--
src/Lucene.Net.Tests/Index/TestStressIndexing.cs | 1 +
src/Lucene.Net.Tests/Index/TestStressNRT.cs | 3 +-
src/Lucene.Net.Tests/Index/TestTermdocPerf.cs | 5 ++-
.../Search/TestControlledRealTimeReopenThread.cs | 1 +
src/Lucene.Net.Tests/Search/TestSearchAfter.cs | 4 +--
src/Lucene.Net.Tests/Search/TestSearcherManager.cs | 1 +
src/Lucene.Net.Tests/Store/TestCopyBytes.cs | 3 +-
src/Lucene.Net.Tests/Store/TestDirectory.cs | 7 ++--
src/Lucene.Net.Tests/Store/TestHugeRamFile.cs | 4 +--
src/Lucene.Net.Tests/Store/TestLockFactory.cs | 9 ++---
src/Lucene.Net.Tests/Support/TestWeakDictionary.cs | 6 ++--
.../Support/TestWeakDictionaryBehavior.cs | 3 +-
src/Lucene.Net.Tests/Util/Fst/TestBytesStore.cs | 4 +--
src/Lucene.Net.Tests/Util/Fst/TestFSTs.cs | 7 ++--
.../Util/Packed/TestEliasFanoSequence.cs | 6 ++--
src/Lucene.Net.Tests/Util/Packed/TestPackedInts.cs | 7 ++--
.../Util/StressRamUsageEstimator.cs | 4 +--
src/Lucene.Net.Tests/Util/TestBroadWord.cs | 3 +-
src/Lucene.Net.Tests/Util/TestFixedBitSet.cs | 2 +-
src/Lucene.Net.Tests/Util/TestLongBitSet.cs | 2 +-
src/Lucene.Net.Tests/Util/TestNumericUtils.cs | 5 +--
src/Lucene.Net.Tests/Util/TestOfflineSorter.cs | 8 ++---
src/Lucene.Net.Tests/Util/TestOpenBitSet.cs | 2 +-
src/Lucene.Net.Tests/Util/TestPagedBytes.cs | 9 ++---
src/Lucene.Net.Tests/Util/TestWeakIdentityMap.cs | 4 +--
91 files changed, 199 insertions(+), 212 deletions(-)
diff --git a/src/Lucene.Net.TestFramework/Index/BaseStoredFieldsFormatTestCase.cs b/src/Lucene.Net.TestFramework/Index/BaseStoredFieldsFormatTestCase.cs
index 5300826..a33229d 100644
--- a/src/Lucene.Net.TestFramework/Index/BaseStoredFieldsFormatTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Index/BaseStoredFieldsFormatTestCase.cs
@@ -736,6 +736,7 @@ namespace Lucene.Net.Index
}
[Test]
+ [Nightly]
public virtual void TestBigDocuments()
{
// "big" as "much bigger than the chunk size"
diff --git a/src/Lucene.Net.TestFramework/Support/Attributes/LongRunningTestAttribute.cs b/src/Lucene.Net.TestFramework/Support/Attributes/LongRunningTestAttribute.cs
deleted file mode 100644
index 1d84963..0000000
--- a/src/Lucene.Net.TestFramework/Support/Attributes/LongRunningTestAttribute.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-#if TESTFRAMEWORK_NUNIT
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-
-using Lucene.Net.Support;
-using NUnit.Framework;
-
-namespace Lucene.Net.Attributes
-{
- /// <summary>
- /// This test runs long and should be skipped in the 1st run.
- /// </summary>
- [ExceptionToNetNumericConvention]
- internal class LongRunningTestAttribute : CategoryAttribute
- {
- public LongRunningTestAttribute() : base("LongRunningTest")
- {
- // nothing to do here but invoke the base contsructor.
- }
- }
-}
-#endif
\ No newline at end of file
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestAnalyzers.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestAnalyzers.cs
index 4e1448c..a1bfcf1 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestAnalyzers.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestAnalyzers.cs
@@ -1,6 +1,5 @@
using Lucene.Net.Analysis.Standard;
using Lucene.Net.Analysis.TokenAttributes;
-using Lucene.Net.Attributes;
using Lucene.Net.Util;
using NUnit.Framework;
using System;
@@ -242,7 +241,8 @@ namespace Lucene.Net.Analysis.Core
/// <summary>
/// blast some random large strings through the analyzer </summary>
- [Test, LongRunningTest]
+ [Test]
+ [Slow]
public virtual void TestRandomHugeStrings()
{
Random random = Random;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestBugInSomething.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestBugInSomething.cs
index 502d272..95ba117 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestBugInSomething.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestBugInSomething.cs
@@ -5,7 +5,6 @@ using Lucene.Net.Analysis.NGram;
using Lucene.Net.Analysis.Shingle;
using Lucene.Net.Analysis.Util;
using Lucene.Net.Analysis.Wikipedia;
-using Lucene.Net.Attributes;
using NUnit.Framework;
using System;
using System.IO;
@@ -297,7 +296,8 @@ namespace Lucene.Net.Analysis.Core
}
// LUCENE-5269
- [Test, LongRunningTest]
+ [Test]
+ [Slow]
public virtual void TestUnicodeShinglesAndNgrams()
{
Analyzer analyzer = new AnalyzerAnonymousInnerClassHelper100(this);
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestFactories.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestFactories.cs
index 48e04b1..596b45b 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestFactories.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestFactories.cs
@@ -1,5 +1,4 @@
using Lucene.Net.Analysis.Util;
-using Lucene.Net.Attributes;
using Lucene.Net.Util;
using NUnit.Framework;
using System;
@@ -38,7 +37,8 @@ namespace Lucene.Net.Analysis.Core
[TestFixture]
public class TestFactories : BaseTokenStreamTestCase
{
- [Test, LongRunningTest]
+ [Test]
+ [Slow]
public virtual void Test()
{
foreach (string tokenizer in TokenizerFactory.AvailableTokenizers)
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestRandomChains.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestRandomChains.cs
index ade6ea1..e099151 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestRandomChains.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestRandomChains.cs
@@ -1,4 +1,5 @@
+using J2N.Runtime.CompilerServices;
using J2N.Text;
using Lucene.Net.Analysis.CharFilters;
using Lucene.Net.Analysis.Cjk;
@@ -16,7 +17,6 @@ using Lucene.Net.Analysis.Standard;
using Lucene.Net.Analysis.Synonym;
using Lucene.Net.Analysis.Util;
using Lucene.Net.Analysis.Wikipedia;
-using Lucene.Net.Attributes;
using Lucene.Net.Support;
using Lucene.Net.Tartarus.Snowball;
using Lucene.Net.TestFramework.Analysis;
@@ -32,9 +32,8 @@ using System.Linq;
using System.Reflection;
using System.Text;
using System.Text.RegularExpressions;
-using JCG = J2N.Collections.Generic;
using Console = Lucene.Net.Util.SystemConsole;
-using J2N.Runtime.CompilerServices;
+using JCG = J2N.Collections.Generic;
namespace Lucene.Net.Analysis.Core
{
@@ -1122,7 +1121,8 @@ namespace Lucene.Net.Analysis.Core
internal string toString;
}
- [Test, LongRunningTest]
+ [Test]
+ [Slow]
public void TestRandomChains_()
{
int numIterations = AtLeast(20);
@@ -1148,7 +1148,8 @@ namespace Lucene.Net.Analysis.Core
}
// we might regret this decision...
- [Test, LongRunningTest]
+ [Test]
+ [Slow]
public void TestRandomChainsWithLargeStrings()
{
int numIterations = AtLeast(20);
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestRemoveDuplicatesTokenFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestRemoveDuplicatesTokenFilter.cs
index f0b4f67..c09c857 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestRemoveDuplicatesTokenFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestRemoveDuplicatesTokenFilter.cs
@@ -2,7 +2,6 @@
using Lucene.Net.Analysis.Core;
using Lucene.Net.Analysis.Synonym;
using Lucene.Net.Analysis.TokenAttributes;
-using Lucene.Net.Attributes;
using Lucene.Net.Util;
using NUnit.Framework;
using System;
@@ -135,7 +134,8 @@ namespace Lucene.Net.Analysis.Miscellaneous
/// <summary>
/// blast some random strings through the analyzer </summary>
- [Test, LongRunningTest]
+ [Test]
+ [Slow]
public virtual void TestRandomStrings()
{
int numIters = AtLeast(10);
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestWordDelimiterFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestWordDelimiterFilter.cs
index dd4942c..cdec7d3 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestWordDelimiterFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestWordDelimiterFilter.cs
@@ -2,7 +2,6 @@
using Lucene.Net.Analysis.Standard;
using Lucene.Net.Analysis.TokenAttributes;
using Lucene.Net.Analysis.Util;
-using Lucene.Net.Attributes;
using NUnit.Framework;
using System;
using System.IO;
@@ -463,7 +462,8 @@ namespace Lucene.Net.Analysis.Miscellaneous
/// <summary>
/// blast some enormous random strings through the analyzer </summary>
- [Test, LongRunningTest]
+ [Test]
+ [Slow]
public virtual void TestRandomHugeStrings()
{
int numIterations = AtLeast(5);
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/NGram/EdgeNGramTokenFilterTest.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/NGram/EdgeNGramTokenFilterTest.cs
index 9dfd7e5..bed26aa 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/NGram/EdgeNGramTokenFilterTest.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/NGram/EdgeNGramTokenFilterTest.cs
@@ -3,7 +3,6 @@ using Lucene.Net.Analysis.Core;
using Lucene.Net.Analysis.Miscellaneous;
using Lucene.Net.Analysis.Shingle;
using Lucene.Net.Analysis.TokenAttributes;
-using Lucene.Net.Attributes;
using Lucene.Net.Util;
using NUnit.Framework;
using System;
@@ -254,7 +253,7 @@ namespace Lucene.Net.Analysis.NGram
/// <summary>
/// blast some random strings through the analyzer </summary>
- [Test, LongRunningTest]
+ [Test]
public virtual void TestRandomStrings()
{
for (int i = 0; i < 10; i++)
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/NGram/EdgeNGramTokenizerTest.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/NGram/EdgeNGramTokenizerTest.cs
index da9a717..921091e 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/NGram/EdgeNGramTokenizerTest.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/NGram/EdgeNGramTokenizerTest.cs
@@ -1,5 +1,4 @@
-using Lucene.Net.Attributes;
-using Lucene.Net.Support;
+using Lucene.Net.Support;
using Lucene.Net.Util;
using NUnit.Framework;
using System;
@@ -134,7 +133,8 @@ namespace Lucene.Net.Analysis.NGram
/// <summary>
/// blast some random strings through the analyzer </summary>
- [Test, LongRunningTest]
+ [Test]
+ [Slow]
public virtual void TestRandomStrings()
{
for (int i = 0; i < 10; i++)
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/NGram/NGramTokenFilterTest.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/NGram/NGramTokenFilterTest.cs
index 62bbd35..06d159e 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/NGram/NGramTokenFilterTest.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/NGram/NGramTokenFilterTest.cs
@@ -2,7 +2,6 @@
using Lucene.Net.Analysis.Core;
using Lucene.Net.Analysis.Miscellaneous;
using Lucene.Net.Analysis.TokenAttributes;
-using Lucene.Net.Attributes;
using Lucene.Net.Util;
using NUnit.Framework;
using System;
@@ -154,7 +153,7 @@ namespace Lucene.Net.Analysis.NGram
/// <summary>
/// blast some random strings through the analyzer </summary>
- [Test, LongRunningTest]
+ [Test]
public virtual void TestRandomStrings()
{
for (int i = 0; i < 10; i++)
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/NGram/NGramTokenizerTest.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/NGram/NGramTokenizerTest.cs
index 7d03b83..0277a44 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/NGram/NGramTokenizerTest.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/NGram/NGramTokenizerTest.cs
@@ -1,6 +1,5 @@
using J2N;
using Lucene.Net.Analysis.TokenAttributes;
-using Lucene.Net.Attributes;
using Lucene.Net.Support;
using Lucene.Net.Util;
using NUnit.Framework;
@@ -108,7 +107,8 @@ namespace Lucene.Net.Analysis.NGram
/// <summary>
/// blast some random strings through the analyzer </summary>
- [Test, LongRunningTest]
+ [Test]
+ [Slow]
public virtual void TestRandomStrings()
{
for (int i = 0; i < 10; i++)
@@ -211,6 +211,7 @@ namespace Lucene.Net.Analysis.NGram
}
}
assertTrue(grams.IncrementToken());
+
assertArrayEquals(Arrays.CopyOfRange(codePoints, start, end), toCodePoints(termAtt.ToString()));
assertEquals(1, posIncAtt.PositionIncrement);
assertEquals(1, posLenAtt.PositionLength);
@@ -293,7 +294,7 @@ namespace Lucene.Net.Analysis.NGram
TestNGrams(minGram, maxGram, new string(chrs), " ");
}
- [Test, LongRunningTest]
+ [Test]
public virtual void TestFullUTF8Range()
{
int minGram = TestUtil.NextInt32(Random, 1, 100);
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pattern/TestPatternReplaceCharFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pattern/TestPatternReplaceCharFilter.cs
index 860ebf2..316762f 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pattern/TestPatternReplaceCharFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pattern/TestPatternReplaceCharFilter.cs
@@ -1,5 +1,4 @@
-using Lucene.Net.Attributes;
-using Lucene.Net.Util;
+using Lucene.Net.Util;
using NUnit.Framework;
using System;
using System.IO;
@@ -247,7 +246,8 @@ namespace Lucene.Net.Analysis.Pattern
/// <summary>
/// blast some random strings through the analyzer </summary>
- [Test, LongRunningTest]
+ [Test]
+ [Slow]
public virtual void TestRandomStrings()
{
int numPatterns = 10 + LuceneTestCase.Random.Next(20);
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Shingle/ShingleFilterTest.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Shingle/ShingleFilterTest.cs
index 79cc719..43d6ecb 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Shingle/ShingleFilterTest.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Shingle/ShingleFilterTest.cs
@@ -1,6 +1,5 @@
using Lucene.Net.Analysis.Core;
using Lucene.Net.Analysis.TokenAttributes;
-using Lucene.Net.Attributes;
using NUnit.Framework;
using System;
using System.IO;
@@ -533,7 +532,7 @@ namespace Lucene.Net.Analysis.Shingle
/// <summary>
/// blast some random large strings through the analyzer </summary>
- [Test, LongRunningTest]
+ [Test]
public virtual void TestRandomHugeStrings()
{
Random random = Random;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Snowball/TestSnowball.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Snowball/TestSnowball.cs
index 854a576..cdee01e 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Snowball/TestSnowball.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Snowball/TestSnowball.cs
@@ -193,7 +193,8 @@ namespace Lucene.Net.Analysis.Snowball
}
}
- [Test, LongRunningTest]
+ [Test]
+ [Slow]
public virtual void TestRandomStrings()
{
foreach (string lang in SNOWBALL_LANGS)
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Snowball/TestSnowballVocab.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Snowball/TestSnowballVocab.cs
index fb9bfa3..94c8166 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Snowball/TestSnowballVocab.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Snowball/TestSnowballVocab.cs
@@ -1,5 +1,4 @@
using Lucene.Net.Analysis.Core;
-using Lucene.Net.Attributes;
using Lucene.Net.Util;
using NUnit.Framework;
using System.IO;
@@ -32,7 +31,8 @@ namespace Lucene.Net.Analysis.Snowball
/// <summary>
/// Run all languages against their snowball vocabulary tests.
/// </summary>
- [Test, LongRunningTest]
+ [Test]
+ [Slow]
public virtual void TestStemmers()
{
AssertCorrectOutput("Danish", "danish");
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestRollingCharBuffer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestRollingCharBuffer.cs
index bdcb48a..940d858 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestRollingCharBuffer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestRollingCharBuffer.cs
@@ -1,9 +1,5 @@
-using Lucene.Net.Analysis.Util;
-using Lucene.Net.Attributes;
-using Lucene.Net.Randomized.Generators;
-using Lucene.Net.Util;
+using Lucene.Net.Util;
using NUnit.Framework;
-using System;
using System.IO;
using Console = Lucene.Net.Util.SystemConsole;
@@ -29,7 +25,7 @@ namespace Lucene.Net.Analysis.Util
[TestFixture]
public class TestRollingCharBuffer : LuceneTestCase
{
- [Test, LongRunningTest]
+ [Test]
public virtual void Test()
{
var ITERS = AtLeast(1000);
diff --git a/src/Lucene.Net.Tests.Analysis.ICU/Analysis/Icu/TestICUNormalizer2CharFilter.cs b/src/Lucene.Net.Tests.Analysis.ICU/Analysis/Icu/TestICUNormalizer2CharFilter.cs
index f095483..b72d7ee 100644
--- a/src/Lucene.Net.Tests.Analysis.ICU/Analysis/Icu/TestICUNormalizer2CharFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.ICU/Analysis/Icu/TestICUNormalizer2CharFilter.cs
@@ -199,6 +199,7 @@ namespace Lucene.Net.Analysis.Icu
//@AwaitsFix(bugUrl = "https://issues.apache.org/jira/browse/LUCENE-5595")
[Test]
+ [Slow]
public void TestRandomStrings()
{
// nfkc_cf
diff --git a/src/Lucene.Net.Tests.Analysis.Kuromoji/TestExtendedMode.cs b/src/Lucene.Net.Tests.Analysis.Kuromoji/TestExtendedMode.cs
index f534542..cb94ba3 100644
--- a/src/Lucene.Net.Tests.Analysis.Kuromoji/TestExtendedMode.cs
+++ b/src/Lucene.Net.Tests.Analysis.Kuromoji/TestExtendedMode.cs
@@ -22,6 +22,7 @@ namespace Lucene.Net.Analysis.Ja
* limitations under the License.
*/
+ //[Slow] // LUCENENET specific - not slow in .NET
public class TestExtendedMode : BaseTokenStreamTestCase
{
private readonly Analyzer analyzer = Analyzer.NewAnonymous(createComponents: (fieldName, reader) =>
diff --git a/src/Lucene.Net.Tests.Analysis.Kuromoji/TestJapaneseAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Kuromoji/TestJapaneseAnalyzer.cs
index 0771623..9ddda95 100644
--- a/src/Lucene.Net.Tests.Analysis.Kuromoji/TestJapaneseAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Kuromoji/TestJapaneseAnalyzer.cs
@@ -23,6 +23,7 @@ namespace Lucene.Net.Analysis.Ja
/// <summary>
/// Test Kuromoji Japanese morphological analyzer
/// </summary>
+ //[Slow] // LUCENENET specific - not very slow in .NET
public class TestJapaneseAnalyzer : BaseTokenStreamTestCase
{
/** This test fails with NPE when the
diff --git a/src/Lucene.Net.Tests.Analysis.Kuromoji/TestJapaneseTokenizer.cs b/src/Lucene.Net.Tests.Analysis.Kuromoji/TestJapaneseTokenizer.cs
index cf2351e..28bfb32 100644
--- a/src/Lucene.Net.Tests.Analysis.Kuromoji/TestJapaneseTokenizer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Kuromoji/TestJapaneseTokenizer.cs
@@ -2,7 +2,6 @@
using Lucene.Net.Analysis.Ja.Dict;
using Lucene.Net.Analysis.Ja.TokenAttributes;
using Lucene.Net.Analysis.TokenAttributes;
-using Lucene.Net.Attributes;
using Lucene.Net.Util;
using NUnit.Framework;
using System;
@@ -30,6 +29,7 @@ namespace Lucene.Net.Analysis.Ja
* limitations under the License.
*/
+ [Slow]
public class TestJapaneseTokenizer : BaseTokenStreamTestCase
{
public static UserDictionary ReadDict()
@@ -205,7 +205,8 @@ namespace Lucene.Net.Analysis.Ja
}
/** blast some random large strings through the analyzer */
- [Test, LongRunningTest]
+ [Test]
+ [Slow]
public void TestRandomHugeStrings()
{
Random random = Random;
@@ -705,8 +706,8 @@ namespace Lucene.Net.Analysis.Ja
doTestBocchan(1);
}
- [Test]//@Nightly
- [Ignore("This test takes a long time to run - do it manually")]
+ [Test]
+ [Nightly]
public void TestBocchanBig()
{
doTestBocchan(100);
diff --git a/src/Lucene.Net.Tests.Analysis.Phonetic/Language/Bm/CacheSubSequencePerformanceTest.cs b/src/Lucene.Net.Tests.Analysis.Phonetic/Language/Bm/CacheSubSequencePerformanceTest.cs
index f4f132f..c8b76c6 100644
--- a/src/Lucene.Net.Tests.Analysis.Phonetic/Language/Bm/CacheSubSequencePerformanceTest.cs
+++ b/src/Lucene.Net.Tests.Analysis.Phonetic/Language/Bm/CacheSubSequencePerformanceTest.cs
@@ -1,7 +1,6 @@
using J2N.Text;
-using Lucene.Net.Attributes;
+using Lucene.Net.Util;
using NUnit.Framework;
-using System;
using System.Diagnostics;
using System.Text;
using Console = Lucene.Net.Util.SystemConsole;
@@ -25,9 +24,10 @@ namespace Lucene.Net.Analysis.Phonetic.Language.Bm
* limitations under the License.
*/
- public class CacheSubSequencePerformanceTest
+ public class CacheSubSequencePerformanceTest : LuceneTestCase
{
- [Test, LongRunningTest]
+ [Test]
+ [Slow]
public void Test()
{
int times = 10000000;
diff --git a/src/Lucene.Net.Tests.Analysis.Phonetic/Language/Bm/PhoneticEnginePerformanceTest.cs b/src/Lucene.Net.Tests.Analysis.Phonetic/Language/Bm/PhoneticEnginePerformanceTest.cs
index 95dee54..728d105 100644
--- a/src/Lucene.Net.Tests.Analysis.Phonetic/Language/Bm/PhoneticEnginePerformanceTest.cs
+++ b/src/Lucene.Net.Tests.Analysis.Phonetic/Language/Bm/PhoneticEnginePerformanceTest.cs
@@ -1,7 +1,5 @@
-using J2N;
-using Lucene.Net.Attributes;
+using Lucene.Net.Util;
using NUnit.Framework;
-using System;
using System.Diagnostics;
using Console = Lucene.Net.Util.SystemConsole;
@@ -124,11 +122,12 @@ namespace Lucene.Net.Analysis.Phonetic.Language.Bm
* Patch applied, committed revision 1541234.
* </p>
*/
- public class PhoneticEnginePerformanceTest
+ public class PhoneticEnginePerformanceTest : LuceneTestCase
{
private const int LOOP = 80000;
- [Test, LongRunningTest]
+ [Test]
+ [Slow]
public void Test()
{
PhoneticEngine engine = new PhoneticEngine(NameType.GENERIC, RuleType.APPROX, true);
diff --git a/src/Lucene.Net.Tests.Analysis.Phonetic/TestPhoneticFilter.cs b/src/Lucene.Net.Tests.Analysis.Phonetic/TestPhoneticFilter.cs
index a386d0b..6788f2c 100644
--- a/src/Lucene.Net.Tests.Analysis.Phonetic/TestPhoneticFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Phonetic/TestPhoneticFilter.cs
@@ -1,6 +1,5 @@
using Lucene.Net.Analysis.Core;
using Lucene.Net.Analysis.Phonetic.Language;
-using Lucene.Net.Attributes;
using NUnit.Framework;
using System;
using System.IO;
@@ -74,7 +73,8 @@ namespace Lucene.Net.Analysis.Phonetic
}
/** blast some random strings through the analyzer */
- [Test, LongRunningTest]
+ [Test]
+ [Slow]
public void TestRandomStrings()
{
IStringEncoder[] encoders = new IStringEncoder[] {
diff --git a/src/Lucene.Net.Tests.Analysis.SmartCn/TestSmartChineseAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.SmartCn/TestSmartChineseAnalyzer.cs
index 916cf47..32ea4ea 100644
--- a/src/Lucene.Net.Tests.Analysis.SmartCn/TestSmartChineseAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.SmartCn/TestSmartChineseAnalyzer.cs
@@ -1,6 +1,5 @@
using Lucene.Net.Analysis.Core;
using Lucene.Net.Analysis.Miscellaneous;
-using Lucene.Net.Attributes;
using Lucene.Net.Util;
using NUnit.Framework;
using System;
@@ -331,7 +330,8 @@ namespace Lucene.Net.Analysis.Cn.Smart
}
/** blast some random large strings through the analyzer */
- [Test, LongRunningTest]
+ [Test]
+ [Slow]
public void TestRandomHugeStrings()
{
Random random = Random;
diff --git a/src/Lucene.Net.Tests.Benchmark/ByTask/TestPerfTasksLogic.cs b/src/Lucene.Net.Tests.Benchmark/ByTask/TestPerfTasksLogic.cs
index 1dfbae6..e3dc9d7 100644
--- a/src/Lucene.Net.Tests.Benchmark/ByTask/TestPerfTasksLogic.cs
+++ b/src/Lucene.Net.Tests.Benchmark/ByTask/TestPerfTasksLogic.cs
@@ -1,7 +1,6 @@
using ICU4N.Text;
using Lucene.Net.Analysis;
using Lucene.Net.Analysis.TokenAttributes;
-using Lucene.Net.Attributes;
using Lucene.Net.Benchmarks.ByTask.Feeds;
using Lucene.Net.Benchmarks.ByTask.Stats;
using Lucene.Net.Benchmarks.ByTask.Tasks;
@@ -123,7 +122,7 @@ namespace Lucene.Net.Benchmarks.ByTask
// disabled until we fix BG thread prio -- this test
// causes build to hang
- [Test, LongRunningTest]
+ [Test]
public void TestBGSearchTaskThreads()
{
String[] algLines = {
diff --git a/src/Lucene.Net.Tests.Codecs/Pulsing/Test10KPulsings.cs b/src/Lucene.Net.Tests.Codecs/Pulsing/Test10KPulsings.cs
index 0d980e2..e64a19a 100644
--- a/src/Lucene.Net.Tests.Codecs/Pulsing/Test10KPulsings.cs
+++ b/src/Lucene.Net.Tests.Codecs/Pulsing/Test10KPulsings.cs
@@ -32,10 +32,10 @@ namespace Lucene.Net.Codecs.Pulsing
/// <summary>
/// Pulses 10k terms/docs,
/// originally designed to find JRE bugs (https://issues.apache.org/jira/browse/LUCENE-3335)
- ///
+ /// <para/>
/// @lucene.experimental
/// </summary>
- // LUCENENET TODO: This was marked with the Nightly attribute in Java Lucene
+ [Nightly]
public class Test10KPulsings : LuceneTestCase
{
[Test]
diff --git a/src/Lucene.Net.Tests.Codecs/SimpleText/TestSimpleTextPostingsFormat.cs b/src/Lucene.Net.Tests.Codecs/SimpleText/TestSimpleTextPostingsFormat.cs
index 03cc91d..f6c20dd 100644
--- a/src/Lucene.Net.Tests.Codecs/SimpleText/TestSimpleTextPostingsFormat.cs
+++ b/src/Lucene.Net.Tests.Codecs/SimpleText/TestSimpleTextPostingsFormat.cs
@@ -22,6 +22,7 @@ namespace Lucene.Net.Codecs.SimpleText
/// <summary>
/// Tests SimpleText's postings
/// </summary>
+ [Nightly] // please figure out why I am so horrendously slow!
public class TestSimpleTextPostingsFormat : BasePostingsFormatTestCase // please figure out why I am so horrendously slow!
{
private readonly Codec codec = new SimpleTextCodec();
diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestAddTaxonomy.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestAddTaxonomy.cs
index a7b0ebe..16255a9 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestAddTaxonomy.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestAddTaxonomy.cs
@@ -187,6 +187,7 @@ namespace Lucene.Net.Facet.Taxonomy.Directory
// A more comprehensive and big random test.
[Test]
+ [Slow]
public virtual void TestBig()
{
Dotest(200, 10000);
diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestDirectoryTaxonomyWriter.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestDirectoryTaxonomyWriter.cs
index 3f8600d..5ecc3cc 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestDirectoryTaxonomyWriter.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestDirectoryTaxonomyWriter.cs
@@ -258,6 +258,7 @@ namespace Lucene.Net.Facet.Taxonomy.Directory
}
[Test]
+ [Slow]
public virtual void TestConcurrency()
{
int ncats = AtLeast(100000); // add many categories
diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/TestSearcherTaxonomyManager.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/TestSearcherTaxonomyManager.cs
index 36a93fb..05ff3e5 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/TestSearcherTaxonomyManager.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/TestSearcherTaxonomyManager.cs
@@ -1,6 +1,5 @@
using J2N.Threading;
using J2N.Threading.Atomic;
-using Lucene.Net.Attributes;
using Lucene.Net.Index.Extensions;
using Lucene.Net.Search;
using NUnit.Framework;
@@ -8,9 +7,9 @@ using System;
using System.Collections.Generic;
using System.IO;
using System.Threading;
-using JCG = J2N.Collections.Generic;
using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
+using JCG = J2N.Collections.Generic;
namespace Lucene.Net.Facet.Taxonomy
{
@@ -31,7 +30,6 @@ namespace Lucene.Net.Facet.Taxonomy
* limitations under the License.
*/
- using Directory = Lucene.Net.Store.Directory;
using DirectoryTaxonomyWriter = Lucene.Net.Facet.Taxonomy.Directory.DirectoryTaxonomyWriter;
using Document = Lucene.Net.Documents.Document;
using IndexWriter = Lucene.Net.Index.IndexWriter;
@@ -258,7 +256,8 @@ namespace Lucene.Net.Facet.Taxonomy
}
- [Test, LongRunningTest]
+ [Test]
+ [Slow]
public virtual void TestDirectory()
{
Store.Directory indexDir = NewDirectory();
diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyCombined.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyCombined.cs
index 1057e18..8baeec1 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyCombined.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyCombined.cs
@@ -1,6 +1,5 @@
using J2N.Threading;
using J2N.Threading.Atomic;
-using Lucene.Net.Attributes;
using Lucene.Net.Support;
using NUnit.Framework;
using System;
@@ -755,7 +754,8 @@ namespace Lucene.Net.Facet.Taxonomy
}
// Test that getParentArrays is valid when retrieved during refresh
- [Test, LongRunningTest]
+ [Test]
+ [Slow]
public virtual void TestTaxonomyReaderRefreshRaces()
{
// compute base child arrays - after first chunk, and after the other
diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/WriterCache/TestCharBlockArray.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/WriterCache/TestCharBlockArray.cs
index 511464f..9ab5ae7 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/WriterCache/TestCharBlockArray.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/WriterCache/TestCharBlockArray.cs
@@ -1,5 +1,4 @@
-using Lucene.Net.Attributes;
-using NUnit.Framework;
+using NUnit.Framework;
using System.IO;
using System.Text;
using Assert = Lucene.Net.TestFramework.Assert;
@@ -26,7 +25,8 @@ namespace Lucene.Net.Facet.Taxonomy.WriterCache
[TestFixture]
public class TestCharBlockArray : FacetTestCase
{
- [Test, LongRunningTest]
+ [Test]
+ [Slow]
public virtual void TestArray()
{
CharBlockArray array = new CharBlockArray();
diff --git a/src/Lucene.Net.Tests.Highlighter/PostingsHighlight/TestPostingsHighlighterRanking.cs b/src/Lucene.Net.Tests.Highlighter/PostingsHighlight/TestPostingsHighlighterRanking.cs
index 905ece5..5cbf8af 100644
--- a/src/Lucene.Net.Tests.Highlighter/PostingsHighlight/TestPostingsHighlighterRanking.cs
+++ b/src/Lucene.Net.Tests.Highlighter/PostingsHighlight/TestPostingsHighlighterRanking.cs
@@ -52,6 +52,7 @@ namespace Lucene.Net.Search.PostingsHighlight
/// </summary>
// TODO: this only tests single-valued fields. we should also index multiple values per field!
[Test]
+ [Slow]
public void TestRanking()
{
// number of documents: we will check each one
diff --git a/src/Lucene.Net.Tests.Join/TestJoinUtil.cs b/src/Lucene.Net.Tests.Join/TestJoinUtil.cs
index f67ab77..bb80aff 100644
--- a/src/Lucene.Net.Tests.Join/TestJoinUtil.cs
+++ b/src/Lucene.Net.Tests.Join/TestJoinUtil.cs
@@ -1,5 +1,4 @@
-using System.Diagnostics;
-using Lucene.Net.Analysis;
+using Lucene.Net.Analysis;
using Lucene.Net.Documents;
using Lucene.Net.Index;
using Lucene.Net.Index.Extensions;
@@ -10,8 +9,9 @@ using Lucene.Net.Util;
using NUnit.Framework;
using System;
using System.Collections.Generic;
-using JCG = J2N.Collections.Generic;
+using System.Diagnostics;
using Console = Lucene.Net.Util.SystemConsole;
+using JCG = J2N.Collections.Generic;
namespace Lucene.Net.Tests.Join
{
@@ -31,7 +31,7 @@ namespace Lucene.Net.Tests.Join
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
public class TestJoinUtil : LuceneTestCase
{
[Test]
@@ -386,6 +386,7 @@ namespace Lucene.Net.Tests.Join
}
[Test]
+ [Slow]
public void TestSingleValueRandomJoin()
{
int maxIndexIter = TestUtil.NextInt32(Random, 6, 12);
@@ -394,6 +395,7 @@ namespace Lucene.Net.Tests.Join
}
[Test]
+ // [Slow] // LUCENENET specific - Not slow in .NET
public void TestMultiValueRandomJoin()
// this test really takes more time, that is why the number of iterations are smaller.
{
diff --git a/src/Lucene.Net.Tests.Memory/Index/Memory/MemoryIndexTest.cs b/src/Lucene.Net.Tests.Memory/Index/Memory/MemoryIndexTest.cs
index bc31493..b6a8f42 100644
--- a/src/Lucene.Net.Tests.Memory/Index/Memory/MemoryIndexTest.cs
+++ b/src/Lucene.Net.Tests.Memory/Index/Memory/MemoryIndexTest.cs
@@ -78,7 +78,8 @@ namespace Lucene.Net.Index.Memory
/**
* runs random tests, up to ITERATIONS times.
*/
- [Test]
+ [Test]
+ [Slow]
public void TestRandomQueries()
{
MemoryIndex index = new MemoryIndex(Random.nextBoolean(), Random.nextInt(50) * 1024 * 1024);
diff --git a/src/Lucene.Net.Tests.Replicator/IndexAndTaxonomyReplicationClientTest.cs b/src/Lucene.Net.Tests.Replicator/IndexAndTaxonomyReplicationClientTest.cs
index 7df8c9f..cf043f4 100644
--- a/src/Lucene.Net.Tests.Replicator/IndexAndTaxonomyReplicationClientTest.cs
+++ b/src/Lucene.Net.Tests.Replicator/IndexAndTaxonomyReplicationClientTest.cs
@@ -287,6 +287,7 @@ namespace Lucene.Net.Replicator
// a client copies files from the server to the temporary space, or when the
// handler copies them to the index directory.
[Test]
+ [Slow]
public void TestConsistencyOnExceptions()
{
// so the handler's index isn't empty
diff --git a/src/Lucene.Net.Tests.Suggest/Suggest/Analyzing/AnalyzingInfixSuggesterTest.cs b/src/Lucene.Net.Tests.Suggest/Suggest/Analyzing/AnalyzingInfixSuggesterTest.cs
index f7f96b4..e50d546 100644
--- a/src/Lucene.Net.Tests.Suggest/Suggest/Analyzing/AnalyzingInfixSuggesterTest.cs
+++ b/src/Lucene.Net.Tests.Suggest/Suggest/Analyzing/AnalyzingInfixSuggesterTest.cs
@@ -5,7 +5,6 @@ using Lucene.Net.Analysis;
using Lucene.Net.Analysis.Core;
using Lucene.Net.Analysis.TokenAttributes;
using Lucene.Net.Analysis.Util;
-using Lucene.Net.Attributes;
using Lucene.Net.Util;
using NUnit.Framework;
using System;
@@ -639,7 +638,8 @@ namespace Lucene.Net.Search.Suggest.Analyzing
}
}
- [Test, LongRunningTest]
+ [Test]
+ [Slow]
public void TestRandomNRT()
{
DirectoryInfo tempDir = CreateTempDir("AnalyzingInfixSuggesterTest");
diff --git a/src/Lucene.Net.Tests.Suggest/Suggest/Analyzing/FuzzySuggesterTest.cs b/src/Lucene.Net.Tests.Suggest/Suggest/Analyzing/FuzzySuggesterTest.cs
index f2c9a96..5042412 100644
--- a/src/Lucene.Net.Tests.Suggest/Suggest/Analyzing/FuzzySuggesterTest.cs
+++ b/src/Lucene.Net.Tests.Suggest/Suggest/Analyzing/FuzzySuggesterTest.cs
@@ -3,7 +3,6 @@ using J2N.Collections.Generic.Extensions;
using J2N.Text;
using Lucene.Net.Analysis;
using Lucene.Net.Analysis.TokenAttributes;
-using Lucene.Net.Attributes;
using Lucene.Net.Support;
using Lucene.Net.Util;
using Lucene.Net.Util.Automaton;
@@ -716,7 +715,8 @@ namespace Lucene.Net.Search.Suggest.Analyzing
}
}
- [Test, LongRunningTest]
+ [Test]
+ [Slow]
public void TestRandom()
{
diff --git a/src/Lucene.Net.Tests._E-I/Lucene.Net.Tests._E-I.csproj b/src/Lucene.Net.Tests._E-I/Lucene.Net.Tests._E-I.csproj
index f7a4909..4114f66 100644
--- a/src/Lucene.Net.Tests._E-I/Lucene.Net.Tests._E-I.csproj
+++ b/src/Lucene.Net.Tests._E-I/Lucene.Net.Tests._E-I.csproj
@@ -31,6 +31,7 @@
<ItemGroup>
<Compile Include="..\Lucene.Net.Tests\Index\BinaryTokenStream.cs" />
<Compile Include="..\Lucene.Net.Tests\Index\Test2*.cs" LinkBase="Index" />
+ <Compile Include="..\Lucene.Net.Tests\Index\Test4*.cs" LinkBase="Index" />
<Compile Include="..\Lucene.Net.Tests\Index\TestA*.cs" LinkBase="Index" />
<Compile Include="..\Lucene.Net.Tests\Index\TestB*.cs" LinkBase="Index" />
<Compile Include="..\Lucene.Net.Tests\Index\TestC*.cs" LinkBase="Index" />
diff --git a/src/Lucene.Net.Tests/Analysis/TestGraphTokenizers.cs b/src/Lucene.Net.Tests/Analysis/TestGraphTokenizers.cs
index a6c1aeb..58dbad8 100644
--- a/src/Lucene.Net.Tests/Analysis/TestGraphTokenizers.cs
+++ b/src/Lucene.Net.Tests/Analysis/TestGraphTokenizers.cs
@@ -1,6 +1,5 @@
using J2N.Text;
using Lucene.Net.Analysis.TokenAttributes;
-using Lucene.Net.Attributes;
using NUnit.Framework;
using System;
using System.Collections.Generic;
@@ -331,7 +330,7 @@ namespace Lucene.Net.Analysis
}
}
- [Test, LongRunningTest]
+ [Test]
public virtual void TestMockGraphTokenFilterRandom()
{
for (int iter = 0; iter < 10 * RANDOM_MULTIPLIER; iter++)
@@ -356,7 +355,7 @@ namespace Lucene.Net.Analysis
}
// Two MockGraphTokenFilters
- [Test, LongRunningTest]
+ [Test]
public virtual void TestDoubleMockGraphTokenFilterRandom()
{
for (int iter = 0; iter < 10 * RANDOM_MULTIPLIER; iter++)
@@ -389,7 +388,7 @@ namespace Lucene.Net.Analysis
}
- [Test, LongRunningTest]
+ [Test]
public virtual void TestMockGraphTokenFilterBeforeHolesRandom()
{
for (int iter = 0; iter < 10 * RANDOM_MULTIPLIER; iter++)
@@ -414,7 +413,7 @@ namespace Lucene.Net.Analysis
}
}
- [Test, LongRunningTest]
+ [Test]
public virtual void TestMockGraphTokenFilterAfterHolesRandom()
{
for (int iter = 0; iter < 10 * RANDOM_MULTIPLIER; iter++)
diff --git a/src/Lucene.Net.Tests/Analysis/TestLookaheadTokenFilter.cs b/src/Lucene.Net.Tests/Analysis/TestLookaheadTokenFilter.cs
index 236ef4f..3f53380 100644
--- a/src/Lucene.Net.Tests/Analysis/TestLookaheadTokenFilter.cs
+++ b/src/Lucene.Net.Tests/Analysis/TestLookaheadTokenFilter.cs
@@ -1,4 +1,3 @@
-using Lucene.Net.Attributes;
using NUnit.Framework;
using System;
@@ -24,7 +23,8 @@ namespace Lucene.Net.Analysis
[TestFixture]
public class TestLookaheadTokenFilter : BaseTokenStreamTestCase
{
- [Test, LongRunningTest]
+ [Test]
+ [Slow]
public virtual void TestRandomStrings()
{
Analyzer a = Analyzer.NewAnonymous(createComponents: (fieldName, reader) =>
@@ -55,7 +55,8 @@ namespace Lucene.Net.Analysis
}
}
- [Test, LongRunningTest]
+ [Test]
+ [Slow]
public virtual void TestNeverCallingPeek()
{
Analyzer a = Analyzer.NewAnonymous(createComponents: (fieldName, reader) =>
diff --git a/src/Lucene.Net.Tests/Analysis/TestMockAnalyzer.cs b/src/Lucene.Net.Tests/Analysis/TestMockAnalyzer.cs
index 516de97..7291ce0 100644
--- a/src/Lucene.Net.Tests/Analysis/TestMockAnalyzer.cs
+++ b/src/Lucene.Net.Tests/Analysis/TestMockAnalyzer.cs
@@ -1,4 +1,3 @@
-using Lucene.Net.Attributes;
using Lucene.Net.Documents;
using Lucene.Net.Index;
using NUnit.Framework;
@@ -215,7 +214,8 @@ namespace Lucene.Net.Analysis
/// <summary>
/// blast some random strings through differently configured tokenizers </summary>
- [Test, LongRunningTest]
+ [Test]
+ [Slow]
public virtual void TestRandomRegexps()
{
int iters = AtLeast(30);
diff --git a/src/Lucene.Net.Tests/Codecs/Lucene41/TestBlockPostingsFormat3.cs b/src/Lucene.Net.Tests/Codecs/Lucene41/TestBlockPostingsFormat3.cs
index d72107a..a1478fd 100644
--- a/src/Lucene.Net.Tests/Codecs/Lucene41/TestBlockPostingsFormat3.cs
+++ b/src/Lucene.Net.Tests/Codecs/Lucene41/TestBlockPostingsFormat3.cs
@@ -1,6 +1,5 @@
using J2N.Collections.Generic.Extensions;
using Lucene.Net.Analysis;
-using Lucene.Net.Attributes;
using Lucene.Net.Documents;
using Lucene.Net.Index;
using Lucene.Net.Index.Extensions;
@@ -74,7 +73,8 @@ namespace Lucene.Net.Codecs.Lucene41
internal static readonly int MAXDOC = Lucene41PostingsFormat.BLOCK_SIZE * 20;
// creates 8 fields with different options and does "duels" of fields against each other
- [Test, LongRunningTest]
+ [Test]
+ [Slow]
public virtual void Test()
{
Directory dir = NewDirectory();
diff --git a/src/Lucene.Net.Tests/Index/Test2BPostings.cs b/src/Lucene.Net.Tests/Index/Test2BPostings.cs
index f54ace7..c58e9a5 100644
--- a/src/Lucene.Net.Tests/Index/Test2BPostings.cs
+++ b/src/Lucene.Net.Tests/Index/Test2BPostings.cs
@@ -43,8 +43,8 @@ namespace Lucene.Net.Index
[TestFixture]
public class Test2BPostings : LuceneTestCase
{
- [Ignore("Very slow. Enable manually by removing Ignore.")]
[Test]
+ [Nightly]
public virtual void Test([ValueSource(typeof(ConcurrentMergeSchedulerFactories), "Values")]Func<IConcurrentMergeScheduler> newScheduler)
{
BaseDirectoryWrapper dir = NewFSDirectory(CreateTempDir("2BPostings"));
diff --git a/src/Lucene.Net.Tests/Index/Test4GBStoredFields.cs b/src/Lucene.Net.Tests/Index/Test4GBStoredFields.cs
index 74c0390..7b09f1c 100644
--- a/src/Lucene.Net.Tests/Index/Test4GBStoredFields.cs
+++ b/src/Lucene.Net.Tests/Index/Test4GBStoredFields.cs
@@ -1,9 +1,9 @@
-using System;
using Lucene.Net.Documents;
using Lucene.Net.Index.Extensions;
using Lucene.Net.Randomized.Generators;
using Lucene.Net.Store;
using NUnit.Framework;
+using System;
using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
@@ -43,8 +43,8 @@ namespace Lucene.Net.Index
[TestFixture]
public class Test4GBStoredFields : LuceneTestCase
{
- [Ignore("//LUCENENET NOTE: This was marked Nightly in Java")]
[Test]
+ [Nightly]
public virtual void Test([ValueSource(typeof(ConcurrentMergeSchedulerFactories), "Values")]Func<IConcurrentMergeScheduler> newScheduler)
{
MockDirectoryWrapper dir = new MockDirectoryWrapper(Random, new MMapDirectory(CreateTempDir("4GBStoredFields")));
diff --git a/src/Lucene.Net.Tests/Index/TestAddIndexes.cs b/src/Lucene.Net.Tests/Index/TestAddIndexes.cs
index 7d090b6..475b621 100644
--- a/src/Lucene.Net.Tests/Index/TestAddIndexes.cs
+++ b/src/Lucene.Net.Tests/Index/TestAddIndexes.cs
@@ -985,6 +985,7 @@ namespace Lucene.Net.Index
// LUCENE-1335: test simultaneous addIndexes & close
[Test]
+ [Slow]
public virtual void TestAddIndexesWithCloseNoWait()
{
const int NUM_COPY = 50;
diff --git a/src/Lucene.Net.Tests/Index/TestAtomicUpdate.cs b/src/Lucene.Net.Tests/Index/TestAtomicUpdate.cs
index c609b38..f1eae0b 100644
--- a/src/Lucene.Net.Tests/Index/TestAtomicUpdate.cs
+++ b/src/Lucene.Net.Tests/Index/TestAtomicUpdate.cs
@@ -196,6 +196,7 @@ namespace Lucene.Net.Index
*/
[Test]
+ [Slow]
public virtual void TestAtomicUpdates()
{
Directory directory;
diff --git a/src/Lucene.Net.Tests/Index/TestBackwardsCompatibility.cs b/src/Lucene.Net.Tests/Index/TestBackwardsCompatibility.cs
index ed5ae3c..9845166 100644
--- a/src/Lucene.Net.Tests/Index/TestBackwardsCompatibility.cs
+++ b/src/Lucene.Net.Tests/Index/TestBackwardsCompatibility.cs
@@ -1,5 +1,4 @@
using J2N;
-using Lucene.Net.Attributes;
using Lucene.Net.Index.Extensions;
using NUnit.Framework;
using System;
@@ -946,7 +945,8 @@ namespace Lucene.Net.Index
}
}
- [Test, LongRunningTest]
+ [Test]
+ [Slow]
public virtual void TestCommandLineArgs()
{
diff --git a/src/Lucene.Net.Tests/Index/TestBagOfPositions.cs b/src/Lucene.Net.Tests/Index/TestBagOfPositions.cs
index ba255dc..d1d350a 100644
--- a/src/Lucene.Net.Tests/Index/TestBagOfPositions.cs
+++ b/src/Lucene.Net.Tests/Index/TestBagOfPositions.cs
@@ -51,6 +51,7 @@ namespace Lucene.Net.Index
{
[Test]
+ [Slow]
public virtual void Test()
{
IList<string> postingsList = new List<string>();
diff --git a/src/Lucene.Net.Tests/Index/TestBinaryDocValuesUpdates.cs b/src/Lucene.Net.Tests/Index/TestBinaryDocValuesUpdates.cs
index e556aab..a38cdd8 100644
--- a/src/Lucene.Net.Tests/Index/TestBinaryDocValuesUpdates.cs
+++ b/src/Lucene.Net.Tests/Index/TestBinaryDocValuesUpdates.cs
@@ -1627,7 +1627,8 @@ namespace Lucene.Net.Index
dir.Dispose();
}
- [Test, LongRunningTest]
+ [Test]
+ [Slow]
public virtual void TestTonsOfUpdates()
{
// LUCENE-5248: make sure that when there are many updates, we don't use too much RAM
diff --git a/src/Lucene.Net.Tests/Index/TestDocumentsWriterDeleteQueue.cs b/src/Lucene.Net.Tests/Index/TestDocumentsWriterDeleteQueue.cs
index a5cf881..2a3235c 100644
--- a/src/Lucene.Net.Tests/Index/TestDocumentsWriterDeleteQueue.cs
+++ b/src/Lucene.Net.Tests/Index/TestDocumentsWriterDeleteQueue.cs
@@ -249,6 +249,7 @@ namespace Lucene.Net.Index
}
[Test]
+ [Slow]
public virtual void TestStressDeleteQueue()
{
DocumentsWriterDeleteQueue queue = new DocumentsWriterDeleteQueue();
diff --git a/src/Lucene.Net.Tests/Index/TestFlushByRamOrCountsPolicy.cs b/src/Lucene.Net.Tests/Index/TestFlushByRamOrCountsPolicy.cs
index 46c4e09..9af7f58 100644
--- a/src/Lucene.Net.Tests/Index/TestFlushByRamOrCountsPolicy.cs
+++ b/src/Lucene.Net.Tests/Index/TestFlushByRamOrCountsPolicy.cs
@@ -243,6 +243,7 @@ namespace Lucene.Net.Index
}
[Test]
+ [Slow] // LUCENENET: occasionally
public virtual void TestStallControl()
{
diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriter.cs b/src/Lucene.Net.Tests/Index/TestIndexWriter.cs
index 54ba833..3a83581 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexWriter.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexWriter.cs
@@ -2,7 +2,6 @@ using J2N.Text;
using J2N.Threading;
using Lucene.Net.Analysis;
using Lucene.Net.Analysis.TokenAttributes;
-using Lucene.Net.Attributes;
using Lucene.Net.Codecs;
using Lucene.Net.Codecs.SimpleText;
using Lucene.Net.Documents;
@@ -1436,7 +1435,8 @@ namespace Lucene.Net.Index
}
}
- [Test, LongRunningTest]
+ [Test]
+ [Slow]
public virtual void TestThreadInterruptDeadlock()
{
IndexerThreadInterrupt t = new IndexerThreadInterrupt(this);
@@ -1475,7 +1475,8 @@ namespace Lucene.Net.Index
/// <summary>
/// testThreadInterruptDeadlock but with 2 indexer threads </summary>
- [Test, LongRunningTest]
+ [Test]
+ [Slow]
public virtual void TestTwoThreadsInterruptDeadlock()
{
IndexerThreadInterrupt t1 = new IndexerThreadInterrupt(this);
diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterDelete.cs b/src/Lucene.Net.Tests/Index/TestIndexWriterDelete.cs
index 5868b8e..8400265 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexWriterDelete.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexWriterDelete.cs
@@ -2,7 +2,6 @@ using J2N.Collections.Generic.Extensions;
using J2N.Threading;
using J2N.Threading.Atomic;
using Lucene.Net.Analysis;
-using Lucene.Net.Attributes;
using Lucene.Net.Documents;
using Lucene.Net.Index.Extensions;
using Lucene.Net.Store;
@@ -1304,7 +1303,8 @@ namespace Lucene.Net.Index
// Make sure buffered (pushed) deletes don't use up so
// much RAM that it forces long tail of tiny segments:
- [Test, LongRunningTest]
+ [Test]
+ [Nightly]
public virtual void TestApplyDeletesOnFlush()
{
Directory dir = NewDirectory();
diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterExceptions.cs b/src/Lucene.Net.Tests/Index/TestIndexWriterExceptions.cs
index 59a6516..06480d9 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexWriterExceptions.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexWriterExceptions.cs
@@ -375,6 +375,7 @@ namespace Lucene.Net.Index
}
[Test]
+ [Slow]
public virtual void TestRandomExceptionsThreads([ValueSource(typeof(ConcurrentMergeSchedulerFactories), "Values")]Func<IConcurrentMergeScheduler> newScheduler)
{
Directory dir = NewDirectory();
@@ -2152,9 +2153,6 @@ namespace Lucene.Net.Index
// full), and then the exception stops (e.g., disk frees
// up), so we successfully close IW or open an NRT
// reader, we don't lose any deletes or updates:
-#if NETSTANDARD1_6
- [LongRunningTest]
-#endif
[Test]
public virtual void TestNoLostDeletesOrUpdates()
{
@@ -2542,7 +2540,7 @@ namespace Lucene.Net.Index
}
#if NETSTANDARD1_6
- [LongRunningTest]
+ [Slow]
#endif
[Test]
public virtual void TestRandomExceptionDuringRollback()
diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterMerging.cs b/src/Lucene.Net.Tests/Index/TestIndexWriterMerging.cs
index 3445db4..a6402e0 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexWriterMerging.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexWriterMerging.cs
@@ -1,5 +1,4 @@
using J2N.Threading;
-using Lucene.Net.Attributes;
using Lucene.Net.Documents;
using Lucene.Net.Index.Extensions;
using NUnit.Framework;
@@ -236,7 +235,8 @@ namespace Lucene.Net.Index
// LUCENE-325: test forceMergeDeletes without waiting, when
// many adjacent merges are required
- [Test, LongRunningTest]
+ [Test]
+ [Slow]
public virtual void TestForceMergeDeletes3()
{
Directory dir = NewDirectory();
@@ -351,7 +351,8 @@ namespace Lucene.Net.Index
dir.Dispose();
}
- [Test, LongRunningTest]
+ [Test]
+ [Slow]
public virtual void TestNoWaitClose()
{
Directory directory = NewDirectory();
diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterReader.cs b/src/Lucene.Net.Tests/Index/TestIndexWriterReader.cs
index ec9575b..1cc0f95 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexWriterReader.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexWriterReader.cs
@@ -1,6 +1,5 @@
using J2N.Threading;
using J2N.Threading.Atomic;
-using Lucene.Net.Attributes;
using Lucene.Net.Documents;
using Lucene.Net.Index.Extensions;
using Lucene.Net.Store;
@@ -424,7 +423,8 @@ namespace Lucene.Net.Index
dir1.Dispose();
}
- [Test, LongRunningTest]
+ [Test]
+ [Slow]
public virtual void TestAddIndexesAndDoDeletesThreads()
{
const int numIter = 2;
@@ -752,6 +752,7 @@ namespace Lucene.Net.Index
}
[Test]
+ [Slow]
public virtual void TestMergeWarmer([ValueSource(typeof(ConcurrentMergeSchedulerFactories), "Values")]Func<IConcurrentMergeScheduler> newScheduler)
{
Directory dir1 = GetAssertNoDeletesDirectory(NewDirectory());
@@ -992,6 +993,7 @@ namespace Lucene.Net.Index
// Stress test reopen during add/delete
[Test]
+ [Slow]
public virtual void TestDuringAddDelete()
{
Directory dir1 = NewDirectory();
@@ -1423,6 +1425,7 @@ namespace Lucene.Net.Index
/// writer, we don't see merge starvation.
/// </summary>
[Test]
+ [Slow]
public virtual void TestTooManySegments()
{
Directory dir = GetAssertNoDeletesDirectory(NewDirectory());
diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterUnicode.cs b/src/Lucene.Net.Tests/Index/TestIndexWriterUnicode.cs
index cee1149..000cc1e 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexWriterUnicode.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexWriterUnicode.cs
@@ -1,5 +1,4 @@
using J2N.Text;
-using Lucene.Net.Attributes;
using Lucene.Net.Documents;
using Lucene.Net.Util;
using NUnit.Framework;
@@ -186,7 +185,7 @@ namespace Lucene.Net.Index
}
// LUCENE-510
- [Test, LongRunningTest]
+ [Test]
public virtual void TestRandomUnicodeStrings()
{
char[] buffer = new char[20];
@@ -223,7 +222,7 @@ namespace Lucene.Net.Index
}
// LUCENE-510
- [Test, LongRunningTest]
+ [Test]
public virtual void TestAllUnicodeChars()
{
BytesRef utf8 = new BytesRef(10);
diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterWithThreads.cs b/src/Lucene.Net.Tests/Index/TestIndexWriterWithThreads.cs
index e4cfbf1..77b1bc1 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexWriterWithThreads.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexWriterWithThreads.cs
@@ -52,6 +52,7 @@ namespace Lucene.Net.Index
/// MultiThreaded IndexWriter tests
/// </summary>
[SuppressCodecs("Lucene3x")]
+ [Slow]
[TestFixture]
public class TestIndexWriterWithThreads : LuceneTestCase
{
diff --git a/src/Lucene.Net.Tests/Index/TestIntBlockPool.cs b/src/Lucene.Net.Tests/Index/TestIntBlockPool.cs
index 68c0e0f..b631280 100644
--- a/src/Lucene.Net.Tests/Index/TestIntBlockPool.cs
+++ b/src/Lucene.Net.Tests/Index/TestIntBlockPool.cs
@@ -1,4 +1,3 @@
-using Lucene.Net.Attributes;
using NUnit.Framework;
using System.Collections.Generic;
using Assert = Lucene.Net.TestFramework.Assert;
@@ -70,7 +69,7 @@ namespace Lucene.Net.Index
}
}
- [Test, LongRunningTest]
+ [Test]
public virtual void TestMultipleWriterReader()
{
Counter bytesUsed = Util.Counter.NewCounter();
diff --git a/src/Lucene.Net.Tests/Index/TestMixedDocValuesUpdates.cs b/src/Lucene.Net.Tests/Index/TestMixedDocValuesUpdates.cs
index 4bff645..e6e5d59 100644
--- a/src/Lucene.Net.Tests/Index/TestMixedDocValuesUpdates.cs
+++ b/src/Lucene.Net.Tests/Index/TestMixedDocValuesUpdates.cs
@@ -1,6 +1,5 @@
using J2N.Threading;
using J2N.Threading.Atomic;
-using Lucene.Net.Attributes;
using Lucene.Net.Documents;
using Lucene.Net.Index.Extensions;
using Lucene.Net.Randomized.Generators;
@@ -495,7 +494,8 @@ namespace Lucene.Net.Index
dir.Dispose();
}
- [Test, LongRunningTest]
+ [Test]
+ [Slow]
public virtual void TestTonsOfUpdates()
{
// LUCENE-5248: make sure that when there are many updates, we don't use too much RAM
diff --git a/src/Lucene.Net.Tests/Index/TestNRTReaderWithThreads.cs b/src/Lucene.Net.Tests/Index/TestNRTReaderWithThreads.cs
index 2e955a0..ad30cee 100644
--- a/src/Lucene.Net.Tests/Index/TestNRTReaderWithThreads.cs
+++ b/src/Lucene.Net.Tests/Index/TestNRTReaderWithThreads.cs
@@ -1,8 +1,7 @@
using J2N.Threading;
using J2N.Threading.Atomic;
-using NUnit.Framework;
-using Lucene.Net.Attributes;
using Lucene.Net.Index.Extensions;
+using NUnit.Framework;
using System;
using System.Threading;
using Console = Lucene.Net.Util.SystemConsole;
@@ -37,7 +36,8 @@ namespace Lucene.Net.Index
{
private readonly AtomicInt32 seq = new AtomicInt32(1);
- [Test, LongRunningTest]
+ [Test]
+ [Slow] // (occasionally)
public virtual void TestIndexing()
{
Directory mainDir = NewDirectory();
diff --git a/src/Lucene.Net.Tests/Index/TestNRTThreads.cs b/src/Lucene.Net.Tests/Index/TestNRTThreads.cs
index 417d2c5..6e219d2 100644
--- a/src/Lucene.Net.Tests/Index/TestNRTThreads.cs
+++ b/src/Lucene.Net.Tests/Index/TestNRTThreads.cs
@@ -171,6 +171,7 @@ namespace Lucene.Net.Index
}
[Test]
+ [Slow] // (occasionally)
public virtual void TestNRTThreads_Mem()
{
RunTest("TestNRTThreads");
diff --git a/src/Lucene.Net.Tests/Index/TestNorms.cs b/src/Lucene.Net.Tests/Index/TestNorms.cs
index 0b029c3..da38b0b 100644
--- a/src/Lucene.Net.Tests/Index/TestNorms.cs
+++ b/src/Lucene.Net.Tests/Index/TestNorms.cs
@@ -44,6 +44,7 @@ namespace Lucene.Net.Index
/// separate norms, addDocument, addIndexes, forceMerge.
/// </summary>
[SuppressCodecs("Memory", "Direct", "SimpleText")]
+ //[Slow] // LUCENENET specific - not slow in .NET
[TestFixture]
public class TestNorms : LuceneTestCase
{
diff --git a/src/Lucene.Net.Tests/Index/TestNumericDocValuesUpdates.cs b/src/Lucene.Net.Tests/Index/TestNumericDocValuesUpdates.cs
index 8759404..7c51371 100644
--- a/src/Lucene.Net.Tests/Index/TestNumericDocValuesUpdates.cs
+++ b/src/Lucene.Net.Tests/Index/TestNumericDocValuesUpdates.cs
@@ -1,6 +1,5 @@
using J2N.Threading;
using J2N.Threading.Atomic;
-using Lucene.Net.Attributes;
using Lucene.Net.Documents;
using Lucene.Net.Index.Extensions;
using Lucene.Net.Randomized.Generators;
@@ -1539,7 +1538,8 @@ namespace Lucene.Net.Index
dir.Dispose();
}
- [Test, LongRunningTest]
+ [Test]
+ [Slow]
public virtual void TestTonsOfUpdates()
{
// LUCENE-5248: make sure that when there are many updates, we don't use too much RAM
diff --git a/src/Lucene.Net.Tests/Index/TestStressIndexing.cs b/src/Lucene.Net.Tests/Index/TestStressIndexing.cs
index 1b4d94b..c14a702 100644
--- a/src/Lucene.Net.Tests/Index/TestStressIndexing.cs
+++ b/src/Lucene.Net.Tests/Index/TestStressIndexing.cs
@@ -225,6 +225,7 @@ namespace Lucene.Net.Index
*/
[Test]
+ [Slow]
public virtual void TestStressIndexAndSearching([ValueSource(typeof(ConcurrentMergeSchedulerFactories), "Values")]Func<IConcurrentMergeScheduler> newScheduler)
{
Directory directory = NewDirectory();
diff --git a/src/Lucene.Net.Tests/Index/TestStressNRT.cs b/src/Lucene.Net.Tests/Index/TestStressNRT.cs
index 11083d2..09933d6 100644
--- a/src/Lucene.Net.Tests/Index/TestStressNRT.cs
+++ b/src/Lucene.Net.Tests/Index/TestStressNRT.cs
@@ -1,6 +1,5 @@
using J2N.Threading;
using J2N.Threading.Atomic;
-using Lucene.Net.Attributes;
using Lucene.Net.Documents;
using Lucene.Net.Support;
using NUnit.Framework;
@@ -71,7 +70,7 @@ namespace Lucene.Net.Index
committedModel.PutAll(model);
}
- [Test, LongRunningTest]
+ [Test]
public virtual void Test()
{
// update variables
diff --git a/src/Lucene.Net.Tests/Index/TestTermdocPerf.cs b/src/Lucene.Net.Tests/Index/TestTermdocPerf.cs
index 52beba9..4062e77 100644
--- a/src/Lucene.Net.Tests/Index/TestTermdocPerf.cs
+++ b/src/Lucene.Net.Tests/Index/TestTermdocPerf.cs
@@ -1,6 +1,5 @@
using Lucene.Net.Analysis;
using Lucene.Net.Analysis.TokenAttributes;
-using Lucene.Net.Attributes;
using Lucene.Net.Documents;
using Lucene.Net.Index.Extensions;
using NUnit.Framework;
@@ -29,7 +28,6 @@ namespace Lucene.Net.Index
using Analyzer = Lucene.Net.Analysis.Analyzer;
using BytesRef = Lucene.Net.Util.BytesRef;
- using CharTermAttribute = Lucene.Net.Analysis.TokenAttributes.CharTermAttribute;
using Directory = Lucene.Net.Store.Directory;
using DocIdSetIterator = Lucene.Net.Search.DocIdSetIterator;
using Document = Documents.Document;
@@ -165,7 +163,8 @@ namespace Lucene.Net.Index
return ret;
}
- [Test, LongRunningTest]
+ [Test]
+ [Slow]
public virtual void TestTermDocPerf()
{
// performance test for 10% of documents containing a term
diff --git a/src/Lucene.Net.Tests/Search/TestControlledRealTimeReopenThread.cs b/src/Lucene.Net.Tests/Search/TestControlledRealTimeReopenThread.cs
index 1869946..7d3e647 100644
--- a/src/Lucene.Net.Tests/Search/TestControlledRealTimeReopenThread.cs
+++ b/src/Lucene.Net.Tests/Search/TestControlledRealTimeReopenThread.cs
@@ -75,6 +75,7 @@ namespace Lucene.Net.Search
private bool warmCalled;
[Test]
+ [Slow]
public virtual void TestControlledRealTimeReopenThread_Mem()
{
RunTest("TestControlledRealTimeReopenThread");
diff --git a/src/Lucene.Net.Tests/Search/TestSearchAfter.cs b/src/Lucene.Net.Tests/Search/TestSearchAfter.cs
index 4d2781f..caea463 100644
--- a/src/Lucene.Net.Tests/Search/TestSearchAfter.cs
+++ b/src/Lucene.Net.Tests/Search/TestSearchAfter.cs
@@ -1,4 +1,3 @@
-using Lucene.Net.Attributes;
using Lucene.Net.Documents;
using Lucene.Net.Util;
using NUnit.Framework;
@@ -235,7 +234,8 @@ namespace Lucene.Net.Search
base.TearDown();
}
- [Test, LongRunningTest]
+ [Test]
+ [Slow]
public virtual void TestQueries()
{
// LUCENENET specific: NUnit will crash with an OOM if we do the full test
diff --git a/src/Lucene.Net.Tests/Search/TestSearcherManager.cs b/src/Lucene.Net.Tests/Search/TestSearcherManager.cs
index 5b12d14..219c032 100644
--- a/src/Lucene.Net.Tests/Search/TestSearcherManager.cs
+++ b/src/Lucene.Net.Tests/Search/TestSearcherManager.cs
@@ -50,6 +50,7 @@ namespace Lucene.Net.Search
private SearcherLifetimeManager.IPruner pruner;
[Test]
+ [Slow]
public virtual void TestSearcherManager_Mem()
{
pruner = new SearcherLifetimeManager.PruneByAge(TEST_NIGHTLY ? TestUtil.NextInt32(Random, 1, 20) : 1);
diff --git a/src/Lucene.Net.Tests/Store/TestCopyBytes.cs b/src/Lucene.Net.Tests/Store/TestCopyBytes.cs
index 85c9b66..176d31a 100644
--- a/src/Lucene.Net.Tests/Store/TestCopyBytes.cs
+++ b/src/Lucene.Net.Tests/Store/TestCopyBytes.cs
@@ -1,5 +1,4 @@
using J2N.Threading;
-using Lucene.Net.Attributes;
using NUnit.Framework;
using System;
using System.IO;
@@ -36,7 +35,7 @@ namespace Lucene.Net.Store
return unchecked((byte)((idx % 256) * (1 + (idx / 256))));
}
- [Test, LongRunningTest]
+ [Test]
public virtual void TestCopyBytesMem()
{
int num = AtLeast(10);
diff --git a/src/Lucene.Net.Tests/Store/TestDirectory.cs b/src/Lucene.Net.Tests/Store/TestDirectory.cs
index d400352..c8bc7f7 100644
--- a/src/Lucene.Net.Tests/Store/TestDirectory.cs
+++ b/src/Lucene.Net.Tests/Store/TestDirectory.cs
@@ -59,7 +59,9 @@ namespace Lucene.Net.Store
// test is occasionally very slow, i dont know why
// try this seed: 7D7E036AD12927F5:93333EF9E6DE44DE
- [Test, LongRunningTest]
+ [Test]
+ [Slow]
+ //[Nightly] // This was marked Nightly in Java, but we are not seeing very bad performance, so leaving it in the normal flow
public virtual void TestThreadSafety()
{
BaseDirectoryWrapper dir = NewDirectory();
@@ -426,7 +428,8 @@ namespace Lucene.Net.Store
}
}
- [Test, LongRunningTest]
+ [Test]
+ [Slow]
[LuceneNetSpecific]
public virtual void ConcurrentIndexAccessThrowsWithoutSynchronizedStaleFiles()
{
diff --git a/src/Lucene.Net.Tests/Store/TestHugeRamFile.cs b/src/Lucene.Net.Tests/Store/TestHugeRamFile.cs
index 2aeae16..2f98dc5 100644
--- a/src/Lucene.Net.Tests/Store/TestHugeRamFile.cs
+++ b/src/Lucene.Net.Tests/Store/TestHugeRamFile.cs
@@ -1,4 +1,3 @@
-using Lucene.Net.Attributes;
using NUnit.Framework;
using System;
using System.Collections.Generic;
@@ -64,7 +63,8 @@ namespace Lucene.Net.Store
/// <summary>
/// Test huge RAMFile with more than Integer.MAX_VALUE bytes. (LUCENE-957) </summary>
- [Test, LongRunningTest]
+ [Test]
+ [Slow]
public virtual void TestHugeFile()
{
var f = new DenseRAMFile();
diff --git a/src/Lucene.Net.Tests/Store/TestLockFactory.cs b/src/Lucene.Net.Tests/Store/TestLockFactory.cs
index b1f6289..b8018b6 100644
--- a/src/Lucene.Net.Tests/Store/TestLockFactory.cs
+++ b/src/Lucene.Net.Tests/Store/TestLockFactory.cs
@@ -1,5 +1,4 @@
using J2N.Threading;
-using Lucene.Net.Attributes;
using Lucene.Net.Documents;
using Lucene.Net.Index.Extensions;
using NUnit.Framework;
@@ -153,7 +152,8 @@ namespace Lucene.Net.Store
// Verify: do stress test, by opening IndexReaders and
// IndexWriters over & over in 2 threads and making sure
// no unexpected exceptions are raised:
- [Test, LongRunningTest]
+ [Test]
+ [Nightly]
public virtual void TestStressLocks()
{
_testStressLocks(null, CreateTempDir("index.TestLockFactory6"));
@@ -163,7 +163,8 @@ namespace Lucene.Net.Store
// IndexWriters over & over in 2 threads and making sure
// no unexpected exceptions are raised, but use
// NativeFSLockFactory:
- [Test, LongRunningTest]
+ [Test]
+ [Nightly]
public virtual void TestStressLocksNativeFSLockFactory()
{
DirectoryInfo dir = CreateTempDir("index.TestLockFactory7");
@@ -198,7 +199,7 @@ namespace Lucene.Net.Store
}
// Verify: NativeFSLockFactory works correctly
- [Test, LongRunningTest]
+ [Test]
public virtual void TestNativeFSLockFactory()
{
var f = new NativeFSLockFactory(CreateTempDir("testNativeFsLockFactory"));
diff --git a/src/Lucene.Net.Tests/Support/TestWeakDictionary.cs b/src/Lucene.Net.Tests/Support/TestWeakDictionary.cs
index edd24a3..8a42a6d 100644
--- a/src/Lucene.Net.Tests/Support/TestWeakDictionary.cs
+++ b/src/Lucene.Net.Tests/Support/TestWeakDictionary.cs
@@ -85,7 +85,8 @@ namespace Lucene.Net.Support
}
}
- [Test, LongRunningTest, LuceneNetSpecific]
+ [Test, LuceneNetSpecific]
+ [Slow]
public void B_TestOutOfMemory()
{
var wht = TestWeakDictionaryBehavior.CreateDictionary();
@@ -121,7 +122,8 @@ namespace Lucene.Net.Support
return System.Diagnostics.Process.GetCurrentProcess().WorkingSet64 / 1024;
}
- [Test, LongRunningTest, LuceneNetSpecific]
+ [Test, LuceneNetSpecific]
+ [Slow]
public void C_TestMemLeakage()
{
diff --git a/src/Lucene.Net.Tests/Support/TestWeakDictionaryBehavior.cs b/src/Lucene.Net.Tests/Support/TestWeakDictionaryBehavior.cs
index 586bd08..e1cc76d 100644
--- a/src/Lucene.Net.Tests/Support/TestWeakDictionaryBehavior.cs
+++ b/src/Lucene.Net.Tests/Support/TestWeakDictionaryBehavior.cs
@@ -257,7 +257,8 @@ namespace Lucene.Net.Support
Assert.IsNotNull(key2);
}
- [Test, LongRunningTest, LuceneNetSpecific]
+ [Test, LuceneNetSpecific]
+ [Slow]
public void Test_Weak_ForEach()
{
BigObject[] keys1 = new BigObject[20];
diff --git a/src/Lucene.Net.Tests/Util/Fst/TestBytesStore.cs b/src/Lucene.Net.Tests/Util/Fst/TestBytesStore.cs
index 9e7d0bd..b77a21c 100644
--- a/src/Lucene.Net.Tests/Util/Fst/TestBytesStore.cs
+++ b/src/Lucene.Net.Tests/Util/Fst/TestBytesStore.cs
@@ -1,4 +1,3 @@
-using Lucene.Net.Attributes;
using Lucene.Net.Support;
using NUnit.Framework;
using System;
@@ -33,7 +32,8 @@ namespace Lucene.Net.Util.Fst
public class TestBytesStore : LuceneTestCase
{
- [Test, LongRunningTest]
+ [Test]
+ [Slow]
public virtual void TestRandom()
{
diff --git a/src/Lucene.Net.Tests/Util/Fst/TestFSTs.cs b/src/Lucene.Net.Tests/Util/Fst/TestFSTs.cs
index 6dba077..08f3b86 100644
--- a/src/Lucene.Net.Tests/Util/Fst/TestFSTs.cs
+++ b/src/Lucene.Net.Tests/Util/Fst/TestFSTs.cs
@@ -1,6 +1,5 @@
using J2N.Collections.Generic.Extensions;
using J2N.Threading.Atomic;
-using Lucene.Net.Attributes;
using Lucene.Net.Index.Extensions;
using Lucene.Net.Support;
using Lucene.Net.Util.Automaton;
@@ -64,6 +63,7 @@ namespace Lucene.Net.Util.Fst
using TermsEnum = Lucene.Net.Index.TermsEnum;
[SuppressCodecs("SimpleText", "Memory", "Direct")]
+ [Slow]
[TestFixture]
public class TestFSTs : LuceneTestCase
{
@@ -267,7 +267,8 @@ namespace Lucene.Net.Util.Fst
}
- [Test, LongRunningTest] // Can take up to 15 minutes
+ [Test]
+ [Slow]
public virtual void TestRandomWords()
{
// LUCENENET specific: NUnit will crash with an OOM if we do the full test
@@ -319,7 +320,7 @@ namespace Lucene.Net.Util.Fst
}
[Test]
- [Ignore("This test will take around 10-14 hours to finish. It was marked with a Nightly attribute in the original Java source, but we don't currently have a corresponding attribute")]
+ [Nightly]
public virtual void TestBigSet()
{
TestRandomWords(TestUtil.NextInt32(Random, 50000, 60000), 1, false);
diff --git a/src/Lucene.Net.Tests/Util/Packed/TestEliasFanoSequence.cs b/src/Lucene.Net.Tests/Util/Packed/TestEliasFanoSequence.cs
index 278c4cd..e207049 100644
--- a/src/Lucene.Net.Tests/Util/Packed/TestEliasFanoSequence.cs
+++ b/src/Lucene.Net.Tests/Util/Packed/TestEliasFanoSequence.cs
@@ -305,7 +305,7 @@ namespace Lucene.Net.Util.Packed
}
}
- [Test, LongRunningTest, LuceneNetSpecific, Ignore("For debugging only")]
+ [Test, Slow, LuceneNetSpecific, Ignore("For debugging only")]
public virtual void TestMonotoneSequencesLonger()
{
for (int s = 2; s < 4422; s++)
@@ -334,7 +334,7 @@ namespace Lucene.Net.Util.Packed
}
}
- [Test, LongRunningTest, LuceneNetSpecific, Ignore("For debugging only")]
+ [Test, Slow, LuceneNetSpecific, Ignore("For debugging only")]
public virtual void TestStrictMonotoneSequencesLonger()
{
for (int s = 2; s < 4422; s++)
@@ -364,7 +364,7 @@ namespace Lucene.Net.Util.Packed
TstEFS(values, expHighBits, expLowBits);
}
- [Test, LongRunningTest]
+ [Test]
public virtual void TestAdvanceToAndBackToMultiples()
{
for (int s = 2; s < 130; s++)
diff --git a/src/Lucene.Net.Tests/Util/Packed/TestPackedInts.cs b/src/Lucene.Net.Tests/Util/Packed/TestPackedInts.cs
index 11bad17..6950255 100644
--- a/src/Lucene.Net.Tests/Util/Packed/TestPackedInts.cs
+++ b/src/Lucene.Net.Tests/Util/Packed/TestPackedInts.cs
@@ -1,5 +1,4 @@
using J2N.IO;
-using Lucene.Net.Attributes;
using Lucene.Net.Randomized.Generators;
using Lucene.Net.Support;
using NUnit.Framework;
@@ -1125,7 +1124,8 @@ namespace Lucene.Net.Util.Packed
}
- [Test, LongRunningTest]
+ [Test]
+ [Slow]
public virtual void TestAppendingLongBuffer()
{
@@ -1482,7 +1482,8 @@ namespace Lucene.Net.Util.Packed
}
}
- [Test, LongRunningTest]
+ [Test]
+ [Nightly]
public virtual void TestBlockReaderOverflow()
{
long valueCount = TestUtil.NextInt64(Random, 1L + int.MaxValue, (long)int.MaxValue * 2);
diff --git a/src/Lucene.Net.Tests/Util/StressRamUsageEstimator.cs b/src/Lucene.Net.Tests/Util/StressRamUsageEstimator.cs
index 69f183d..82c9bb9 100644
--- a/src/Lucene.Net.Tests/Util/StressRamUsageEstimator.cs
+++ b/src/Lucene.Net.Tests/Util/StressRamUsageEstimator.cs
@@ -1,4 +1,3 @@
-using Lucene.Net.Attributes;
using Lucene.Net.Support;
using NUnit.Framework;
using System;
@@ -121,7 +120,8 @@ namespace Lucene.Net.Util
return s;
}
- [Test, LongRunningTest]
+ [Test]
+ [Slow]
public virtual void TestSimpleByteArrays()
{
object[][] all = new object[0][];
diff --git a/src/Lucene.Net.Tests/Util/TestBroadWord.cs b/src/Lucene.Net.Tests/Util/TestBroadWord.cs
index 28cda94..fd90200 100644
--- a/src/Lucene.Net.Tests/Util/TestBroadWord.cs
+++ b/src/Lucene.Net.Tests/Util/TestBroadWord.cs
@@ -1,5 +1,4 @@
using J2N.Numerics;
-using Lucene.Net.Attributes;
using NUnit.Framework;
using Assert = Lucene.Net.TestFramework.Assert;
@@ -106,7 +105,7 @@ namespace Lucene.Net.Util
}
}
- [Test, LongRunningTest]
+ [Test]
public virtual void TestPerfSelectAllBitsBroad()
{
for (int j = 0; j < 100000; j++) // 1000000 for real perf test
diff --git a/src/Lucene.Net.Tests/Util/TestFixedBitSet.cs b/src/Lucene.Net.Tests/Util/TestFixedBitSet.cs
index 5ff90a0..244c162 100644
--- a/src/Lucene.Net.Tests/Util/TestFixedBitSet.cs
+++ b/src/Lucene.Net.Tests/Util/TestFixedBitSet.cs
@@ -258,7 +258,7 @@ namespace Lucene.Net.Util
// large enough to flush obvious bugs, small enough to run in <.5 sec as part of a
// larger testsuite.
- [Test, LongRunningTest]
+ [Test]
public virtual void TestSmall()
{
DoRandomSets(AtLeast(1200), AtLeast(1000), 1);
diff --git a/src/Lucene.Net.Tests/Util/TestLongBitSet.cs b/src/Lucene.Net.Tests/Util/TestLongBitSet.cs
index 2ae21ae..aab8996 100644
--- a/src/Lucene.Net.Tests/Util/TestLongBitSet.cs
+++ b/src/Lucene.Net.Tests/Util/TestLongBitSet.cs
@@ -204,7 +204,7 @@ namespace Lucene.Net.Util
// large enough to flush obvious bugs, small enough to run in <.5 sec as part of a
// larger testsuite.
- [Test, LongRunningTest]
+ [Test]
public virtual void TestSmall()
{
DoRandomSets(AtLeast(1200), AtLeast(1000), 1);
diff --git a/src/Lucene.Net.Tests/Util/TestNumericUtils.cs b/src/Lucene.Net.Tests/Util/TestNumericUtils.cs
index 0898118..9b1554e 100644
--- a/src/Lucene.Net.Tests/Util/TestNumericUtils.cs
+++ b/src/Lucene.Net.Tests/Util/TestNumericUtils.cs
@@ -1,5 +1,4 @@
using J2N.Text;
-using Lucene.Net.Attributes;
using Lucene.Net.Support;
using NUnit.Framework;
using System;
@@ -360,7 +359,9 @@ namespace Lucene.Net.Util
AssertLongRangeSplit(long.MinValue, long.MinValue + 0xfL, 4, true, new long[] { 0x000000000000000L, 0x000000000000000L }, new int[] { 4 });
AssertLongRangeSplit(long.MinValue, long.MinValue + 0x10L, 4, true, new long[] { 0x0000000000000010L, 0x0000000000000010L, 0x000000000000000L, 0x000000000000000L }, new int[] { 0, 4 });
}
- [Test, LongRunningTest]
+
+ [Test]
+ [Slow]
public virtual void TestRandomSplit()
{
long num = (long)AtLeast(10);
diff --git a/src/Lucene.Net.Tests/Util/TestOfflineSorter.cs b/src/Lucene.Net.Tests/Util/TestOfflineSorter.cs
index c8aacf8..1730132 100644
--- a/src/Lucene.Net.Tests/Util/TestOfflineSorter.cs
+++ b/src/Lucene.Net.Tests/Util/TestOfflineSorter.cs
@@ -1,5 +1,4 @@
using J2N.Text;
-using Lucene.Net.Attributes;
using NUnit.Framework;
using System;
using System.Collections.Generic;
@@ -78,7 +77,7 @@ namespace Lucene.Net.Util
#pragma warning restore 612, 618
}
- [Test, LongRunningTest]
+ [Test]
public virtual void TestIntermediateMerges()
{
// Sort 20 mb worth of data with 1mb buffer, binary merging.
@@ -86,7 +85,7 @@ namespace Lucene.Net.Util
Assert.IsTrue(info.MergeRounds > 10);
}
- [Test, LongRunningTest]
+ [Test]
public virtual void TestSmallRandom()
{
// Sort 20 mb worth of data with 1mb buffer.
@@ -94,7 +93,8 @@ namespace Lucene.Net.Util
Assert.AreEqual(1, sortInfo.MergeRounds);
}
- [Test, LongRunningTest, Explicit] // LUCENENET specific - This was marked Nightly in Java, so we are marking explicit to keep this from running automatically
+ [Test]
+ [Nightly]
public virtual void TestLargerRandom()
{
// Sort 100MB worth of data with 15mb buffer.
diff --git a/src/Lucene.Net.Tests/Util/TestOpenBitSet.cs b/src/Lucene.Net.Tests/Util/TestOpenBitSet.cs
index 5e854c8..0d4b9cc 100644
--- a/src/Lucene.Net.Tests/Util/TestOpenBitSet.cs
+++ b/src/Lucene.Net.Tests/Util/TestOpenBitSet.cs
@@ -316,7 +316,7 @@ namespace Lucene.Net.Util
// large enough to flush obvious bugs, small enough to run in <.5 sec as part of a
// larger testsuite.
- [Test, LongRunningTest]
+ [Test]
public virtual void TestSmall()
{
DoRandomSets(AtLeast(1200), AtLeast(1000), 1);
diff --git a/src/Lucene.Net.Tests/Util/TestPagedBytes.cs b/src/Lucene.Net.Tests/Util/TestPagedBytes.cs
index 08c1311..dfe1752 100644
--- a/src/Lucene.Net.Tests/Util/TestPagedBytes.cs
+++ b/src/Lucene.Net.Tests/Util/TestPagedBytes.cs
@@ -1,4 +1,3 @@
-using Lucene.Net.Attributes;
using Lucene.Net.Store;
using Lucene.Net.Support;
using NUnit.Framework;
@@ -38,7 +37,7 @@ namespace Lucene.Net.Util
// Writes random byte/s to "normal" file in dir, then
// copies into PagedBytes and verifies with
// PagedBytes.Reader:
- [Test, LongRunningTest]
+ [Test]
public virtual void TestDataInputOutput()
{
Random random = Random;
@@ -115,7 +114,8 @@ namespace Lucene.Net.Util
// Writes random byte/s into PagedBytes via
// .getDataOutput(), then verifies with
// PagedBytes.getDataInput():
- [Test, LongRunningTest]
+ [Test]
+ [Slow]
public virtual void TestDataInputOutput2()
{
Random random = Random;
@@ -180,7 +180,8 @@ namespace Lucene.Net.Util
}
[Ignore("// memory hole")]
- [Test, LongRunningTest]
+ [Test]
+ [Slow]
public virtual void TestOverflow()
{
BaseDirectoryWrapper dir = NewFSDirectory(CreateTempDir("testOverflow"));
diff --git a/src/Lucene.Net.Tests/Util/TestWeakIdentityMap.cs b/src/Lucene.Net.Tests/Util/TestWeakIdentityMap.cs
index d98ec11..06bd66e 100644
--- a/src/Lucene.Net.Tests/Util/TestWeakIdentityMap.cs
+++ b/src/Lucene.Net.Tests/Util/TestWeakIdentityMap.cs
@@ -35,7 +35,7 @@
// public class TestWeakIdentityMap : LuceneTestCase
// {
-// [Test, LongRunningTest]
+// [Test, Slow]
// public virtual void TestSimpleHashMap()
// {
// WeakIdentityMap<string, string> map = WeakIdentityMap<string, string>.NewHashMap(Random.NextBoolean());
@@ -200,7 +200,7 @@
// Assert.IsTrue(map.IsEmpty);
// }
-// [Test, LongRunningTest]
+// [Test, Slow]
// public virtual void TestConcurrentHashMap()
// {
// // don't make threadCount and keyCount random, otherwise easily OOMs or fails otherwise:
[lucenenet] 02/14: Removed unused dependencies for .NET Framework
Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nightowl888 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucenenet.git
commit d79d2738c66c7fba773f47ed29985deb6fe946b7
Author: Shad Storhaug <sh...@shadstorhaug.com>
AuthorDate: Sun Jul 12 05:44:16 2020 +0700
Removed unused dependencies for .NET Framework
---
src/Lucene.Net.Analysis.Common/Lucene.Net.Analysis.Common.csproj | 2 --
src/Lucene.Net.Analysis.Kuromoji/Lucene.Net.Analysis.Kuromoji.csproj | 5 -----
.../Lucene.Net.Analysis.Morfologik.csproj | 5 -----
src/Lucene.Net.Analysis.OpenNLP/Lucene.Net.Analysis.OpenNLP.csproj | 5 -----
src/Lucene.Net.Analysis.Phonetic/Lucene.Net.Analysis.Phonetic.csproj | 5 -----
src/Lucene.Net.Analysis.SmartCn/Lucene.Net.Analysis.SmartCn.csproj | 5 -----
src/Lucene.Net.Analysis.Stempel/Lucene.Net.Analysis.Stempel.csproj | 5 -----
src/Lucene.Net.Benchmark/Lucene.Net.Benchmark.csproj | 2 --
src/Lucene.Net.Classification/Lucene.Net.Classification.csproj | 5 -----
src/Lucene.Net.Codecs/Lucene.Net.Codecs.csproj | 2 --
src/Lucene.Net.Demo/Lucene.Net.Demo.csproj | 5 -----
src/Lucene.Net.Expressions/Lucene.Net.Expressions.csproj | 5 -----
src/Lucene.Net.Facet/Lucene.Net.Facet.csproj | 5 -----
src/Lucene.Net.Grouping/Lucene.Net.Grouping.csproj | 5 -----
src/Lucene.Net.Highlighter/Lucene.Net.Highlighter.csproj | 5 -----
src/Lucene.Net.Join/Lucene.Net.Join.csproj | 5 -----
src/Lucene.Net.Memory/Lucene.Net.Memory.csproj | 5 -----
src/Lucene.Net.Misc/Lucene.Net.Misc.csproj | 5 -----
src/Lucene.Net.Queries/Lucene.Net.Queries.csproj | 5 -----
src/Lucene.Net.QueryParser/Lucene.Net.QueryParser.csproj | 2 --
src/Lucene.Net.Replicator/Lucene.Net.Replicator.csproj | 2 --
src/Lucene.Net.Sandbox/Lucene.Net.Sandbox.csproj | 5 -----
src/Lucene.Net.Spatial/Lucene.Net.Spatial.csproj | 5 -----
src/Lucene.Net.Suggest/Lucene.Net.Suggest.csproj | 5 -----
src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj | 2 --
.../Lucene.Net.Tests.TestFramework.csproj | 2 --
src/Lucene.Net/Lucene.Net.csproj | 5 -----
src/dotnet/Lucene.Net.ICU/Lucene.Net.ICU.csproj | 5 -----
.../Lucene.Net.Replicator.AspNetCore.csproj | 5 -----
29 files changed, 124 deletions(-)
diff --git a/src/Lucene.Net.Analysis.Common/Lucene.Net.Analysis.Common.csproj b/src/Lucene.Net.Analysis.Common/Lucene.Net.Analysis.Common.csproj
index cac744a..2eb6dbb 100644
--- a/src/Lucene.Net.Analysis.Common/Lucene.Net.Analysis.Common.csproj
+++ b/src/Lucene.Net.Analysis.Common/Lucene.Net.Analysis.Common.csproj
@@ -45,8 +45,6 @@
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
<Reference Include="System.Xml" />
- <Reference Include="System" />
- <Reference Include="Microsoft.CSharp" />
</ItemGroup>
<ItemGroup>
diff --git a/src/Lucene.Net.Analysis.Kuromoji/Lucene.Net.Analysis.Kuromoji.csproj b/src/Lucene.Net.Analysis.Kuromoji/Lucene.Net.Analysis.Kuromoji.csproj
index 2dda32e..4733cbd 100644
--- a/src/Lucene.Net.Analysis.Kuromoji/Lucene.Net.Analysis.Kuromoji.csproj
+++ b/src/Lucene.Net.Analysis.Kuromoji/Lucene.Net.Analysis.Kuromoji.csproj
@@ -55,11 +55,6 @@
<PackageReference Include="System.Text.Encoding.CodePages" Version="$(SystemTextEncodingCodePagesPackageVersion)" />
</ItemGroup>
- <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
- <Reference Include="System" />
- <Reference Include="Microsoft.CSharp" />
- </ItemGroup>
-
<ItemGroup>
<InternalsVisibleTo Include="Lucene.Net.Tests.Analysis.Kuromoji" />
</ItemGroup>
diff --git a/src/Lucene.Net.Analysis.Morfologik/Lucene.Net.Analysis.Morfologik.csproj b/src/Lucene.Net.Analysis.Morfologik/Lucene.Net.Analysis.Morfologik.csproj
index c01237d..0e8d860 100644
--- a/src/Lucene.Net.Analysis.Morfologik/Lucene.Net.Analysis.Morfologik.csproj
+++ b/src/Lucene.Net.Analysis.Morfologik/Lucene.Net.Analysis.Morfologik.csproj
@@ -72,9 +72,4 @@
<ProjectReference Include="..\Lucene.Net\Lucene.Net.csproj" />
</ItemGroup>
- <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
- <Reference Include="System" />
- <Reference Include="Microsoft.CSharp" />
- </ItemGroup>
-
</Project>
diff --git a/src/Lucene.Net.Analysis.OpenNLP/Lucene.Net.Analysis.OpenNLP.csproj b/src/Lucene.Net.Analysis.OpenNLP/Lucene.Net.Analysis.OpenNLP.csproj
index 6e79a5e..40546e2 100644
--- a/src/Lucene.Net.Analysis.OpenNLP/Lucene.Net.Analysis.OpenNLP.csproj
+++ b/src/Lucene.Net.Analysis.OpenNLP/Lucene.Net.Analysis.OpenNLP.csproj
@@ -51,9 +51,4 @@
<PackageReference Include="OpenNLP.NET" Version="$(OpenNLPNETPackageVersion)" />
</ItemGroup>
- <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
- <Reference Include="System" />
- <Reference Include="Microsoft.CSharp" />
- </ItemGroup>
-
</Project>
diff --git a/src/Lucene.Net.Analysis.Phonetic/Lucene.Net.Analysis.Phonetic.csproj b/src/Lucene.Net.Analysis.Phonetic/Lucene.Net.Analysis.Phonetic.csproj
index 1723e62..dc3ec07 100644
--- a/src/Lucene.Net.Analysis.Phonetic/Lucene.Net.Analysis.Phonetic.csproj
+++ b/src/Lucene.Net.Analysis.Phonetic/Lucene.Net.Analysis.Phonetic.csproj
@@ -44,11 +44,6 @@
<ProjectReference Include="..\Lucene.Net.Analysis.Common\Lucene.Net.Analysis.Common.csproj" />
</ItemGroup>
- <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
- <Reference Include="System" />
- <Reference Include="Microsoft.CSharp" />
- </ItemGroup>
-
<ItemGroup>
<InternalsVisibleTo Include="Lucene.Net.Tests.Analysis.Phonetic" />
</ItemGroup>
diff --git a/src/Lucene.Net.Analysis.SmartCn/Lucene.Net.Analysis.SmartCn.csproj b/src/Lucene.Net.Analysis.SmartCn/Lucene.Net.Analysis.SmartCn.csproj
index e35710a..c21700c 100644
--- a/src/Lucene.Net.Analysis.SmartCn/Lucene.Net.Analysis.SmartCn.csproj
+++ b/src/Lucene.Net.Analysis.SmartCn/Lucene.Net.Analysis.SmartCn.csproj
@@ -60,9 +60,4 @@
<PackageReference Include="System.Text.Encoding.CodePages" Version="$(SystemTextEncodingCodePagesPackageVersion)" />
</ItemGroup>
- <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
- <Reference Include="System" />
- <Reference Include="Microsoft.CSharp" />
- </ItemGroup>
-
</Project>
diff --git a/src/Lucene.Net.Analysis.Stempel/Lucene.Net.Analysis.Stempel.csproj b/src/Lucene.Net.Analysis.Stempel/Lucene.Net.Analysis.Stempel.csproj
index 5becf0a..ece92b9 100644
--- a/src/Lucene.Net.Analysis.Stempel/Lucene.Net.Analysis.Stempel.csproj
+++ b/src/Lucene.Net.Analysis.Stempel/Lucene.Net.Analysis.Stempel.csproj
@@ -46,11 +46,6 @@
<PackageReference Include="J2N" Version="$(J2NPackageVersion)" />
</ItemGroup>
- <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
- <Reference Include="System" />
- <Reference Include="Microsoft.CSharp" />
- </ItemGroup>
-
<ItemGroup>
<InternalsVisibleTo Include="Lucene.Net.Tests.Analysis.Stempel" />
</ItemGroup>
diff --git a/src/Lucene.Net.Benchmark/Lucene.Net.Benchmark.csproj b/src/Lucene.Net.Benchmark/Lucene.Net.Benchmark.csproj
index 6e8264e..d836730 100644
--- a/src/Lucene.Net.Benchmark/Lucene.Net.Benchmark.csproj
+++ b/src/Lucene.Net.Benchmark/Lucene.Net.Benchmark.csproj
@@ -61,8 +61,6 @@
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
<PackageReference Include="SharpZipLib" Version="$(SharpZipLibPackageVersion)" />
- <Reference Include="System" />
- <Reference Include="Microsoft.CSharp" />
</ItemGroup>
<ItemGroup>
diff --git a/src/Lucene.Net.Classification/Lucene.Net.Classification.csproj b/src/Lucene.Net.Classification/Lucene.Net.Classification.csproj
index 664c039..ae9125f 100644
--- a/src/Lucene.Net.Classification/Lucene.Net.Classification.csproj
+++ b/src/Lucene.Net.Classification/Lucene.Net.Classification.csproj
@@ -39,9 +39,4 @@
<ProjectReference Include="..\Lucene.Net.Queries\Lucene.Net.Queries.csproj" />
</ItemGroup>
- <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
- <Reference Include="System" />
- <Reference Include="Microsoft.CSharp" />
- </ItemGroup>
-
</Project>
diff --git a/src/Lucene.Net.Codecs/Lucene.Net.Codecs.csproj b/src/Lucene.Net.Codecs/Lucene.Net.Codecs.csproj
index 0f43eab..ff19d8d 100644
--- a/src/Lucene.Net.Codecs/Lucene.Net.Codecs.csproj
+++ b/src/Lucene.Net.Codecs/Lucene.Net.Codecs.csproj
@@ -40,8 +40,6 @@
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
<Reference Include="System.Numerics" />
- <Reference Include="System" />
- <Reference Include="Microsoft.CSharp" />
</ItemGroup>
</Project>
diff --git a/src/Lucene.Net.Demo/Lucene.Net.Demo.csproj b/src/Lucene.Net.Demo/Lucene.Net.Demo.csproj
index 422c34c..bf9e078 100644
--- a/src/Lucene.Net.Demo/Lucene.Net.Demo.csproj
+++ b/src/Lucene.Net.Demo/Lucene.Net.Demo.csproj
@@ -42,11 +42,6 @@
<ProjectReference Include="..\Lucene.Net.QueryParser\Lucene.Net.QueryParser.csproj" />
</ItemGroup>
- <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
- <Reference Include="System" />
- <Reference Include="Microsoft.CSharp" />
- </ItemGroup>
-
<ItemGroup>
<InternalsVisibleTo Include="Lucene.Net.Tests.Demo" />
</ItemGroup>
diff --git a/src/Lucene.Net.Expressions/Lucene.Net.Expressions.csproj b/src/Lucene.Net.Expressions/Lucene.Net.Expressions.csproj
index a66e8b2..853e8b2 100644
--- a/src/Lucene.Net.Expressions/Lucene.Net.Expressions.csproj
+++ b/src/Lucene.Net.Expressions/Lucene.Net.Expressions.csproj
@@ -63,11 +63,6 @@
<EmbeddedResource Include="JS\JavascriptCompiler.properties" />
</ItemGroup>
- <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
- <Reference Include="System" />
- <Reference Include="Microsoft.CSharp" />
- </ItemGroup>
-
<ItemGroup>
<Compile Update="Properties\Settings.Designer.cs">
<DesignTimeSharedInput>True</DesignTimeSharedInput>
diff --git a/src/Lucene.Net.Facet/Lucene.Net.Facet.csproj b/src/Lucene.Net.Facet/Lucene.Net.Facet.csproj
index 046805f..6dcc9a1 100644
--- a/src/Lucene.Net.Facet/Lucene.Net.Facet.csproj
+++ b/src/Lucene.Net.Facet/Lucene.Net.Facet.csproj
@@ -39,11 +39,6 @@
<ProjectReference Include="..\Lucene.Net.Queries\Lucene.Net.Queries.csproj" />
</ItemGroup>
- <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
- <Reference Include="System" />
- <Reference Include="Microsoft.CSharp" />
- </ItemGroup>
-
<ItemGroup>
<InternalsVisibleTo Include="Lucene.Net.Tests.Facet" />
</ItemGroup>
diff --git a/src/Lucene.Net.Grouping/Lucene.Net.Grouping.csproj b/src/Lucene.Net.Grouping/Lucene.Net.Grouping.csproj
index 819fa90..137013a 100644
--- a/src/Lucene.Net.Grouping/Lucene.Net.Grouping.csproj
+++ b/src/Lucene.Net.Grouping/Lucene.Net.Grouping.csproj
@@ -39,9 +39,4 @@
<ProjectReference Include="..\Lucene.Net.Queries\Lucene.Net.Queries.csproj" />
</ItemGroup>
- <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
- <Reference Include="System" />
- <Reference Include="Microsoft.CSharp" />
- </ItemGroup>
-
</Project>
diff --git a/src/Lucene.Net.Highlighter/Lucene.Net.Highlighter.csproj b/src/Lucene.Net.Highlighter/Lucene.Net.Highlighter.csproj
index bea8cc4..fa9c435 100644
--- a/src/Lucene.Net.Highlighter/Lucene.Net.Highlighter.csproj
+++ b/src/Lucene.Net.Highlighter/Lucene.Net.Highlighter.csproj
@@ -39,11 +39,6 @@
<ProjectReference Include="..\Lucene.Net.Queries\Lucene.Net.Queries.csproj" />
</ItemGroup>
- <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
- <Reference Include="System" />
- <Reference Include="Microsoft.CSharp" />
- </ItemGroup>
-
<ItemGroup>
<InternalsVisibleTo Include="Lucene.Net.ICU" />
<InternalsVisibleTo Include="Lucene.Net.Tests.Highlighter" />
diff --git a/src/Lucene.Net.Join/Lucene.Net.Join.csproj b/src/Lucene.Net.Join/Lucene.Net.Join.csproj
index bf6e0ea..7f5f9fe 100644
--- a/src/Lucene.Net.Join/Lucene.Net.Join.csproj
+++ b/src/Lucene.Net.Join/Lucene.Net.Join.csproj
@@ -38,11 +38,6 @@
<ProjectReference Include="..\Lucene.Net.Grouping\Lucene.Net.Grouping.csproj" />
</ItemGroup>
- <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
- <Reference Include="System" />
- <Reference Include="Microsoft.CSharp" />
- </ItemGroup>
-
<ItemGroup>
<InternalsVisibleTo Include="Lucene.Net.Tests.Join" />
</ItemGroup>
diff --git a/src/Lucene.Net.Memory/Lucene.Net.Memory.csproj b/src/Lucene.Net.Memory/Lucene.Net.Memory.csproj
index 43f28d9..3139df0 100644
--- a/src/Lucene.Net.Memory/Lucene.Net.Memory.csproj
+++ b/src/Lucene.Net.Memory/Lucene.Net.Memory.csproj
@@ -38,11 +38,6 @@
<ProjectReference Include="..\Lucene.Net\Lucene.Net.csproj" />
</ItemGroup>
- <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
- <Reference Include="System" />
- <Reference Include="Microsoft.CSharp" />
- </ItemGroup>
-
<ItemGroup>
<InternalsVisibleTo Include="Lucene.Net.Tests.Memory" />
</ItemGroup>
diff --git a/src/Lucene.Net.Misc/Lucene.Net.Misc.csproj b/src/Lucene.Net.Misc/Lucene.Net.Misc.csproj
index 2251589..57ee091 100644
--- a/src/Lucene.Net.Misc/Lucene.Net.Misc.csproj
+++ b/src/Lucene.Net.Misc/Lucene.Net.Misc.csproj
@@ -42,11 +42,6 @@
<ProjectReference Include="..\Lucene.Net\Lucene.Net.csproj" />
</ItemGroup>
- <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
- <Reference Include="System" />
- <Reference Include="Microsoft.CSharp" />
- </ItemGroup>
-
<ItemGroup>
<InternalsVisibleTo Include="Lucene.Net.Tests.Misc" />
</ItemGroup>
diff --git a/src/Lucene.Net.Queries/Lucene.Net.Queries.csproj b/src/Lucene.Net.Queries/Lucene.Net.Queries.csproj
index 623be50..9e8179a 100644
--- a/src/Lucene.Net.Queries/Lucene.Net.Queries.csproj
+++ b/src/Lucene.Net.Queries/Lucene.Net.Queries.csproj
@@ -38,9 +38,4 @@
<ProjectReference Include="..\Lucene.Net\Lucene.Net.csproj" />
</ItemGroup>
- <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
- <Reference Include="System" />
- <Reference Include="Microsoft.CSharp" />
- </ItemGroup>
-
</Project>
diff --git a/src/Lucene.Net.QueryParser/Lucene.Net.QueryParser.csproj b/src/Lucene.Net.QueryParser/Lucene.Net.QueryParser.csproj
index 42201b5..df15788 100644
--- a/src/Lucene.Net.QueryParser/Lucene.Net.QueryParser.csproj
+++ b/src/Lucene.Net.QueryParser/Lucene.Net.QueryParser.csproj
@@ -42,8 +42,6 @@
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
<Reference Include="System.Xml" />
- <Reference Include="System" />
- <Reference Include="Microsoft.CSharp" />
</ItemGroup>
<ItemGroup>
diff --git a/src/Lucene.Net.Replicator/Lucene.Net.Replicator.csproj b/src/Lucene.Net.Replicator/Lucene.Net.Replicator.csproj
index 3e69e87..a39aca9 100644
--- a/src/Lucene.Net.Replicator/Lucene.Net.Replicator.csproj
+++ b/src/Lucene.Net.Replicator/Lucene.Net.Replicator.csproj
@@ -46,8 +46,6 @@
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
<Reference Include="System.Net.Http" />
- <Reference Include="System" />
- <Reference Include="Microsoft.CSharp" />
</ItemGroup>
</Project>
diff --git a/src/Lucene.Net.Sandbox/Lucene.Net.Sandbox.csproj b/src/Lucene.Net.Sandbox/Lucene.Net.Sandbox.csproj
index 8b9ba13..8f7fc93 100644
--- a/src/Lucene.Net.Sandbox/Lucene.Net.Sandbox.csproj
+++ b/src/Lucene.Net.Sandbox/Lucene.Net.Sandbox.csproj
@@ -38,9 +38,4 @@
<ProjectReference Include="..\Lucene.Net\Lucene.Net.csproj" />
</ItemGroup>
- <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
- <Reference Include="System" />
- <Reference Include="Microsoft.CSharp" />
- </ItemGroup>
-
</Project>
diff --git a/src/Lucene.Net.Spatial/Lucene.Net.Spatial.csproj b/src/Lucene.Net.Spatial/Lucene.Net.Spatial.csproj
index a0871d7..1ab1a90 100644
--- a/src/Lucene.Net.Spatial/Lucene.Net.Spatial.csproj
+++ b/src/Lucene.Net.Spatial/Lucene.Net.Spatial.csproj
@@ -39,11 +39,6 @@
<ProjectReference Include="..\Lucene.Net.Queries\Lucene.Net.Queries.csproj" />
</ItemGroup>
- <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
- <Reference Include="System" />
- <Reference Include="Microsoft.CSharp" />
- </ItemGroup>
-
<ItemGroup>
<PackageReference Include="Spatial4n.Core" Version="$(Spatial4nCorePackageVersion)" />
</ItemGroup>
diff --git a/src/Lucene.Net.Suggest/Lucene.Net.Suggest.csproj b/src/Lucene.Net.Suggest/Lucene.Net.Suggest.csproj
index 3784cec..466f960 100644
--- a/src/Lucene.Net.Suggest/Lucene.Net.Suggest.csproj
+++ b/src/Lucene.Net.Suggest/Lucene.Net.Suggest.csproj
@@ -40,11 +40,6 @@
<ProjectReference Include="..\Lucene.Net.Queries\Lucene.Net.Queries.csproj" />
</ItemGroup>
- <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
- <Reference Include="System" />
- <Reference Include="Microsoft.CSharp" />
- </ItemGroup>
-
<ItemGroup>
<InternalsVisibleTo Include="Lucene.Net.Tests.Suggest" />
</ItemGroup>
diff --git a/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj b/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj
index b89a691..fee7de7 100644
--- a/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj
+++ b/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj
@@ -84,8 +84,6 @@
<Reference Include="System.IO.Compression" />
<Reference Include="System.Numerics" />
<Reference Include="System.ServiceModel" />
- <Reference Include="System" />
- <Reference Include="Microsoft.CSharp" />
</ItemGroup>
<ItemGroup>
diff --git a/src/Lucene.Net.Tests.TestFramework/Lucene.Net.Tests.TestFramework.csproj b/src/Lucene.Net.Tests.TestFramework/Lucene.Net.Tests.TestFramework.csproj
index 72c0536..0c6dbe1 100644
--- a/src/Lucene.Net.Tests.TestFramework/Lucene.Net.Tests.TestFramework.csproj
+++ b/src/Lucene.Net.Tests.TestFramework/Lucene.Net.Tests.TestFramework.csproj
@@ -59,8 +59,6 @@
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
- <Reference Include="System" />
- <Reference Include="Microsoft.CSharp" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="$(MicrosoftExtensionsConfigurationAbstractionsPackageVersion_NET4_5_1)" />
</ItemGroup>
diff --git a/src/Lucene.Net/Lucene.Net.csproj b/src/Lucene.Net/Lucene.Net.csproj
index f085e7e..5942e2d 100644
--- a/src/Lucene.Net/Lucene.Net.csproj
+++ b/src/Lucene.Net/Lucene.Net.csproj
@@ -59,11 +59,6 @@
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="$(MicrosoftExtensionsConfigurationAbstractionsPackageVersion_NET4_5_1)" />
</ItemGroup>
-
- <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
- <Reference Include="System" />
- <Reference Include="Microsoft.CSharp" />
- </ItemGroup>
<ItemGroup>
<InternalsVisibleTo Include="Lucene.Net.Analysis.Common" />
diff --git a/src/dotnet/Lucene.Net.ICU/Lucene.Net.ICU.csproj b/src/dotnet/Lucene.Net.ICU/Lucene.Net.ICU.csproj
index 6ee8f72..050614a 100644
--- a/src/dotnet/Lucene.Net.ICU/Lucene.Net.ICU.csproj
+++ b/src/dotnet/Lucene.Net.ICU/Lucene.Net.ICU.csproj
@@ -66,11 +66,6 @@
<PackageReference Include="ICU4N.Transliterator" Version="$(ICU4NTransliteratorPackageVersion)" />
</ItemGroup>
- <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
- <Reference Include="System" />
- <Reference Include="Microsoft.CSharp" />
- </ItemGroup>
-
<ItemGroup>
<InternalsVisibleTo Include="Lucene.Net.Tests.ICU" />
</ItemGroup>
diff --git a/src/dotnet/Lucene.Net.Replicator.AspNetCore/Lucene.Net.Replicator.AspNetCore.csproj b/src/dotnet/Lucene.Net.Replicator.AspNetCore/Lucene.Net.Replicator.AspNetCore.csproj
index 3cee344..13aed1e 100644
--- a/src/dotnet/Lucene.Net.Replicator.AspNetCore/Lucene.Net.Replicator.AspNetCore.csproj
+++ b/src/dotnet/Lucene.Net.Replicator.AspNetCore/Lucene.Net.Replicator.AspNetCore.csproj
@@ -43,9 +43,4 @@
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="$(MicrosoftAspNetCoreHttpAbstractionsPackageVersion)" />
</ItemGroup>
- <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
- <Reference Include="System" />
- <Reference Include="Microsoft.CSharp" />
- </ItemGroup>
-
</Project>
[lucenenet] 09/14: Added NuGet.config to work around build pipeline
caching issues
Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nightowl888 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucenenet.git
commit cee19c3f68b3789e21fd305194384bfac88a8cc6
Author: Shad Storhaug <sh...@shadstorhaug.com>
AuthorDate: Tue Jul 14 04:04:09 2020 +0700
Added NuGet.config to work around build pipeline caching issues
---
NuGet.config | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/NuGet.config b/NuGet.config
new file mode 100644
index 0000000..afae527
--- /dev/null
+++ b/NuGet.config
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<configuration>
+ <packageSources>
+ <add key="NuGet official package source" value="https://api.nuget.org/v3/index.json" />
+ </packageSources>
+</configuration>
[lucenenet] 13/14: publish-test-results.yml: View files in test
environment after artifacts are downloaded
Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nightowl888 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucenenet.git
commit 61c311850ea82f15165afe91621a83d5633bf5db
Author: Shad Storhaug <sh...@shadstorhaug.com>
AuthorDate: Tue Jul 14 09:11:01 2020 +0700
publish-test-results.yml: View files in test environment after artifacts are downloaded
---
build/azure-templates/publish-test-results.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build/azure-templates/publish-test-results.yml b/build/azure-templates/publish-test-results.yml
index 4509f52..c60fea6 100644
--- a/build/azure-templates/publish-test-results.yml
+++ b/build/azure-templates/publish-test-results.yml
@@ -41,7 +41,7 @@ steps:
# EnsureNotNullOrEmpty('${{ parameters.testResultsFileName }}', 'testResultsFileName')
# displayName: 'Validate Template Parameters'
-#- template: 'show-all-files.yml' # Uncomment for debugging
+- template: 'show-all-files.yml' # Uncomment for debugging
- powershell: |
$testResultsFileName = "$(Build.ArtifactStagingDirectory)/${{ parameters.testResultsArtifactName }}/${{ parameters.osName }}/${{ parameters.framework }}/${{ parameters.testProjectName }}/${{ parameters.testResultsFileName }}"
[lucenenet] 05/14: Lucene.Net.TestFramework.Util.LuceneTestCase:
Completed implementation of Nightly, Weekly, AwaitsFix, and Slow attributes.
Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nightowl888 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucenenet.git
commit 18dfe364ebb63cb1364dfc93804e2d7982717da0
Author: Shad Storhaug <sh...@shadstorhaug.com>
AuthorDate: Mon Jul 13 07:09:31 2020 +0700
Lucene.Net.TestFramework.Util.LuceneTestCase: Completed implementation of Nightly, Weekly, AwaitsFix, and Slow attributes.
---
.../Util/LuceneTestCase.cs | 176 ++++++++++++++-------
.../Index/TestIndexWriterReader.cs | 1 +
src/Lucene.Net.Tests/Store/TestMultiMMap.cs | 2 +
src/Lucene.Net.Tests/Support/TestWeakDictionary.cs | 3 +-
.../Support/TestWeakDictionaryBehavior.cs | 3 +-
5 files changed, 130 insertions(+), 55 deletions(-)
diff --git a/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs b/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
index 2af5424..c7e40af 100644
--- a/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
@@ -33,9 +33,6 @@ using FieldInfo = Lucene.Net.Index.FieldInfo;
using static Lucene.Net.Search.FieldCache;
using static Lucene.Net.Util.FieldCacheSanityChecker;
using J2N.Collections.Generic.Extensions;
-using Microsoft.Extensions.Configuration;
-using Lucene.Net.Configuration;
-using Microsoft.Extensions.Configuration.Json;
#if TESTFRAMEWORK_MSTEST
using Before = Microsoft.VisualStudio.TestTools.UnitTesting.TestInitializeAttribute;
@@ -51,6 +48,8 @@ using OneTimeSetUp = NUnit.Framework.OneTimeSetUpAttribute;
using OneTimeTearDown = NUnit.Framework.OneTimeTearDownAttribute;
using Test = NUnit.Framework.TestAttribute;
using TestFixture = NUnit.Framework.TestFixtureAttribute;
+using NUnit.Framework.Interfaces;
+using NUnit.Framework.Internal;
#elif TESTFRAMEWORK_XUNIT
using Before = Lucene.Net.Attributes.NoOpAttribute;
using After = Lucene.Net.Attributes.NoOpAttribute;
@@ -213,10 +212,10 @@ namespace Lucene.Net.Util
// Test groups, system properties and other annotations modifying tests
// --------------------------------------------------------------------
- internal const string SYSPROP_NIGHTLY = "tests:nightly"; // LUCENENET specific - made internal, because not fully implemented
- internal const string SYSPROP_WEEKLY = "tests:weekly"; // LUCENENET specific - made internal, because not fully implemented
- internal const string SYSPROP_AWAITSFIX = "tests:awaitsfix"; // LUCENENET specific - made internal, because not fully implemented
- internal const string SYSPROP_SLOW = "tests:slow"; // LUCENENET specific - made internal, because not fully implemented
+ public const string SYSPROP_NIGHTLY = "tests:nightly";
+ public const string SYSPROP_WEEKLY = "tests:weekly";
+ public const string SYSPROP_AWAITSFIX = "tests:awaitsfix";
+ public const string SYSPROP_SLOW = "tests:slow";
internal const string SYSPROP_BADAPPLES = "tests:badapples"; // LUCENENET specific - made internal, because not fully implemented
///// <seealso cref="IgnoreAfterMaxFailures"/>
@@ -225,38 +224,106 @@ namespace Lucene.Net.Util
///// <seealso cref="IgnoreAfterMaxFailures"/>
internal const string SYSPROP_FAILFAST = "tests:failfast"; // LUCENENET specific - made internal, because not fully implemented
- // LUCENENET: Not Implemented
- /////// <summary>
- /////// Annotation for tests that should only be run during nightly builds.
- /////// </summary>
- ////[AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = true)]
- ////public class NightlyAttribute : System.Attribute { } // LUCENENET: API looks better with this nested
+ /// <summary>
+ /// Attribute for tests that should only be run during nightly builds.
+ /// </summary>
+ [AttributeUsage(AttributeTargets.Method | AttributeTargets.Class, AllowMultiple = false, Inherited = true)]
+ [SuppressMessage("Design", "CA1034:Nested types should not be visible", Justification = "API looks better with this nested.")]
+ public sealed class NightlyAttribute : System.Attribute
+#if TESTFRAMEWORK_NUNIT
+ , IApplyToTest
+ {
+ public void ApplyToTest(NUnit.Framework.Internal.Test test)
+ {
+ if (!TEST_NIGHTLY)
+ {
+ test.RunState = RunState.Skipped;
+ test.Properties.Set(PropertyNames.SkipReason, "This is a nightly test.");
+ }
+ test.Properties.Add(PropertyNames.Category, "Nightly");
+ }
+ }
+#else
+ { }
+#endif
- /////// <summary>
- /////// Annotation for tests that should only be run during weekly builds.
- /////// </summary>
- ////[AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = true)]
- ////public class WeeklyAttribute : System.Attribute { } // LUCENENET: API looks better with this nested
+ /// <summary>
+ /// Attribute for tests that should only be run during weekly builds.
+ /// </summary>
+ [AttributeUsage(AttributeTargets.Method | AttributeTargets.Class, AllowMultiple = false, Inherited = true)]
+ [SuppressMessage("Design", "CA1034:Nested types should not be visible", Justification = "API looks better with this nested.")]
+ public sealed class WeeklyAttribute : System.Attribute
+#if TESTFRAMEWORK_NUNIT
+ , IApplyToTest
+ {
+ public void ApplyToTest(NUnit.Framework.Internal.Test test)
+ {
+ if (!TEST_WEEKLY)
+ {
+ test.RunState = RunState.Skipped;
+ test.Properties.Set(PropertyNames.SkipReason, "This is a weekly test.");
+ }
+ test.Properties.Add(PropertyNames.Category, "Weekly");
+ }
+ }
+#else
+ { }
+#endif
- /////// <summary>
- /////// Annotation for tests which exhibit a known issue and are temporarily disabled.
- /////// </summary>
- ////[AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = true)]
- ////public class AwaitsFix : System.Attribute // LUCENENET: API looks better with this nested
- ////{
- //// /// <summary>
- //// /// Point to issue tracker entry. </summary>
- //// public virtual string BugUrl { get; set; }
- ////}
+ /// <summary>
+ /// Attribute for tests which exhibit a known issue and are temporarily disabled.
+ /// </summary>
+ [AttributeUsage(AttributeTargets.Method | AttributeTargets.Class, AllowMultiple = false, Inherited = true)]
+ [SuppressMessage("Design", "CA1034:Nested types should not be visible", Justification = "API looks better with this nested.")]
+ public sealed class AwaitsFixAttribute : System.Attribute
+#if TESTFRAMEWORK_NUNIT
+ , IApplyToTest
+ {
+ public void ApplyToTest(NUnit.Framework.Internal.Test test)
+ {
+ if (!TEST_AWAITSFIX)
+ {
+ test.RunState = RunState.Ignored;
+ test.Properties.Set(PropertyNames.SkipReason, BugUrl);
+ }
+ test.Properties.Add(PropertyNames.Category, "AwaitsFix");
+ }
+#else
+ {
+#endif
+ /// <summary>
+ /// Point to issue tracker entry. </summary>
+ public string BugUrl { get; set; } = "A known bug is being investigated regarding this issue.";
+ }
- /////// <summary>
- /////// Annotation for tests that are slow. Slow tests do run by default but can be
- /////// disabled if a quick run is needed.
- /////// </summary>
- ////public class SlowAttribute : System.Attribute { } // LUCENENET: API looks better with this nested
+ /// <summary>
+ /// Attribute for tests that are slow. Slow tests do run by default but can be
+ /// disabled if a quick run is needed.
+ /// </summary>
+ [AttributeUsage(AttributeTargets.Method | AttributeTargets.Class, AllowMultiple = false)]
+ [SuppressMessage("Design", "CA1034:Nested types should not be visible", Justification = "API looks better with this nested.")]
+ public sealed class SlowAttribute : System.Attribute
+#if TESTFRAMEWORK_NUNIT
+ , IApplyToTest
+ {
+ void IApplyToTest.ApplyToTest(NUnit.Framework.Internal.Test test)
+ {
+ // The test framework setting overrides the NUnit category setting, if false
+ if (!TEST_SLOW)
+ {
+ test.RunState = RunState.Skipped;
+ test.Properties.Set(PropertyNames.SkipReason, Description);
+ }
+ test.Properties.Add(PropertyNames.Category, "Slow");
+ }
+#else
+ {
+#endif
+ public string Description { get; set; } = "This test is slow.";
+ }
/////// <summary>
- /////// Annotation for tests that fail frequently and should
+ /////// Attribute for tests that fail frequently and should
/////// be moved to a <a href="https://builds.apache.org/job/Lucene-BadApples-trunk-java7/">"vault" plan in Jenkins</a>.
///////
/////// Tests annotated with this will be turned off by default. If you want to enable
@@ -265,20 +332,22 @@ namespace Lucene.Net.Util
/////// -Dtests.badapples=true
/////// </pre>
/////// </summary>
- ////public class BadAppleAttribute : System.Attribute // LUCENENET: API looks better with this nested
+ ////[AttributeUsage(AttributeTargets.Method | AttributeTargets.Class, AllowMultiple = false)]
+ ////[SuppressMessage("Design", "CA1034:Nested types should not be visible", Justification = "API looks better with this nested.")]
+ ////public class BadAppleAttribute : System.Attribute
////{
//// /// <summary>
//// /// Point to issue tracker entry. </summary>
- //// public virtual string BugUrl { get; set;}
+ //// public virtual string BugUrl { get; set; }
////}
/// <summary>
- /// Annotation for test classes that should avoid certain codec types
+ /// Attribute for test classes that should avoid certain codec types
/// (because they are expensive, for example).
/// </summary>
[AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = true)]
-
- public class SuppressCodecsAttribute : System.Attribute // LUCENENET: API looks better with this nested
+ [SuppressMessage("Design", "CA1034:Nested types should not be visible", Justification = "API looks better with this nested.")]
+ public sealed class SuppressCodecsAttribute : System.Attribute
{
private static readonly Regex WHITESPACE_REMOVAL = new Regex(@"\s*,\s*", RegexOptions.Compiled | RegexOptions.CultureInvariant);
@@ -310,11 +379,12 @@ namespace Lucene.Net.Util
/// <seealso cref="LuceneTestCase.CreateTempDir()"/>
/// <seealso cref="LuceneTestCase.CreateTempFile(String, String)"/>
[AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = true)]
- public class SuppressTempFileChecksAttribute : System.Attribute // LUCENENET: API looks better with this nested
+ [SuppressMessage("Design", "CA1034:Nested types should not be visible", Justification = "API looks better with this nested.")]
+ public sealed class SuppressTempFileChecksAttribute : System.Attribute
{
/// <summary>
/// Point to issue tracker entry. </summary>
- public virtual string BugUrl { get; set; } = "None";
+ public string BugUrl { get; set; } = "None";
}
// -----------------------------------------------------------------
@@ -379,21 +449,21 @@ namespace Lucene.Net.Util
/// The line file used by LineFileDocs </summary>
public static readonly string TEST_LINE_DOCS_FILE = SystemProperties.GetProperty("tests:linedocsfile", DEFAULT_LINE_DOCS_FILE); // LUCENENET specific - reformatted with :
- ///// <summary>
- ///// Whether or not <see cref="Nightly"/> tests should run. </summary>
- internal static readonly bool TEST_NIGHTLY = SystemProperties.GetPropertyAsBoolean(SYSPROP_NIGHTLY, false); // LUCENENET specific - made internal, because not fully implemented
+ /// <summary>
+ /// Whether or not <see cref="NightlyAttribute"/> tests should run. </summary>
+ public static readonly bool TEST_NIGHTLY = SystemProperties.GetPropertyAsBoolean(SYSPROP_NIGHTLY, false);
- ///// <summary>
- ///// Whether or not <see cref="Weekly"/> tests should run. </summary>
- internal static readonly bool TEST_WEEKLY = SystemProperties.GetPropertyAsBoolean(SYSPROP_WEEKLY, false); // LUCENENET specific - made internal, because not fully implemented
+ /// <summary>
+ /// Whether or not <see cref="WeeklyAttribute"/> tests should run. </summary>
+ public static readonly bool TEST_WEEKLY = SystemProperties.GetPropertyAsBoolean(SYSPROP_WEEKLY, false);
- ///// <summary>
- ///// Whether or not <see cref="AwaitsFix"/> tests should run. </summary>
- internal static readonly bool TEST_AWAITSFIX = SystemProperties.GetPropertyAsBoolean(SYSPROP_AWAITSFIX, false); // LUCENENET specific - made internal, because not fully implemented
+ /// <summary>
+ /// Whether or not <see cref="AwaitsFixAttribute"/> tests should run. </summary>
+ public static readonly bool TEST_AWAITSFIX = SystemProperties.GetPropertyAsBoolean(SYSPROP_AWAITSFIX, false); // LUCENENET specific - made internal, because not fully implemented
- ///// <summary>
- ///// Whether or not <see cref="Slow"/> tests should run. </summary>
- internal static readonly bool TEST_SLOW = SystemProperties.GetPropertyAsBoolean(SYSPROP_SLOW, false); // LUCENENET specific - made internal, because not fully implemented
+ /// <summary>
+ /// Whether or not <see cref="SlowAttribute"/> tests should run. </summary>
+ public static readonly bool TEST_SLOW = SystemProperties.GetPropertyAsBoolean(SYSPROP_SLOW, true); // LUCENENET specific - made default true, as per the docs
/// <summary>
/// Throttling, see <see cref="MockDirectoryWrapper.Throttling"/>. </summary>
diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterReader.cs b/src/Lucene.Net.Tests/Index/TestIndexWriterReader.cs
index b6abbea..ec9575b 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexWriterReader.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexWriterReader.cs
@@ -867,6 +867,7 @@ namespace Lucene.Net.Index
// Stress test reopen during addIndexes
[Test]
+ [Slow]
public virtual void TestDuringAddIndexes()
{
Directory dir1 = GetAssertNoDeletesDirectory(NewDirectory());
diff --git a/src/Lucene.Net.Tests/Store/TestMultiMMap.cs b/src/Lucene.Net.Tests/Store/TestMultiMMap.cs
index 5f92c2f..e6228ef 100644
--- a/src/Lucene.Net.Tests/Store/TestMultiMMap.cs
+++ b/src/Lucene.Net.Tests/Store/TestMultiMMap.cs
@@ -318,6 +318,7 @@ namespace Lucene.Net.Store
}
[Test]
+ [Slow]
public virtual void TestSeeking()
{
for (int i = 0; i < 10; i++)
@@ -350,6 +351,7 @@ namespace Lucene.Net.Store
// note instead of seeking to offset and reading length, this opens slices at the
// the various offset+length and just does readBytes.
[Test]
+ [Slow]
public virtual void TestSlicedSeeking()
{
for (int i = 0; i < 10; i++)
diff --git a/src/Lucene.Net.Tests/Support/TestWeakDictionary.cs b/src/Lucene.Net.Tests/Support/TestWeakDictionary.cs
index 9af83f6..edd24a3 100644
--- a/src/Lucene.Net.Tests/Support/TestWeakDictionary.cs
+++ b/src/Lucene.Net.Tests/Support/TestWeakDictionary.cs
@@ -1,5 +1,6 @@
#if !FEATURE_CONDITIONALWEAKTABLE_ENUMERATOR
using Lucene.Net.Attributes;
+using Lucene.Net.Util;
using NUnit.Framework;
using System;
using System.Collections;
@@ -26,7 +27,7 @@ namespace Lucene.Net.Support
*/
[TestFixture]
- public class TestWeakDictionary
+ public class TestWeakDictionary : LuceneTestCase
{
[Test, LuceneNetSpecific]
public void A_TestBasicOps()
diff --git a/src/Lucene.Net.Tests/Support/TestWeakDictionaryBehavior.cs b/src/Lucene.Net.Tests/Support/TestWeakDictionaryBehavior.cs
index 5a7b247..586bd08 100644
--- a/src/Lucene.Net.Tests/Support/TestWeakDictionaryBehavior.cs
+++ b/src/Lucene.Net.Tests/Support/TestWeakDictionaryBehavior.cs
@@ -1,5 +1,6 @@
#if !FEATURE_CONDITIONALWEAKTABLE_ENUMERATOR
using Lucene.Net.Attributes;
+using Lucene.Net.Util;
using NUnit.Framework;
using System;
using System.Collections.Generic;
@@ -25,7 +26,7 @@ namespace Lucene.Net.Support
*/
[TestFixture]
- public class TestWeakDictionaryBehavior
+ public class TestWeakDictionaryBehavior : LuceneTestCase
{
IDictionary<object, object> dictionary;
[lucenenet] 03/14: Fixed up Microsoft.Extension.Configuration
references
Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nightowl888 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucenenet.git
commit bbb2b32b790bb7d13ea086e4fe81febb6012377e
Author: Shad Storhaug <sh...@shadstorhaug.com>
AuthorDate: Sun Jul 12 07:02:36 2020 +0700
Fixed up Microsoft.Extension.Configuration references
---
build/Dependencies.props | 14 +++++---------
.../Lucene.Net.TestFramework.csproj | 13 +++++++------
.../Lucene.Net.Tests.TestFramework.csproj | 6 ++----
3 files changed, 14 insertions(+), 19 deletions(-)
diff --git a/build/Dependencies.props b/build/Dependencies.props
index b6f312f..1a8ea2e 100644
--- a/build/Dependencies.props
+++ b/build/Dependencies.props
@@ -44,23 +44,19 @@
<MicrosoftCodeAnalysisAnalyzersPackageVersion>2.9.8</MicrosoftCodeAnalysisAnalyzersPackageVersion>
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>3.4.0</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
<MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>3.4.0</MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>
-
- <MicrosoftExtensionsConfigurationAbstractionsPackageVersion_NET4_5_1>1.1.2</MicrosoftExtensionsConfigurationAbstractionsPackageVersion_NET4_5_1>
<MicrosoftExtensionsConfigurationPackageVersion_NET4_5_1>1.1.2</MicrosoftExtensionsConfigurationPackageVersion_NET4_5_1>
+ <MicrosoftExtensionsConfigurationAbstractionsPackageVersion_NET4_5_1>$(MicrosoftExtensionsConfigurationPackageVersion_NET4_5_1)</MicrosoftExtensionsConfigurationAbstractionsPackageVersion_NET4_5_1>
+ <MicrosoftExtensionsConfigurationCommandLinePackageVersion_NET4_5_1>$(MicrosoftExtensionsConfigurationPackageVersion_NET4_5_1)</MicrosoftExtensionsConfigurationCommandLinePackageVersion_NET4_5_1>
+ <MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion_NET4_5_1>$(MicrosoftExtensionsConfigurationPackageVersion_NET4_5_1)</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion_NET4_5_1>
<MicrosoftExtensionsConfigurationJsonPackageVersion_NET4_5_1>$(MicrosoftExtensionsConfigurationPackageVersion_NET4_5_1)</MicrosoftExtensionsConfigurationJsonPackageVersion_NET4_5_1>
<MicrosoftExtensionsConfigurationXmlPackageVersion_NET4_5_1>$(MicrosoftExtensionsConfigurationPackageVersion_NET4_5_1)</MicrosoftExtensionsConfigurationXmlPackageVersion_NET4_5_1>
- <MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion_NET4_5_1>$(MicrosoftExtensionsConfigurationPackageVersion_NET4_5_1)</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion_NET4_5_1>
- <MicrosoftExtensionsConfigurationCommandLinePackageVersion_NET4_5_1>$(MicrosoftExtensionsConfigurationPackageVersion_NET4_5_1)</MicrosoftExtensionsConfigurationCommandLinePackageVersion_NET4_5_1>
-
<MicrosoftExtensionsConfigurationPackageVersion>3.1.3</MicrosoftExtensionsConfigurationPackageVersion>
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>$(MicrosoftExtensionsConfigurationPackageVersion)</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
+ <MicrosoftExtensionsConfigurationCommandLinePackageVersion>$(MicrosoftExtensionsConfigurationPackageVersion)</MicrosoftExtensionsConfigurationCommandLinePackageVersion>
+ <MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>$(MicrosoftExtensionsConfigurationPackageVersion)</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
<MicrosoftExtensionsConfigurationJsonPackageVersion>$(MicrosoftExtensionsConfigurationPackageVersion)</MicrosoftExtensionsConfigurationJsonPackageVersion>
<MicrosoftExtensionsConfigurationXmlPackageVersion>$(MicrosoftExtensionsConfigurationPackageVersion)</MicrosoftExtensionsConfigurationXmlPackageVersion>
- <MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>$(MicrosoftExtensionsConfigurationPackageVersion)</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
- <MicrosoftExtensionsConfigurationCommandLinePackageVersion>$(MicrosoftExtensionsConfigurationPackageVersion)</MicrosoftExtensionsConfigurationCommandLinePackageVersion>
-
<MicrosoftExtensionsDependencyInjectionPackageVersion>3.1.4</MicrosoftExtensionsDependencyInjectionPackageVersion>
-
<MicrosoftNETTestSdkPackageVersion>16.6.1</MicrosoftNETTestSdkPackageVersion>
<MorfologikFsaPackageVersion>2.1.6-beta-0005</MorfologikFsaPackageVersion>
<MorfologikPolishPackageVersion>$(MorfologikFsaPackageVersion)</MorfologikPolishPackageVersion>
diff --git a/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj b/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj
index fee7de7..8f5e854 100644
--- a/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj
+++ b/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj
@@ -59,25 +59,26 @@
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
<PackageReference Include="Microsoft.Extensions.Configuration" Version="$(MicrosoftExtensionsConfigurationPackageVersion)" />
+ <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="$(MicrosoftExtensionsConfigurationCommandLinePackageVersion)" />
+ <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion)" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="$(MicrosoftExtensionsConfigurationJsonPackageVersion)" />
<PackageReference Include="Microsoft.Extensions.Configuration.Xml" Version="$(MicrosoftExtensionsConfigurationXmlPackageVersion)" />
- <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion)" />
- <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="$(MicrosoftExtensionsConfigurationCommandLinePackageVersion)" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
+ <PackageReference Include="Microsoft.Extensions.Configuration" Version="$(MicrosoftExtensionsConfigurationPackageVersion)" />
+ <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="$(MicrosoftExtensionsConfigurationCommandLinePackageVersion)" />
+ <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion)" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="$(MicrosoftExtensionsConfigurationJsonPackageVersion)" />
<PackageReference Include="Microsoft.Extensions.Configuration.Xml" Version="$(MicrosoftExtensionsConfigurationXmlPackageVersion)" />
- <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion)" />
- <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="$(MicrosoftExtensionsConfigurationCommandLinePackageVersion)" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
<PackageReference Include="Microsoft.Extensions.Configuration" Version="$(MicrosoftExtensionsConfigurationPackageVersion_NET4_5_1)" />
+ <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="$(MicrosoftExtensionsConfigurationCommandLinePackageVersion_NET4_5_1)" />
+ <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion_NET4_5_1)" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="$(MicrosoftExtensionsConfigurationJsonPackageVersion_NET4_5_1)" />
<PackageReference Include="Microsoft.Extensions.Configuration.Xml" Version="$(MicrosoftExtensionsConfigurationXmlPackageVersion_NET4_5_1)" />
- <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion_NET4_5_1)" />
- <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="$(MicrosoftExtensionsConfigurationCommandLinePackageVersion_NET4_5_1)" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
diff --git a/src/Lucene.Net.Tests.TestFramework/Lucene.Net.Tests.TestFramework.csproj b/src/Lucene.Net.Tests.TestFramework/Lucene.Net.Tests.TestFramework.csproj
index 0c6dbe1..d112c4d 100644
--- a/src/Lucene.Net.Tests.TestFramework/Lucene.Net.Tests.TestFramework.csproj
+++ b/src/Lucene.Net.Tests.TestFramework/Lucene.Net.Tests.TestFramework.csproj
@@ -47,15 +47,13 @@
<Import Project="$(SolutionDir)build/TestReferences.Common.targets" />
-
-
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
- <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="$(MicrosoftExtensionsConfigurationPackageVersion)" />
+ <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="$(MicrosoftExtensionsConfigurationAbstractionsPackageVersion)" />
<PackageReference Include="System.Net.Primitives" Version="$(SystemNetPrimitivesPackageVersion)" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
- <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="$(MicrosoftExtensionsConfigurationPackageVersion)" />
+ <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="$(MicrosoftExtensionsConfigurationAbstractionsPackageVersion)" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
[lucenenet] 11/14: azure-pipelines.yml: Added build features for
the test framework's system properties
Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nightowl888 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucenenet.git
commit fc222302b25ddb48fc21b943fb8e5730fa02a17e
Author: Shad Storhaug <sh...@shadstorhaug.com>
AuthorDate: Tue Jul 14 05:49:47 2020 +0700
azure-pipelines.yml: Added build features for the test framework's system properties
---
Lucene.Net.sln | 1 +
azure-pipelines.yml | 97 ++++++++++++++++++-------
build/azure-templates/publish-test-binaries.yml | 38 ++++++++++
3 files changed, 108 insertions(+), 28 deletions(-)
diff --git a/Lucene.Net.sln b/Lucene.Net.sln
index 389ea17..aa712c3 100644
--- a/Lucene.Net.sln
+++ b/Lucene.Net.sln
@@ -21,6 +21,7 @@ MinimumVisualStudioVersion = 15.0.26730.8
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "azure-templates", "azure-templates", "{05CE3A39-40D4-452D-AFE0-E57E536A08C6}"
ProjectSection(SolutionItems) = preProject
build\azure-templates\publish-nuget-packages.yml = build\azure-templates\publish-nuget-packages.yml
+ build\azure-templates\publish-test-binaries.yml = build\azure-templates\publish-test-binaries.yml
build\azure-templates\publish-test-results-for-test-projects.yml = build\azure-templates\publish-test-results-for-test-projects.yml
build\azure-templates\publish-test-results.yml = build\azure-templates\publish-test-results.yml
build\azure-templates\run-tests-on-os.yml = build\azure-templates\run-tests-on-os.yml
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index af14c19..1e10718 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -18,14 +18,13 @@
name: 'vNext$(rev:.r)' # Format for build number (will be overridden)
# DevOps Setup: Define the following pipeline level variables in Azure DevOps build pipeline
-#
+
# ArtifactFeedID: (Optional - set to your Azure DevOps Artifact (NuGet) feed. If not provided, publish job will be skipped.)
# BuildConfiguration: (Optional. Defaults to 'Release')
# BuildPlatform: (Optional. Defaults to 'Any CPU')
# GenerateDocs: (Optional. Only builds documentation website if set to 'true'.)
# GenerateWebsite: (Optional. Only builds lucene.net website if set to 'true'.)
# IsRelease: (Optional. By default the Release job is disabled, setting this to 'true' will enable it)
-# RunTests: 'true' (Optional - set to 'false' to disable test jobs - useful for debugging. If not provided, tests will be run.)
# Versioning Variables
@@ -34,6 +33,20 @@ name: 'vNext$(rev:.r)' # Format for build number (will be overridden)
# PreReleaseCounterPattern: (Optional. Set to '0000000000' in ci pipeline or '00000' in release pipeline. The default is '0000000000'. This setting has no effect if VersionSuffix is ''.)
# VersionSuffix: (Optional. Defaults to 'ci'. Set to 'beta' or 'rc' or '' in production pipeline.)
+# Testing variables
+
+# RunTests: 'true' (Optional - set to 'false' to disable test jobs - useful for debugging. If not provided, tests will be run.)
+# IsNightly: 'false' (Optional - set to 'true' to run additional tests for the nightly build)
+# IsWeekly: 'false' (Optional - set to 'true' to run additional tests for the weekly build)
+# RunSlowTests: 'true' (Optional - set to 'false' to skip slow tests to make testing time shorter)
+# RunAwaitsFixTests: 'false' (Optional - set to 'true' to run flakey tests)
+# Codec: 'random' (Optional - set to a specific codec to test the same codec throughout all tests)
+# DocValuesFormat: 'random' (Optional - set to a specific doc values format to test the same codec throughout all tests)
+# PostingsFormat: 'random' (Optional - set to a specific postings format to test the same codec throughout all tests)
+# Directory: 'random' (Optional - set to a specific directory implementation to test the same codec throughout all tests)
+# Verbose: 'false' (Optional - set to true for verbose logging output)
+# Multiplier: '1' (Optional - the number of iterations to multiply applicable tests by)
+
variables:
- name: BuildCounter
value: $[counter(variables['VersionSuffix'],coalesce(variables['BuildCounterSeed'], 1250))]
@@ -63,6 +76,8 @@ variables:
value: 'packageVersion.txt'
- name: FileVersionFileName
value: 'fileVersion.txt'
+- name: TestSettingsFileName
+ value: 'lucene.testsettings.json'
- name: BuildDirectory # Where the build scripts and configs are
value: '$(System.DefaultWorkingDirectory)/build'
- name: PublishDirectory # Test binaries directory
@@ -113,13 +128,39 @@ stages:
displayName: 'PSake Build, Pack, and Publish'
- template: 'build/azure-templates/show-all-environment-variables.yml'
- - powershell: |
+ - pwsh: |
$dir = '$(Build.ArtifactStagingDirectory)/$(VersionArtifactName)'
if (!(Test-Path $dir)) { New-Item -ItemType Directory -Path "$dir" -Force }
'$(PackageVersion)' | Out-File -FilePath "$dir/$(PackageVersionFileName)" -Force
'$(FileVersion)' | Out-File -FilePath "$dir/$(FileVersionFileName)" -Force
'$(Build.BuildNumber)' | Out-File -FilePath "$dir/$(BuildNumberFileName)" -Force
- displayName: 'Write Versions to Files'
+
+ # Generate a lucene.testsettings.json file for use with the test framework
+ $nightly = if ($Env:IsNightly -eq 'true') { 'true' } else { 'false' }
+ $weekly = if ($Env:IsWeekly -eq 'true') { 'true' } else { 'false' }
+ $slow = if ($Env:RunSlowTests -ne 'false') { 'true' } else { 'false' }
+ $awaitsFix = if ($Env:RunAwaitsFixTests -eq 'true') { 'true' } else { 'false' }
+ $codec = if ($Env:Codec -eq $null) { 'random' } else { $Env:Codec }
+ $docValuesFormat = if ($Env:DocValuesFormat -eq $null) { 'random' } else { $Env:DocValuesFormat }
+ $postingsFormat = if ($Env:PostingsFormat -eq $null) { 'random' } else { $Env:PostingsFormat }
+ $directory = if ($Env:Directory -eq $null) { 'random' } else { $Env:Directory }
+ $verbose = if ($Env:Verbose -eq 'true') { 'true' } else { 'false' }
+ $multiplier = if ($Env:Multiplier -eq $null) { '1' } else { $Env:Multiplier }
+ $fileText = "{`n`t""tests"":`n`t{`n`t`t" +
+ """nightly"": ""$nightly"",`n`t`t" +
+ """weekly"": ""$weekly"",`n`t`t" +
+ """slow"": ""$slow"",`n`t`t" +
+ """awaitsfix"": ""$awaitsFix"",`n`t`t" +
+ """codec"": ""$codec"",`n`t`t" +
+ """docvaluesformat"": ""$docValuesFormat"",`n`t`t" +
+ """postingsformat"": ""$postingsFormat"",`n`t`t" +
+ """directory"": ""$directory"",`n`t`t" +
+ """verbose"": ""$verbose"",`n`t`t" +
+ """multiplier"": ""$multiplier""`n`t" +
+ "}`n}"
+ Out-File -filePath "$(Build.ArtifactStagingDirectory)/$(TestSettingsFileName)" -encoding UTF8 -inputObject $fileText
+ displayName: 'Persist Variables to Files'
+
# If this is a release pipeline, copy the build.bat and Version.props files as version artifacts, which will
# overwrite the build.bat and Version.props files of the release.
- task: CopyFiles@2
@@ -148,30 +189,30 @@ stages:
Contents: |
**\**\bin\**\*.pdb
TargetFolder: '$(Build.ArtifactStagingDirectory)/$(DebugArtifactName)'
-
- - task: PublishPipelineArtifact@1
- displayName: 'Publish Artifact: $(BinaryArtifactName)_netcoreapp3.1'
- inputs:
- targetPath: '$(PublishTempDirectory)\netcoreapp3.1'
- artifact: '$(BinaryArtifactName)_netcoreapp3.1'
- publishLocation: 'pipeline'
- condition: and(succeeded(), ne(variables['RunTests'], 'false'))
-
- - task: PublishPipelineArtifact@1
- displayName: 'Publish Artifact: $(BinaryArtifactName)_netcoreapp2.1'
- inputs:
- targetPath: '$(PublishTempDirectory)\netcoreapp2.1'
- artifact: '$(BinaryArtifactName)_netcoreapp2.1'
- publishLocation: 'pipeline'
- condition: and(succeeded(), ne(variables['RunTests'], 'false'))
-
- - task: PublishPipelineArtifact@1
- displayName: 'Publish Artifact: $(BinaryArtifactName)_net48'
- inputs:
- targetPath: '$(PublishTempDirectory)\net48'
- artifact: '$(BinaryArtifactName)_net48'
- publishLocation: 'pipeline'
- condition: and(succeeded(), ne(variables['RunTests'], 'false'))
+
+ - ${{ if ne(variables['RunTests'], 'false') }}:
+ - template: 'build/azure-templates/publish-test-binaries.yml'
+ parameters:
+ publishDirectory: $(PublishTempDirectory)
+ framework: 'netcoreapp3.1'
+ binaryArtifactName: '$(BinaryArtifactName)'
+ testSettingsFilePath: '$(Build.ArtifactStagingDirectory)/$(TestSettingsFileName)'
+
+ - ${{ if ne(variables['RunTests'], 'false') }}:
+ - template: 'build/azure-templates/publish-test-binaries.yml'
+ parameters:
+ publishDirectory: $(PublishTempDirectory)
+ framework: 'netcoreapp2.1'
+ binaryArtifactName: '$(BinaryArtifactName)'
+ testSettingsFilePath: '$(Build.ArtifactStagingDirectory)/$(TestSettingsFileName)'
+
+ - ${{ if ne(variables['RunTests'], 'false') }}:
+ - template: 'build/azure-templates/publish-test-binaries.yml'
+ parameters:
+ publishDirectory: $(PublishTempDirectory)
+ framework: 'net48'
+ binaryArtifactName: '$(BinaryArtifactName)'
+ testSettingsFilePath: '$(Build.ArtifactStagingDirectory)/$(TestSettingsFileName)'
- task: PublishPipelineArtifact@1
displayName: 'Publish Artifact: $(NuGetArtifactName)'
diff --git a/build/azure-templates/publish-test-binaries.yml b/build/azure-templates/publish-test-binaries.yml
new file mode 100644
index 0000000..ae620f8
--- /dev/null
+++ b/build/azure-templates/publish-test-binaries.yml
@@ -0,0 +1,38 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# Copies the provided test framework configuration file
+# to the binary publish subdirectory for the provided target
+# framework, and then publishes to an pipeline artifact.
+
+parameters:
+ publishDirectory: '' # The path of the root publish staging directory where the binaries can be found $(PublishTempDirectory)
+ framework: '' # The target framework
+ binaryArtifactName: '' # The prefix of the binary artifact to publish $(BinaryArtifactName)
+ testSettingsFilePath: '$(Build.ArtifactStagingDirectory)/lucene.testsettings.json' #The name of the
+
+steps:
+- pwsh: |
+ Copy-Item -Path "${{ parameters.testSettingsFilePath }}" -Destination "${{ parameters.publishDirectory }}/${{ parameters.framework }}/" -Force
+ displayName: 'Copy lucene.testsettings.json File to: ${{ parameters.publishDirectory }}/${{ parameters.framework }}'
+
+- task: PublishPipelineArtifact@1
+ displayName: 'Publish Artifact: ${{ parameters.binaryArtifactName }}_${{ parameters.framework }}'
+ inputs:
+ targetPath: '${{ parameters.publishDirectory }}/${{ parameters.framework }}'
+ artifact: '${{ parameters.binaryArtifactName }}_${{ parameters.framework }}'
+ publishLocation: 'pipeline'