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/06/24 18:11:54 UTC
[lucenenet] branch master updated (6dabe24 -> cc63141)
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 6dabe24 Added NuGet.config file
new cdf7cf9 Reformated Debug assert call with String.Format with interpolation call. Improvement of 15%
new a49ff75 addresses #295 optimised some Assert calls using long, long. NUnit seems to not treat these as numerics or at least elongates test times.
new e91e086 addresses #295 updated lucene test case asserts and modified IEnumerable to IList to take advantage of indexing
new 3a2f7f8 Updated to passive from aggressive
new 710e9a7 commented unused code throwing an expection and slowing test
new 423bf3a added using Assert = Lucene.Net.TestFramework.Assert; to use TestFramework Assert
new 2dd70a16 Lucene.Net.Util.OfflineSorter: Removed unnecessary calls to ElementAt() and Count() LINQ methods, fixed boxing issue with the Assert.AreEquals call when comparing files (addresses #295).
new 6df2371 Lucene.Net.Tests.Suggest.Fst.FSTCompletionTest: Removed unnecessary calls to ElementAt() and Count() LINQ (Addresses #261)
new 6f504d2 Lucene.Net.TestFramework: Added overloads for int to Assert.AreEqual (addresses #295, #261)
new dadf70d Lucene.Net.TestFramework.Support.JavaCompatibility.LuceneTestCase: Updated assertEquals overloads to support additional collection types
new 666c9bb SWEEP: Lucene.Net.Util: Added using for Assert class to ensure our strongly-typed overloads are being called to reduce boxing. (addresses #295, #261)
new b0d23b2 Lucene.Net.Tests.Util.TestOfflineSorter::AssertFilesIdentical(): Changed test to utilize the J2N's ArrayEqualityComparer to optimize the speed of the test (#295, #261)
new cd51cc8 Lucene.Net.Tests.Index.TestIndexWriter: Fixed ambiguous call issue with Assert.AreEqual
new 2e0f25d Lucene.Net.TestFramework: Optimized array asserts by first checking with J2N.Collections.ArrayEqualityComparer<T> before cascading only the failing calls to NUnit.CollectionAssert.AreEqual to generate the error message (#295, #261)
new b5f8a94 Lucene.Net.Tests.Search + Lucene.Net.Tests.Support: Switched to using the Assert class in the test framework instead of NUnit (#295, #261)
new fd48c40 Lucene.Net.Tests.Index: Switched to using the Assert class in the test framework instead of NUnit (#295, #261)
new c08ebef Lucene.Net.Tests.Analysis + Lucene.Net.Tests.Codecs + Lucene.Net.Tests.Document: Switched to using the Assert class from the test framework instead of NUnit (#295, #261)
new aca9e47 Lucene.Net.Tests.ICU: Switched to using the Assert class from the test framework instead of NUnit (#295, #261).
new 5c25835 Lucene.Net.Tests.Analysis.Phonetic: Switched to using the Assert class from the test framework instead of NUnit (#295, #261)
new 539eb85 Lucene.Net.Tests.Facet: Switched to using the Assert class from the test framework instead of NUnit (#295, #261)
new 124decc Lucene.Net.TestFramework: Added assert overloads for float (#295, #261)
new 941b62b Lucene.Net.Tests.Facet.Taxonomy.WriterCache.TestCharBlockArray::TestArray(): Optimized by comparing against string, since indexing into a StringBuilder is painfully slow in .NET
new d45d363 Lucene.Net.TestFramework: Removed SeedAttribute
new df649a3 run-tests-on-os.yml: Upgraded to .NET Core SDK 3.1.301
new d2ade83 Downgraded tests from netcoreapp2.2 to netcoreapp2.1 because 2.2 is no longer supported and 2.1 is: https://devblogs.microsoft.com/dotnet/net-core-2-2-will-reach-end-of-life-on-december-23-2019/
new cc63141 run-tests-on-os.yml: Added task to install .NET Core SDK 2.1
The 26 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:
TestTargetFramework.props | 4 +-
azure-pipelines.yml | 14 +-
.../publish-test-results-for-test-projects.yml | 2 +-
build/azure-templates/run-tests-on-os.yml | 10 +-
build/build.ps1 | 2 +-
.../Support/TestFramework/Assert.cs | 197 ++++++++++++++++++++-
.../Codecs/Asserting/AssertingDocValuesFormat.cs | 20 ++-
.../Index/BaseStoredFieldsFormatTestCase.cs | 2 +-
.../Support/JavaCompatibility/LuceneTestCase.cs | 71 ++++++--
.../Support/Randomized/Generators/RandomInts.cs | 3 +-
.../Analysis/Hunspell/StemmerTestBase.cs | 2 +-
.../Language/Bm/BeiderMorseEncoderTest.cs | 1 +
.../Language/Bm/PhoneticEngineRegressionTest.cs | 1 +
.../Language/Bm/PhoneticEngineTest.cs | 1 +
.../Language/Bm/RuleTest.cs | 1 +
.../Language/DaitchMokotoffSoundexTest.cs | 1 +
.../Language/DoubleMetaphone2Test.cs | 1 +
.../Language/DoubleMetaphoneTest.cs | 1 +
.../Language/MatchRatingApproachEncoderTest.cs | 1 +
.../Language/MetaphoneTest.cs | 1 +
.../Language/NysiisTest.cs | 1 +
.../Language/RefinedSoundexTest.cs | 1 +
.../Language/SoundexTest.cs | 1 +
.../Language/StringEncoderAbstractTest.cs | 1 +
src/Lucene.Net.Tests.Facet/FacetTestCase.cs | 1 +
.../Range/TestRangeFacetCounts.cs | 1 +
.../SortedSet/TestSortedSetDocValuesFacets.cs | 21 +--
.../Taxonomy/Directory/TestAddTaxonomy.cs | 1 +
.../Directory/TestConcurrentFacetedIndexing.cs | 1 +
.../Directory/TestDirectoryTaxonomyReader.cs | 1 +
.../Directory/TestDirectoryTaxonomyWriter.cs | 1 +
.../Taxonomy/TestCachedOrdinalsReader.cs | 1 +
.../Taxonomy/TestFacetLabel.cs | 1 +
.../Taxonomy/TestLRUHashMap.cs | 1 +
.../Taxonomy/TestSearcherTaxonomyManager.cs | 1 +
.../Taxonomy/TestTaxonomyCombined.cs | 1 +
.../Taxonomy/TestTaxonomyFacetAssociations.cs | 1 +
.../Taxonomy/TestTaxonomyFacetCounts.cs | 4 +-
.../Taxonomy/TestTaxonomyFacetCounts2.cs | 1 +
.../Taxonomy/TestTaxonomyFacetSumValueSource.cs | 49 +++--
.../Taxonomy/WriterCache/TestCharBlockArray.cs | 11 +-
src/Lucene.Net.Tests.Facet/TestDrillDownQuery.cs | 27 ++-
src/Lucene.Net.Tests.Facet/TestDrillSideways.cs | 54 +++---
src/Lucene.Net.Tests.Facet/TestFacetsConfig.cs | 1 +
.../TestMultipleIndexFields.cs | 3 +-
.../TestRandomSamplingFacetsCollector.cs | 26 ++-
.../Suggest/Fst/FSTCompletionTest.cs | 25 +--
.../Lucene.Net.Tests.TestFramework.csproj | 2 +-
.../Analysis/TestCachingTokenFilter.cs | 5 +-
src/Lucene.Net.Tests/Analysis/TestCharFilter.cs | 7 +-
src/Lucene.Net.Tests/Analysis/TestMockAnalyzer.cs | 9 +-
.../Analysis/TestNumericTokenStream.cs | 6 +-
.../Analysis/TestReusableStringReader.cs | 3 +-
src/Lucene.Net.Tests/Analysis/TestToken.cs | 5 +-
.../TokenAttributes/TestCharTermAttributeImpl.cs | 2 +-
.../TokenAttributes/TestSimpleAttributeImpl.cs | 5 +-
.../Compressing/AbstractTestCompressionMode.cs | 9 +-
.../Compressing/AbstractTestLZ4CompressionMode.cs | 1 +
.../TestCompressingStoredFieldsFormat.cs | 1 +
.../TestCompressingTermVectorsFormat.cs | 4 +-
.../Codecs/Lucene3x/TestSurrogates.cs | 1 +
.../Codecs/Lucene3x/TestTermInfosReaderIndex.cs | 2 +-
.../Codecs/Lucene40/TestBitVector.cs | 5 +-
.../Codecs/Lucene40/TestReuseDocsEnum.cs | 5 +-
.../Codecs/Lucene41/TestBlockPostingsFormat3.cs | 4 +-
.../Codecs/Lucene41/TestForUtil.cs | 9 +-
.../Codecs/PerField/TestPerFieldDocValuesFormat.cs | 1 +
.../Codecs/PerField/TestPerFieldPostingsFormat2.cs | 1 +
.../Document/TestBinaryDocument.cs | 1 +
src/Lucene.Net.Tests/Document/TestDateTools.cs | 1 +
src/Lucene.Net.Tests/Document/TestDocument.cs | 1 +
src/Lucene.Net.Tests/Document/TestField.cs | 1 +
.../Index/Test2BBinaryDocValues.cs | 1 +
src/Lucene.Net.Tests/Index/Test2BDocs.cs | 1 +
.../Index/Test2BNumericDocValues.cs | 1 +
.../Index/Test2BSortedDocValues.cs | 1 +
src/Lucene.Net.Tests/Index/Test4GBStoredFields.cs | 1 +
src/Lucene.Net.Tests/Index/TestAddIndexes.cs | 1 +
.../Index/TestAllFilesHaveCodecHeader.cs | 1 +
src/Lucene.Net.Tests/Index/TestAtomicUpdate.cs | 1 +
.../Index/TestBackwardsCompatibility.cs | 2 +-
.../Index/TestBackwardsCompatibility3x.cs | 2 +-
src/Lucene.Net.Tests/Index/TestBagOfPositions.cs | 2 +-
src/Lucene.Net.Tests/Index/TestBagOfPostings.cs | 8 +-
.../Index/TestBinaryDocValuesUpdates.cs | 1 +
src/Lucene.Net.Tests/Index/TestBinaryTerms.cs | 1 +
src/Lucene.Net.Tests/Index/TestByteSlices.cs | 1 +
src/Lucene.Net.Tests/Index/TestCheckIndex.cs | 1 +
src/Lucene.Net.Tests/Index/TestCodecs.cs | 1 +
src/Lucene.Net.Tests/Index/TestCompoundFile.cs | 5 +-
.../Index/TestConcurrentMergeScheduler.cs | 1 +
.../Index/TestConsistentFieldNumbers.cs | 1 +
src/Lucene.Net.Tests/Index/TestCrash.cs | 1 +
.../Index/TestCrashCausesCorruptIndex.cs | 1 +
src/Lucene.Net.Tests/Index/TestCustomNorms.cs | 1 +
src/Lucene.Net.Tests/Index/TestDeletionPolicy.cs | 3 +-
src/Lucene.Net.Tests/Index/TestDirectoryReader.cs | 1 +
.../Index/TestDirectoryReaderReopen.cs | 1 +
src/Lucene.Net.Tests/Index/TestDoc.cs | 1 +
src/Lucene.Net.Tests/Index/TestDocCount.cs | 5 +-
src/Lucene.Net.Tests/Index/TestDocTermOrds.cs | 1 +
.../Index/TestDocValuesIndexing.cs | 1 +
.../Index/TestDocValuesWithThreads.cs | 1 +
src/Lucene.Net.Tests/Index/TestDocsAndPositions.cs | 1 +
src/Lucene.Net.Tests/Index/TestDocumentWriter.cs | 10 +-
.../Index/TestDocumentsWriterDeleteQueue.cs | 3 +-
src/Lucene.Net.Tests/Index/TestFieldInfos.cs | 5 +-
src/Lucene.Net.Tests/Index/TestFieldsReader.cs | 1 +
.../Index/TestFilterAtomicReader.cs | 8 +-
src/Lucene.Net.Tests/Index/TestFlex.cs | 1 +
.../Index/TestFlushByRamOrCountsPolicy.cs | 1 +
src/Lucene.Net.Tests/Index/TestIndexCommit.cs | 4 +-
src/Lucene.Net.Tests/Index/TestIndexInput.cs | 6 +-
src/Lucene.Net.Tests/Index/TestIndexReaderClose.cs | 1 +
src/Lucene.Net.Tests/Index/TestIndexWriter.cs | 10 +-
.../Index/TestIndexWriterCommit.cs | 1 +
.../Index/TestIndexWriterConfig.cs | 1 +
.../Index/TestIndexWriterDelete.cs | 5 +-
.../Index/TestIndexWriterExceptions.cs | 3 +-
.../Index/TestIndexWriterForceMerge.cs | 1 +
.../Index/TestIndexWriterMergePolicy.cs | 1 +
.../Index/TestIndexWriterMerging.cs | 1 +
.../Index/TestIndexWriterOnDiskFull.cs | 1 +
.../Index/TestIndexWriterReader.cs | 4 +-
.../Index/TestIndexWriterUnicode.cs | 1 +
.../Index/TestIndexWriterWithThreads.cs | 2 +
src/Lucene.Net.Tests/Index/TestIndexableField.cs | 1 +
src/Lucene.Net.Tests/Index/TestIntBlockPool.cs | 7 +-
src/Lucene.Net.Tests/Index/TestIsCurrent.cs | 8 +-
src/Lucene.Net.Tests/Index/TestLazyProxSkipping.cs | 1 +
src/Lucene.Net.Tests/Index/TestLongPostings.cs | 1 +
src/Lucene.Net.Tests/Index/TestMaxTermFrequency.cs | 1 +
src/Lucene.Net.Tests/Index/TestMixedCodecs.cs | 1 +
.../Index/TestMixedDocValuesUpdates.cs | 1 +
src/Lucene.Net.Tests/Index/TestMultiDocValues.cs | 6 +-
src/Lucene.Net.Tests/Index/TestMultiFields.cs | 1 +
.../Index/TestMultiLevelSkipList.cs | 1 +
src/Lucene.Net.Tests/Index/TestNRTThreads.cs | 2 +-
src/Lucene.Net.Tests/Index/TestNoDeletionPolicy.cs | 1 +
src/Lucene.Net.Tests/Index/TestNorms.cs | 1 +
.../Index/TestNumericDocValuesUpdates.cs | 3 +-
src/Lucene.Net.Tests/Index/TestOmitNorms.cs | 1 +
src/Lucene.Net.Tests/Index/TestOmitPositions.cs | 1 +
src/Lucene.Net.Tests/Index/TestOmitTf.cs | 1 +
.../Index/TestParallelAtomicReader.cs | 8 +-
.../Index/TestParallelCompositeReader.cs | 1 +
.../Index/TestParallelReaderEmptyIndex.cs | 1 +
src/Lucene.Net.Tests/Index/TestParallelTermEnum.cs | 3 +-
src/Lucene.Net.Tests/Index/TestPayloads.cs | 1 +
.../Index/TestPayloadsOnVectors.cs | 1 +
.../Index/TestPerSegmentDeletes.cs | 1 +
.../Index/TestPersistentSnapshotDeletionPolicy.cs | 12 +-
src/Lucene.Net.Tests/Index/TestPostingsOffsets.cs | 1 +
src/Lucene.Net.Tests/Index/TestPrefixCodedTerms.cs | 1 +
src/Lucene.Net.Tests/Index/TestRollback.cs | 1 +
src/Lucene.Net.Tests/Index/TestRollingUpdates.cs | 1 +
src/Lucene.Net.Tests/Index/TestSegmentMerger.cs | 1 +
src/Lucene.Net.Tests/Index/TestSegmentReader.cs | 1 +
src/Lucene.Net.Tests/Index/TestSegmentTermDocs.cs | 1 +
src/Lucene.Net.Tests/Index/TestSegmentTermEnum.cs | 1 +
.../Index/TestSizeBoundedForceMerge.cs | 1 +
.../Index/TestSnapshotDeletionPolicy.cs | 1 +
src/Lucene.Net.Tests/Index/TestStressAdvance.cs | 14 +-
src/Lucene.Net.Tests/Index/TestStressIndexing2.cs | 1 +
src/Lucene.Net.Tests/Index/TestSumDocFreq.cs | 1 +
src/Lucene.Net.Tests/Index/TestTerm.cs | 5 +-
.../Index/TestTermVectorsReader.cs | 1 +
.../Index/TestTermVectorsWriter.cs | 1 +
src/Lucene.Net.Tests/Index/TestTermsEnum.cs | 1 +
src/Lucene.Net.Tests/Index/TestTermsEnum2.cs | 2 +-
.../Index/TestThreadedForceMerge.cs | 1 +
.../Index/TestTieredMergePolicy.cs | 1 +
.../Index/TestTransactionRollback.cs | 8 +-
src/Lucene.Net.Tests/Index/TestTryDelete.cs | 1 +
src/Lucene.Net.Tests/Search/BaseTestRangeFilter.cs | 1 +
.../Search/FuzzyTermOnShortTermsTest.cs | 1 +
.../Search/Payloads/TestPayloadNearQuery.cs | 1 +
.../Search/Similarities/TestSimilarity2.cs | 3 +-
.../Search/Similarities/TestSimilarityBase.cs | 3 +-
src/Lucene.Net.Tests/Search/Spans/TestBasics.cs | 10 +-
.../Search/Spans/TestFieldMaskingSpanQuery.cs | 1 +
.../Search/Spans/TestNearSpansOrdered.cs | 1 +
.../Search/Spans/TestPayloadSpans.cs | 1 +
.../Search/Spans/TestSpanFirstQuery.cs | 34 ++--
.../Search/Spans/TestSpanMultiTermQueryWrapper.cs | 3 +-
src/Lucene.Net.Tests/Search/Spans/TestSpans.cs | 1 +
.../Search/Spans/TestSpansAdvanced.cs | 1 +
.../Search/Spans/TestSpansAdvanced2.cs | 1 +
src/Lucene.Net.Tests/Search/TestAutomatonQuery.cs | 1 +
.../Search/TestAutomatonQueryUnicode.cs | 3 +-
src/Lucene.Net.Tests/Search/TestBoolean2.cs | 1 +
.../Search/TestBooleanMinShouldMatch.cs | 4 +-
src/Lucene.Net.Tests/Search/TestBooleanOr.cs | 1 +
src/Lucene.Net.Tests/Search/TestBooleanQuery.cs | 14 +-
.../Search/TestBooleanQueryVisitSubscorers.cs | 1 +
src/Lucene.Net.Tests/Search/TestBooleanScorer.cs | 11 +-
.../Search/TestCachingCollector.cs | 7 +-
.../Search/TestCachingWrapperFilter.cs | 1 +
src/Lucene.Net.Tests/Search/TestConjunctions.cs | 1 +
.../Search/TestConstantScoreQuery.cs | 5 +-
.../Search/TestCustomSearcherSort.cs | 5 +-
src/Lucene.Net.Tests/Search/TestDateFilter.cs | 5 +-
.../Search/TestDisjunctionMaxQuery.cs | 1 +
src/Lucene.Net.Tests/Search/TestDocIdSet.cs | 10 +-
.../Search/TestDocTermOrdsRewriteMethod.cs | 1 +
.../Search/TestDocValuesScoring.cs | 9 +-
.../Search/TestElevationComparator.cs | 1 +
src/Lucene.Net.Tests/Search/TestFieldCache.cs | 7 +-
.../Search/TestFieldCacheRangeFilter.cs | 1 +
.../Search/TestFieldCacheRewriteMethod.cs | 4 +-
.../Search/TestFieldCacheTermsFilter.cs | 5 +-
.../Search/TestFieldValueFilter.cs | 4 +-
src/Lucene.Net.Tests/Search/TestFilteredQuery.cs | 1 +
src/Lucene.Net.Tests/Search/TestFilteredSearch.cs | 1 +
src/Lucene.Net.Tests/Search/TestFuzzyQuery.cs | 7 +-
src/Lucene.Net.Tests/Search/TestLiveFieldValues.cs | 1 +
.../Search/TestMatchAllDocsQuery.cs | 1 +
src/Lucene.Net.Tests/Search/TestMinShouldMatch2.cs | 1 +
.../Search/TestMultiPhraseQuery.cs | 1 +
.../Search/TestMultiTermConstantScore.cs | 122 ++++++-------
.../Search/TestMultiTermQueryRewrites.cs | 8 +-
.../Search/TestMultiValuedNumericRangeQuery.cs | 1 +
.../Search/TestNGramPhraseQuery.cs | 4 +-
src/Lucene.Net.Tests/Search/TestNot.cs | 3 +-
.../Search/TestNumericRangeQuery32.cs | 1 +
.../Search/TestNumericRangeQuery64.cs | 1 +
.../Search/TestPhrasePrefixQuery.cs | 3 +-
src/Lucene.Net.Tests/Search/TestPhraseQuery.cs | 1 +
.../Search/TestPositionIncrement.cs | 3 +-
.../Search/TestPositiveScoresOnlyCollector.cs | 4 +-
src/Lucene.Net.Tests/Search/TestPrefixFilter.cs | 3 +-
.../Search/TestPrefixInBooleanQuery.cs | 3 +-
src/Lucene.Net.Tests/Search/TestPrefixQuery.cs | 3 +-
src/Lucene.Net.Tests/Search/TestQueryRescorer.cs | 8 +-
.../Search/TestQueryWrapperFilter.cs | 1 +
src/Lucene.Net.Tests/Search/TestRegexpQuery.cs | 8 +-
src/Lucene.Net.Tests/Search/TestRegexpRandom.cs | 1 +
.../Search/TestSameScoresWithThreads.cs | 2 +-
.../Search/TestScoreCachingWrappingScorer.cs | 5 +-
src/Lucene.Net.Tests/Search/TestScorerPerf.cs | 6 +-
src/Lucene.Net.Tests/Search/TestSearchAfter.cs | 1 +
src/Lucene.Net.Tests/Search/TestShardSearching.cs | 2 +-
src/Lucene.Net.Tests/Search/TestSimilarity.cs | 1 +
.../Search/TestSloppyPhraseQuery.cs | 1 +
src/Lucene.Net.Tests/Search/TestSort.cs | 1 +
src/Lucene.Net.Tests/Search/TestSortDocValues.cs | 4 +-
src/Lucene.Net.Tests/Search/TestSortRandom.cs | 1 +
src/Lucene.Net.Tests/Search/TestSortRescorer.cs | 9 +-
src/Lucene.Net.Tests/Search/TestSubScorerFreqs.cs | 22 +--
src/Lucene.Net.Tests/Search/TestTermRangeFilter.cs | 5 +-
src/Lucene.Net.Tests/Search/TestTermRangeQuery.cs | 1 +
src/Lucene.Net.Tests/Search/TestTermVectors.cs | 1 +
.../Search/TestTopDocsCollector.cs | 4 +-
src/Lucene.Net.Tests/Search/TestTopDocsMerge.cs | 10 +-
.../Search/TestTopFieldCollector.cs | 3 +-
.../Search/TestTopScoreDocCollector.cs | 4 +-
.../Search/TestTotalHitCountCollector.cs | 3 +-
src/Lucene.Net.Tests/Search/TestWildcard.cs | 1 +
src/Lucene.Net.Tests/Search/TestWildcardRandom.cs | 1 +
src/Lucene.Net.Tests/Store/TestBufferedChecksum.cs | 1 +
.../Store/TestBufferedIndexInput.cs | 1 +
.../Store/TestByteArrayDataInput.cs | 1 +
src/Lucene.Net.Tests/Store/TestCopyBytes.cs | 1 +
src/Lucene.Net.Tests/Store/TestDirectory.cs | 1 +
.../Store/TestFileSwitchDirectory.cs | 3 +-
src/Lucene.Net.Tests/Store/TestHugeRamFile.cs | 1 +
src/Lucene.Net.Tests/Store/TestLock.cs | 1 +
src/Lucene.Net.Tests/Store/TestLockFactory.cs | 1 +
src/Lucene.Net.Tests/Store/TestMultiMMap.cs | 1 +
.../Store/TestNRTCachingDirectory.cs | 2 +-
src/Lucene.Net.Tests/Store/TestRAMDirectory.cs | 1 +
src/Lucene.Net.Tests/Support/TestCRC32.cs | 1 +
src/Lucene.Net.Tests/Support/TestOldPatches.cs | 9 +-
src/Lucene.Net.Tests/Support/TestSerialization.cs | 10 +-
src/Lucene.Net.Tests/Support/TestWeakDictionary.cs | 1 +
.../Support/TestWeakDictionaryBehavior.cs | 1 +
src/Lucene.Net.Tests/TestDemo.cs | 44 ++---
src/Lucene.Net.Tests/TestExternalCodecs.cs | 33 ++--
src/Lucene.Net.Tests/TestSearch.cs | 31 ++--
src/Lucene.Net.Tests/TestSearchForDuplicates.cs | 31 ++--
src/Lucene.Net.Tests/Util/BaseSortTestCase.cs | 1 +
src/Lucene.Net.Tests/Util/Fst/TestBytesStore.cs | 1 +
src/Lucene.Net.Tests/Util/Fst/TestFSTs.cs | 3 +-
.../Util/Packed/TestEliasFanoSequence.cs | 2 +
src/Lucene.Net.Tests/Util/Packed/TestPackedInts.cs | 1 +
src/Lucene.Net.Tests/Util/TestArrayUtil.cs | 2 +-
src/Lucene.Net.Tests/Util/TestAttributeSource.cs | 6 +-
src/Lucene.Net.Tests/Util/TestBroadWord.cs | 2 +-
src/Lucene.Net.Tests/Util/TestByteBlockPool.cs | 2 +-
src/Lucene.Net.Tests/Util/TestBytesRef.cs | 1 +
src/Lucene.Net.Tests/Util/TestBytesRefArray.cs | 4 +-
src/Lucene.Net.Tests/Util/TestBytesRefHash.cs | 1 +
src/Lucene.Net.Tests/Util/TestCharsRef.cs | 2 +-
src/Lucene.Net.Tests/Util/TestCollectionUtil.cs | 16 +-
.../Util/TestFieldCacheSanityChecker.cs | 1 +
src/Lucene.Net.Tests/Util/TestFilterIterator.cs | 4 +-
src/Lucene.Net.Tests/Util/TestFixedBitSet.cs | 7 +-
src/Lucene.Net.Tests/Util/TestIdentityHashSet.cs | 1 +
.../Util/TestIndexableBinaryStringTools.cs | 1 +
src/Lucene.Net.Tests/Util/TestIntsRef.cs | 1 +
src/Lucene.Net.Tests/Util/TestLongBitSet.cs | 2 +-
src/Lucene.Net.Tests/Util/TestMathUtil.cs | 1 +
src/Lucene.Net.Tests/Util/TestMergedIterator.cs | 1 +
src/Lucene.Net.Tests/Util/TestNumericUtils.cs | 2 +-
src/Lucene.Net.Tests/Util/TestOfflineSorter.cs | 28 ++-
src/Lucene.Net.Tests/Util/TestOpenBitSet.cs | 1 +
src/Lucene.Net.Tests/Util/TestPForDeltaDocIdSet.cs | 1 +
src/Lucene.Net.Tests/Util/TestPagedBytes.cs | 8 +-
src/Lucene.Net.Tests/Util/TestPriorityQueue.cs | 1 +
src/Lucene.Net.Tests/Util/TestQueryBuilder.cs | 1 +
.../Util/TestRecyclingByteBlockAllocator.cs | 1 +
.../Util/TestRecyclingIntBlockAllocator.cs | 1 +
src/Lucene.Net.Tests/Util/TestRollingBuffer.cs | 1 +
src/Lucene.Net.Tests/Util/TestSentinelIntSet.cs | 1 +
src/Lucene.Net.Tests/Util/TestSetOnce.cs | 1 +
src/Lucene.Net.Tests/Util/TestSloppyMath.cs | 1 +
src/Lucene.Net.Tests/Util/TestSmallFloat.cs | 1 +
src/Lucene.Net.Tests/Util/TestStringHelper.cs | 1 +
src/Lucene.Net.Tests/Util/TestUnicodeUtil.cs | 1 +
src/Lucene.Net.Tests/Util/TestVersion.cs | 1 +
src/Lucene.Net.Tests/Util/TestVirtualMethod.cs | 1 +
src/Lucene.Net.Tests/Util/TestWAH8DocIdSet.cs | 1 +
src/Lucene.Net/Util/OfflineSorter.cs | 11 +-
src/Lucene.Net/Util/Packed/EliasFanoDecoder.cs | 2 +-
.../Lucene.Net.Tests.CodeAnalysis.csproj | 2 +-
.../Support/TestJDKBreakIterator.cs | 1 +
326 files changed, 1051 insertions(+), 604 deletions(-)
[lucenenet] 26/26: run-tests-on-os.yml: Added task to install .NET
Core SDK 2.1
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 cc63141bedaf6db47a8644a5ad8f2cf62c90fbeb
Author: Shad Storhaug <sh...@shadstorhaug.com>
AuthorDate: Wed Jun 24 22:50:12 2020 +0700
run-tests-on-os.yml: Added task to install .NET Core SDK 2.1
---
build/azure-templates/run-tests-on-os.yml | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/build/azure-templates/run-tests-on-os.yml b/build/azure-templates/run-tests-on-os.yml
index f46698e..5b20620 100644
--- a/build/azure-templates/run-tests-on-os.yml
+++ b/build/azure-templates/run-tests-on-os.yml
@@ -58,6 +58,12 @@ steps:
version: 3.1.301
condition: and(succeeded(), contains('${{ parameters.framework }}', 'netcoreapp3.'))
+- task: UseDotNet@2
+ displayName: 'Use .NET Core sdk 2.1.807'
+ inputs:
+ version: 2.1.807
+ condition: and(succeeded(), contains('${{ parameters.framework }}', 'netcoreapp2.'))
+
- task: DownloadBuildArtifacts@0
displayName: 'Download Build Artifacts: ${{ parameters.binaryArtifactName }}'
inputs:
[lucenenet] 20/26: Lucene.Net.Tests.Facet: Switched to using the
Assert class from the test framework instead of NUnit (#295, #261)
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 539eb8500269d6beea0c810948bbfa82802a612f
Author: Shad Storhaug <sh...@shadstorhaug.com>
AuthorDate: Wed Jun 24 12:33:13 2020 +0700
Lucene.Net.Tests.Facet: Switched to using the Assert class from the test framework instead of NUnit (#295, #261)
---
src/Lucene.Net.Tests.Facet/FacetTestCase.cs | 1 +
.../Range/TestRangeFacetCounts.cs | 1 +
.../SortedSet/TestSortedSetDocValuesFacets.cs | 21 ++++-----
.../Taxonomy/Directory/TestAddTaxonomy.cs | 1 +
.../Directory/TestConcurrentFacetedIndexing.cs | 1 +
.../Directory/TestDirectoryTaxonomyReader.cs | 1 +
.../Directory/TestDirectoryTaxonomyWriter.cs | 1 +
.../Taxonomy/TestCachedOrdinalsReader.cs | 1 +
.../Taxonomy/TestFacetLabel.cs | 1 +
.../Taxonomy/TestLRUHashMap.cs | 1 +
.../Taxonomy/TestSearcherTaxonomyManager.cs | 1 +
.../Taxonomy/TestTaxonomyCombined.cs | 1 +
.../Taxonomy/TestTaxonomyFacetAssociations.cs | 1 +
.../Taxonomy/TestTaxonomyFacetCounts.cs | 4 +-
.../Taxonomy/TestTaxonomyFacetCounts2.cs | 1 +
.../Taxonomy/TestTaxonomyFacetSumValueSource.cs | 49 +++++++++-----------
.../Taxonomy/WriterCache/TestCharBlockArray.cs | 1 +
src/Lucene.Net.Tests.Facet/TestDrillDownQuery.cs | 27 ++++++-----
src/Lucene.Net.Tests.Facet/TestDrillSideways.cs | 54 +++++++++++-----------
src/Lucene.Net.Tests.Facet/TestFacetsConfig.cs | 1 +
.../TestMultipleIndexFields.cs | 3 +-
.../TestRandomSamplingFacetsCollector.cs | 26 +++++------
22 files changed, 104 insertions(+), 95 deletions(-)
diff --git a/src/Lucene.Net.Tests.Facet/FacetTestCase.cs b/src/Lucene.Net.Tests.Facet/FacetTestCase.cs
index 08eeb9f..1cbb155 100644
--- a/src/Lucene.Net.Tests.Facet/FacetTestCase.cs
+++ b/src/Lucene.Net.Tests.Facet/FacetTestCase.cs
@@ -3,6 +3,7 @@ using NUnit.Framework;
using System;
using System.Collections.Generic;
using System.Diagnostics;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Facet
diff --git a/src/Lucene.Net.Tests.Facet/Range/TestRangeFacetCounts.cs b/src/Lucene.Net.Tests.Facet/Range/TestRangeFacetCounts.cs
index 3a17613..50b17b9 100644
--- a/src/Lucene.Net.Tests.Facet/Range/TestRangeFacetCounts.cs
+++ b/src/Lucene.Net.Tests.Facet/Range/TestRangeFacetCounts.cs
@@ -4,6 +4,7 @@ using System.Diagnostics;
using System.Collections;
using System.Collections.Generic;
using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Facet.Range
diff --git a/src/Lucene.Net.Tests.Facet/SortedSet/TestSortedSetDocValuesFacets.cs b/src/Lucene.Net.Tests.Facet/SortedSet/TestSortedSetDocValuesFacets.cs
index 3c17a44..9aa1dce 100644
--- a/src/Lucene.Net.Tests.Facet/SortedSet/TestSortedSetDocValuesFacets.cs
+++ b/src/Lucene.Net.Tests.Facet/SortedSet/TestSortedSetDocValuesFacets.cs
@@ -1,10 +1,7 @@
-using System;
-using System.Collections;
+using NUnit.Framework;
+using System;
using System.Collections.Generic;
-using System.Linq;
-using Lucene.Net.Randomized;
-using Lucene.Net.Randomized.Generators;
-using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Facet.SortedSet
@@ -28,20 +25,20 @@ namespace Lucene.Net.Facet.SortedSet
*/
+ using Directory = Lucene.Net.Store.Directory;
using Document = Lucene.Net.Documents.Document;
using Field = Lucene.Net.Documents.Field;
using IndexReader = Lucene.Net.Index.IndexReader;
+ using IndexSearcher = Lucene.Net.Search.IndexSearcher;
+ using IOUtils = Lucene.Net.Util.IOUtils;
+ using MatchAllDocsQuery = Lucene.Net.Search.MatchAllDocsQuery;
using RandomIndexWriter = Lucene.Net.Index.RandomIndexWriter;
using SlowCompositeReaderWrapper = Lucene.Net.Index.SlowCompositeReaderWrapper;
using Term = Lucene.Net.Index.Term;
- using IndexSearcher = Lucene.Net.Search.IndexSearcher;
- using MatchAllDocsQuery = Lucene.Net.Search.MatchAllDocsQuery;
using TermQuery = Lucene.Net.Search.TermQuery;
- using TopDocs = Lucene.Net.Search.TopDocs;
- using Directory = Lucene.Net.Store.Directory;
- using IOUtils = Lucene.Net.Util.IOUtils;
using TestUtil = Lucene.Net.Util.TestUtil;
-
+ using TopDocs = Lucene.Net.Search.TopDocs;
+
[TestFixture]
public class TestSortedSetDocValuesFacets : FacetTestCase
{
diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestAddTaxonomy.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestAddTaxonomy.cs
index bd30b65..a7b0ebe 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestAddTaxonomy.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestAddTaxonomy.cs
@@ -3,6 +3,7 @@ using J2N.Threading.Atomic;
using NUnit.Framework;
using System;
using System.IO;
+using Assert = Lucene.Net.TestFramework.Assert;
using JCG = J2N.Collections.Generic;
namespace Lucene.Net.Facet.Taxonomy.Directory
diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestConcurrentFacetedIndexing.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestConcurrentFacetedIndexing.cs
index 59a9076..d71225c 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestConcurrentFacetedIndexing.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestConcurrentFacetedIndexing.cs
@@ -3,6 +3,7 @@ using System;
using System.Collections.Concurrent;
using System.IO;
using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
using J2N.Threading;
diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestDirectoryTaxonomyReader.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestDirectoryTaxonomyReader.cs
index 1f6e26a..0909d9f 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestDirectoryTaxonomyReader.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestDirectoryTaxonomyReader.cs
@@ -1,6 +1,7 @@
using Lucene.Net.Index.Extensions;
using NUnit.Framework;
using System;
+using Assert = Lucene.Net.TestFramework.Assert;
using JCG = J2N.Collections.Generic;
namespace Lucene.Net.Facet.Taxonomy.Directory
diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestDirectoryTaxonomyWriter.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestDirectoryTaxonomyWriter.cs
index b1eaa3e..b134ae1 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestDirectoryTaxonomyWriter.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestDirectoryTaxonomyWriter.cs
@@ -5,6 +5,7 @@ using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.IO;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Facet.Taxonomy.Directory
diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/TestCachedOrdinalsReader.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/TestCachedOrdinalsReader.cs
index 6914b6e..b9d65b9 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/TestCachedOrdinalsReader.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/TestCachedOrdinalsReader.cs
@@ -2,6 +2,7 @@
using NUnit.Framework;
using System;
using System.IO;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Facet.Taxonomy
{
diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/TestFacetLabel.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/TestFacetLabel.cs
index ef5b5b1..8aaaa93 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/TestFacetLabel.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/TestFacetLabel.cs
@@ -1,6 +1,7 @@
using System;
using Lucene.Net.Support;
using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Facet.Taxonomy
{
diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/TestLRUHashMap.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/TestLRUHashMap.cs
index e19a900..84eb441 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/TestLRUHashMap.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/TestLRUHashMap.cs
@@ -1,4 +1,5 @@
using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Facet.Taxonomy
{
diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/TestSearcherTaxonomyManager.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/TestSearcherTaxonomyManager.cs
index 9e848a2..36a93fb 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/TestSearcherTaxonomyManager.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/TestSearcherTaxonomyManager.cs
@@ -9,6 +9,7 @@ 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;
namespace Lucene.Net.Facet.Taxonomy
diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyCombined.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyCombined.cs
index 2a96413..27c8be9 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyCombined.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyCombined.cs
@@ -7,6 +7,7 @@ using System;
using System.Collections.Generic;
using System.Text;
using System.Threading;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Facet.Taxonomy
{
diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetAssociations.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetAssociations.cs
index 35c40db..3bff8a2 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetAssociations.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetAssociations.cs
@@ -1,4 +1,5 @@
using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Facet.Taxonomy
{
diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts.cs
index 59f1b1b..aeeee70 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts.cs
@@ -4,6 +4,8 @@ using NUnit.Framework;
using System;
using System.Collections.Generic;
using System.IO;
+using System.Text;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
using JCG = J2N.Collections.Generic;
@@ -27,8 +29,6 @@ namespace Lucene.Net.Facet.Taxonomy
* limitations under the License.
*/
-
- using System.Text;
using DefaultSimilarity = Lucene.Net.Search.Similarities.DefaultSimilarity;
using DirectoryReader = Lucene.Net.Index.DirectoryReader;
using DirectoryTaxonomyReader = Lucene.Net.Facet.Taxonomy.Directory.DirectoryTaxonomyReader;
diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts2.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts2.cs
index aca39cd..dba7829 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts2.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts2.cs
@@ -3,6 +3,7 @@ using Lucene.Net.Support;
using NUnit.Framework;
using System;
using System.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Facet.Taxonomy
{
diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetSumValueSource.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetSumValueSource.cs
index 319d61a..6d35016 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetSumValueSource.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetSumValueSource.cs
@@ -1,10 +1,9 @@
using System;
-using System.Diagnostics;
using System.Collections;
using System.Collections.Generic;
+using System.Diagnostics;
using System.IO;
-using System.Linq;
-using Lucene.Net.Randomized.Generators;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Facet.Taxonomy
@@ -28,40 +27,38 @@ namespace Lucene.Net.Facet.Taxonomy
*/
- using MockAnalyzer = Lucene.Net.Analysis.MockAnalyzer;
- using Document = Lucene.Net.Documents.Document;
- using Field = Lucene.Net.Documents.Field;
- using SingleDocValuesField = Lucene.Net.Documents.SingleDocValuesField;
- using Int32Field = Lucene.Net.Documents.Int32Field;
- using NumericDocValuesField = Lucene.Net.Documents.NumericDocValuesField;
- using StringField = Lucene.Net.Documents.StringField;
- using DirectoryTaxonomyReader = Lucene.Net.Facet.Taxonomy.Directory.DirectoryTaxonomyReader;
- using DirectoryTaxonomyWriter = Lucene.Net.Facet.Taxonomy.Directory.DirectoryTaxonomyWriter;
+ using NUnit.Framework;
using AtomicReaderContext = Lucene.Net.Index.AtomicReaderContext;
+ using ConstantScoreQuery = Lucene.Net.Search.ConstantScoreQuery;
using DirectoryReader = Lucene.Net.Index.DirectoryReader;
- using IndexWriter = Lucene.Net.Index.IndexWriter;
- using IndexWriterConfig = Lucene.Net.Index.IndexWriterConfig;
- using RandomIndexWriter = Lucene.Net.Index.RandomIndexWriter;
- using Term = Lucene.Net.Index.Term;
+ using DirectoryTaxonomyReader = Lucene.Net.Facet.Taxonomy.Directory.DirectoryTaxonomyReader;
+ using DirectoryTaxonomyWriter = Lucene.Net.Facet.Taxonomy.Directory.DirectoryTaxonomyWriter;
+ using Document = Lucene.Net.Documents.Document;
+ using DoubleDocValues = Lucene.Net.Queries.Function.DocValues.DoubleDocValues;
+ using Field = Lucene.Net.Documents.Field;
using FunctionQuery = Lucene.Net.Queries.Function.FunctionQuery;
using FunctionValues = Lucene.Net.Queries.Function.FunctionValues;
- using ValueSource = Lucene.Net.Queries.Function.ValueSource;
- using DoubleDocValues = Lucene.Net.Queries.Function.DocValues.DoubleDocValues;
- using SingleFieldSource = Lucene.Net.Queries.Function.ValueSources.SingleFieldSource;
+ using IndexSearcher = Lucene.Net.Search.IndexSearcher;
+ using IndexWriter = Lucene.Net.Index.IndexWriter;
+ using Int32Field = Lucene.Net.Documents.Int32Field;
using Int32FieldSource = Lucene.Net.Queries.Function.ValueSources.Int32FieldSource;
using Int64FieldSource = Lucene.Net.Queries.Function.ValueSources.Int64FieldSource;
- using ConstantScoreQuery = Lucene.Net.Search.ConstantScoreQuery;
- using IndexSearcher = Lucene.Net.Search.IndexSearcher;
+ using IOUtils = Lucene.Net.Util.IOUtils;
using MatchAllDocsQuery = Lucene.Net.Search.MatchAllDocsQuery;
+ using MockAnalyzer = Lucene.Net.Analysis.MockAnalyzer;
+ using NumericDocValuesField = Lucene.Net.Documents.NumericDocValuesField;
+ using OpenMode = Lucene.Net.Index.OpenMode;
using Query = Lucene.Net.Search.Query;
+ using RandomIndexWriter = Lucene.Net.Index.RandomIndexWriter;
using Scorer = Lucene.Net.Search.Scorer;
+ using SingleDocValuesField = Lucene.Net.Documents.SingleDocValuesField;
+ using SingleFieldSource = Lucene.Net.Queries.Function.ValueSources.SingleFieldSource;
+ using StringField = Lucene.Net.Documents.StringField;
+ using Term = Lucene.Net.Index.Term;
using TermQuery = Lucene.Net.Search.TermQuery;
- using TopDocs = Lucene.Net.Search.TopDocs;
- using Directory = Lucene.Net.Store.Directory;
- using IOUtils = Lucene.Net.Util.IOUtils;
using TestUtil = Lucene.Net.Util.TestUtil;
- using OpenMode = Lucene.Net.Index.OpenMode;
- using NUnit.Framework;
+ using TopDocs = Lucene.Net.Search.TopDocs;
+ using ValueSource = Lucene.Net.Queries.Function.ValueSource;
[TestFixture]
public class TestTaxonomyFacetSumValueSource : FacetTestCase
{
diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/WriterCache/TestCharBlockArray.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/WriterCache/TestCharBlockArray.cs
index bd98b75..b291ff7 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/WriterCache/TestCharBlockArray.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/WriterCache/TestCharBlockArray.cs
@@ -2,6 +2,7 @@
using NUnit.Framework;
using System.IO;
using System.Text;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Facet.Taxonomy.WriterCache
{
diff --git a/src/Lucene.Net.Tests.Facet/TestDrillDownQuery.cs b/src/Lucene.Net.Tests.Facet/TestDrillDownQuery.cs
index f6ee4b1..e2b5be7 100644
--- a/src/Lucene.Net.Tests.Facet/TestDrillDownQuery.cs
+++ b/src/Lucene.Net.Tests.Facet/TestDrillDownQuery.cs
@@ -1,7 +1,6 @@
-using System;
-using System.Diagnostics;
-using Lucene.Net.Randomized.Generators;
-using NUnit.Framework;
+using NUnit.Framework;
+using System;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Facet
{
@@ -24,26 +23,26 @@ namespace Lucene.Net.Facet
*/
- using MockAnalyzer = Lucene.Net.Analysis.MockAnalyzer;
- using MockTokenizer = Lucene.Net.Analysis.MockTokenizer;
- using Document = Lucene.Net.Documents.Document;
- using Field = Lucene.Net.Documents.Field;
- using TextField = Lucene.Net.Documents.TextField;
- using ITaxonomyWriter = Lucene.Net.Facet.Taxonomy.ITaxonomyWriter;
+ using Directory = Lucene.Net.Store.Directory;
using DirectoryTaxonomyReader = Lucene.Net.Facet.Taxonomy.Directory.DirectoryTaxonomyReader;
using DirectoryTaxonomyWriter = Lucene.Net.Facet.Taxonomy.Directory.DirectoryTaxonomyWriter;
+ using Document = Lucene.Net.Documents.Document;
+ using Field = Lucene.Net.Documents.Field;
using IndexReader = Lucene.Net.Index.IndexReader;
- using RandomIndexWriter = Lucene.Net.Index.RandomIndexWriter;
- using Term = Lucene.Net.Index.Term;
using IndexSearcher = Lucene.Net.Search.IndexSearcher;
+ using IOUtils = Lucene.Net.Util.IOUtils;
+ using ITaxonomyWriter = Lucene.Net.Facet.Taxonomy.ITaxonomyWriter;
using MatchAllDocsQuery = Lucene.Net.Search.MatchAllDocsQuery;
+ using MockAnalyzer = Lucene.Net.Analysis.MockAnalyzer;
+ using MockTokenizer = Lucene.Net.Analysis.MockTokenizer;
using Query = Lucene.Net.Search.Query;
using QueryUtils = Lucene.Net.Search.QueryUtils;
+ using RandomIndexWriter = Lucene.Net.Index.RandomIndexWriter;
using ScoreDoc = Lucene.Net.Search.ScoreDoc;
+ using Term = Lucene.Net.Index.Term;
using TermQuery = Lucene.Net.Search.TermQuery;
+ using TextField = Lucene.Net.Documents.TextField;
using TopDocs = Lucene.Net.Search.TopDocs;
- using Directory = Lucene.Net.Store.Directory;
- using IOUtils = Lucene.Net.Util.IOUtils;
[TestFixture]
public class TestDrillDownQuery : FacetTestCase
diff --git a/src/Lucene.Net.Tests.Facet/TestDrillSideways.cs b/src/Lucene.Net.Tests.Facet/TestDrillSideways.cs
index 8ea3ad9..2dbf94f 100644
--- a/src/Lucene.Net.Tests.Facet/TestDrillSideways.cs
+++ b/src/Lucene.Net.Tests.Facet/TestDrillSideways.cs
@@ -1,11 +1,14 @@
using J2N.Text;
+using Lucene.Net.Search;
using Lucene.Net.Support;
+using NUnit.Framework;
using System;
-using System.Diagnostics;
using System.Collections.Generic;
+using System.Diagnostics;
using System.Linq;
-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
{
@@ -28,44 +31,43 @@ namespace Lucene.Net.Facet
*/
- using MockAnalyzer = Lucene.Net.Analysis.MockAnalyzer;
- using Document = Lucene.Net.Documents.Document;
- using Field = Lucene.Net.Documents.Field;
- using StringField = Lucene.Net.Documents.StringField;
+ using AtomicReaderContext = Lucene.Net.Index.AtomicReaderContext;
+ using BytesRef = Lucene.Net.Util.BytesRef;
using DefaultSortedSetDocValuesReaderState = Lucene.Net.Facet.SortedSet.DefaultSortedSetDocValuesReaderState;
- using SortedSetDocValuesFacetField = Lucene.Net.Facet.SortedSet.SortedSetDocValuesFacetField;
- using SortedSetDocValuesReaderState = Lucene.Net.Facet.SortedSet.SortedSetDocValuesReaderState;
- using TaxonomyReader = Lucene.Net.Facet.Taxonomy.TaxonomyReader;
+ using Directory = Lucene.Net.Store.Directory;
using DirectoryTaxonomyReader = Lucene.Net.Facet.Taxonomy.Directory.DirectoryTaxonomyReader;
using DirectoryTaxonomyWriter = Lucene.Net.Facet.Taxonomy.Directory.DirectoryTaxonomyWriter;
- using AtomicReaderContext = Lucene.Net.Index.AtomicReaderContext;
- using IndexReader = Lucene.Net.Index.IndexReader;
- using IndexWriterConfig = Lucene.Net.Index.IndexWriterConfig;
- using OpenMode = Lucene.Net.Index.OpenMode;
- using RandomIndexWriter = Lucene.Net.Index.RandomIndexWriter;
- using Term = Lucene.Net.Index.Term;
- using ICollector = Lucene.Net.Search.ICollector;
using DocIdSet = Lucene.Net.Search.DocIdSet;
+ using Document = Lucene.Net.Documents.Document;
+ using Field = Lucene.Net.Documents.Field;
using Filter = Lucene.Net.Search.Filter;
+ using FixedBitSet = Lucene.Net.Util.FixedBitSet;
+ using IBits = Lucene.Net.Util.IBits;
+ using ICollector = Lucene.Net.Search.ICollector;
+ using IndexReader = Lucene.Net.Index.IndexReader;
using IndexSearcher = Lucene.Net.Search.IndexSearcher;
+ using IndexWriterConfig = Lucene.Net.Index.IndexWriterConfig;
+ using InfoStream = Lucene.Net.Util.InfoStream;
+ using InPlaceMergeSorter = Lucene.Net.Util.InPlaceMergeSorter;
+ using IOUtils = Lucene.Net.Util.IOUtils;
using MatchAllDocsQuery = Lucene.Net.Search.MatchAllDocsQuery;
+ using MockAnalyzer = Lucene.Net.Analysis.MockAnalyzer;
+ using OpenMode = Lucene.Net.Index.OpenMode;
using Query = Lucene.Net.Search.Query;
+ using RandomIndexWriter = Lucene.Net.Index.RandomIndexWriter;
using ScoreDoc = Lucene.Net.Search.ScoreDoc;
using Scorer = Lucene.Net.Search.Scorer;
using Sort = Lucene.Net.Search.Sort;
+ using SortedSetDocValuesFacetField = Lucene.Net.Facet.SortedSet.SortedSetDocValuesFacetField;
+ using SortedSetDocValuesReaderState = Lucene.Net.Facet.SortedSet.SortedSetDocValuesReaderState;
using SortField = Lucene.Net.Search.SortField;
+ using StringField = Lucene.Net.Documents.StringField;
+ using TaxonomyReader = Lucene.Net.Facet.Taxonomy.TaxonomyReader;
+ using Term = Lucene.Net.Index.Term;
using TermQuery = Lucene.Net.Search.TermQuery;
- using TopDocs = Lucene.Net.Search.TopDocs;
- using Directory = Lucene.Net.Store.Directory;
- using IBits = Lucene.Net.Util.IBits;
- using BytesRef = Lucene.Net.Util.BytesRef;
- using FixedBitSet = Lucene.Net.Util.FixedBitSet;
- using IOUtils = Lucene.Net.Util.IOUtils;
- using InPlaceMergeSorter = Lucene.Net.Util.InPlaceMergeSorter;
- using InfoStream = Lucene.Net.Util.InfoStream;
using TestUtil = Lucene.Net.Util.TestUtil;
- using NUnit.Framework;
- using Search;
+ using TopDocs = Lucene.Net.Search.TopDocs;
+
[TestFixture]
public class TestDrillSideways : FacetTestCase
diff --git a/src/Lucene.Net.Tests.Facet/TestFacetsConfig.cs b/src/Lucene.Net.Tests.Facet/TestFacetsConfig.cs
index 563ee8d..855a09b 100644
--- a/src/Lucene.Net.Tests.Facet/TestFacetsConfig.cs
+++ b/src/Lucene.Net.Tests.Facet/TestFacetsConfig.cs
@@ -1,5 +1,6 @@
using Lucene.Net.Support;
using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Facet
{
diff --git a/src/Lucene.Net.Tests.Facet/TestMultipleIndexFields.cs b/src/Lucene.Net.Tests.Facet/TestMultipleIndexFields.cs
index ced846f..352e39b 100644
--- a/src/Lucene.Net.Tests.Facet/TestMultipleIndexFields.cs
+++ b/src/Lucene.Net.Tests.Facet/TestMultipleIndexFields.cs
@@ -1,5 +1,6 @@
using System.Collections.Generic;
using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Facet
{
@@ -272,7 +273,7 @@ namespace Lucene.Net.Facet
private void AssertCorrectResults(Facets facets)
{
- Assert.AreEqual(5, facets.GetSpecificValue("Band"));
+ Assert.AreEqual(5, facets.GetSpecificValue("Band"), 0);
Assert.AreEqual("dim=Band path=[] value=5 childCount=2\n Rock & Pop (4)\n Punk (1)\n", facets.GetTopChildren(10, "Band").ToString());
Assert.AreEqual("dim=Band path=[Rock & Pop] value=4 childCount=4\n The Beatles (1)\n U2 (1)\n REM (1)\n Dave Matthews Band (1)\n", facets.GetTopChildren(10, "Band", "Rock & Pop").ToString());
Assert.AreEqual("dim=Author path=[] value=3 childCount=3\n Mark Twain (1)\n Stephen King (1)\n Kurt Vonnegut (1)\n", facets.GetTopChildren(10, "Author").ToString());
diff --git a/src/Lucene.Net.Tests.Facet/TestRandomSamplingFacetsCollector.cs b/src/Lucene.Net.Tests.Facet/TestRandomSamplingFacetsCollector.cs
index a4e1f19..c709764 100644
--- a/src/Lucene.Net.Tests.Facet/TestRandomSamplingFacetsCollector.cs
+++ b/src/Lucene.Net.Tests.Facet/TestRandomSamplingFacetsCollector.cs
@@ -1,26 +1,24 @@
-using System;
-using System.Diagnostics;
-using Lucene.Net.Randomized.Generators;
-using NUnit.Framework;
+using NUnit.Framework;
+using System;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Facet
{
- using Document = Lucene.Net.Documents.Document;
- using Store = Lucene.Net.Documents.Field.Store;
- using StringField = Lucene.Net.Documents.StringField;
- using MatchingDocs = Lucene.Net.Facet.FacetsCollector.MatchingDocs;
- using FastTaxonomyFacetCounts = Lucene.Net.Facet.Taxonomy.FastTaxonomyFacetCounts;
- using TaxonomyReader = Lucene.Net.Facet.Taxonomy.TaxonomyReader;
+ using Directory = Lucene.Net.Store.Directory;
using DirectoryTaxonomyReader = Lucene.Net.Facet.Taxonomy.Directory.DirectoryTaxonomyReader;
using DirectoryTaxonomyWriter = Lucene.Net.Facet.Taxonomy.Directory.DirectoryTaxonomyWriter;
- using RandomIndexWriter = Lucene.Net.Index.RandomIndexWriter;
- using Term = Lucene.Net.Index.Term;
+ using Document = Lucene.Net.Documents.Document;
+ using FastTaxonomyFacetCounts = Lucene.Net.Facet.Taxonomy.FastTaxonomyFacetCounts;
using IndexSearcher = Lucene.Net.Search.IndexSearcher;
+ using IOUtils = Lucene.Net.Util.IOUtils;
+ using MatchingDocs = Lucene.Net.Facet.FacetsCollector.MatchingDocs;
using MultiCollector = Lucene.Net.Search.MultiCollector;
+ using RandomIndexWriter = Lucene.Net.Index.RandomIndexWriter;
+ using Store = Lucene.Net.Documents.Field.Store;
+ using StringField = Lucene.Net.Documents.StringField;
+ using Term = Lucene.Net.Index.Term;
using TermQuery = Lucene.Net.Search.TermQuery;
- using Directory = Lucene.Net.Store.Directory;
- using IOUtils = Lucene.Net.Util.IOUtils;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
[lucenenet] 06/26: added using Assert =
Lucene.Net.TestFramework.Assert; to use TestFramework Assert
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 423bf3adcc2602954eab35f4a7b571caf7cf3195
Author: Michael <mi...@hotmail.com>
AuthorDate: Tue Jun 23 20:32:00 2020 +0700
added
using Assert = Lucene.Net.TestFramework.Assert; to use TestFramework Assert
---
src/Lucene.Net.Tests/Index/TestBinaryDocValuesUpdates.cs | 1 +
src/Lucene.Net.Tests/Index/TestDocumentsWriterDeleteQueue.cs | 1 +
src/Lucene.Net.Tests/Index/TestIndexWriter.cs | 1 +
src/Lucene.Net.Tests/Index/TestIndexWriterDelete.cs | 1 +
src/Lucene.Net.Tests/Index/TestIndexWriterExceptions.cs | 1 +
src/Lucene.Net.Tests/Index/TestIndexWriterReader.cs | 1 +
src/Lucene.Net.Tests/Index/TestIndexWriterUnicode.cs | 1 +
src/Lucene.Net.Tests/Index/TestIndexWriterWithThreads.cs | 2 ++
src/Lucene.Net.Tests/Index/TestMixedDocValuesUpdates.cs | 1 +
src/Lucene.Net.Tests/Index/TestNumericDocValuesUpdates.cs | 3 ++-
10 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/src/Lucene.Net.Tests/Index/TestBinaryDocValuesUpdates.cs b/src/Lucene.Net.Tests/Index/TestBinaryDocValuesUpdates.cs
index d128a24..9d76073 100644
--- a/src/Lucene.Net.Tests/Index/TestBinaryDocValuesUpdates.cs
+++ b/src/Lucene.Net.Tests/Index/TestBinaryDocValuesUpdates.cs
@@ -18,6 +18,7 @@ using System.IO;
using System.Threading;
using Console = Lucene.Net.Util.SystemConsole;
using JCG = J2N.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Index
{
diff --git a/src/Lucene.Net.Tests/Index/TestDocumentsWriterDeleteQueue.cs b/src/Lucene.Net.Tests/Index/TestDocumentsWriterDeleteQueue.cs
index b4cc8ad..c9de8d9 100644
--- a/src/Lucene.Net.Tests/Index/TestDocumentsWriterDeleteQueue.cs
+++ b/src/Lucene.Net.Tests/Index/TestDocumentsWriterDeleteQueue.cs
@@ -34,6 +34,7 @@ namespace Lucene.Net.Index
using DeleteSlice = Lucene.Net.Index.DocumentsWriterDeleteQueue.DeleteSlice;
using LuceneTestCase = Lucene.Net.Util.LuceneTestCase;
using TermQuery = Lucene.Net.Search.TermQuery;
+ using Assert = Lucene.Net.TestFramework.Assert;
/// <summary>
/// Unit test for <seealso cref="DocumentsWriterDeleteQueue"/>
diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriter.cs b/src/Lucene.Net.Tests/Index/TestIndexWriter.cs
index 844c2b8..0a8a619 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexWriter.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexWriter.cs
@@ -81,6 +81,7 @@ namespace Lucene.Net.Index
using TermQuery = Lucene.Net.Search.TermQuery;
using TestUtil = Lucene.Net.Util.TestUtil;
using TextField = TextField;
+ using Assert = Lucene.Net.TestFramework.Assert;
[TestFixture]
public class TestIndexWriter : LuceneTestCase
diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterDelete.cs b/src/Lucene.Net.Tests/Index/TestIndexWriterDelete.cs
index 8477174..70fa5e5 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexWriterDelete.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexWriterDelete.cs
@@ -54,6 +54,7 @@ namespace Lucene.Net.Index
using StringField = StringField;
using TermQuery = Lucene.Net.Search.TermQuery;
using TestUtil = Lucene.Net.Util.TestUtil;
+ using Assert = Lucene.Net.TestFramework.Assert;
[TestFixture]
public class TestIndexWriterDelete : LuceneTestCase
diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterExceptions.cs b/src/Lucene.Net.Tests/Index/TestIndexWriterExceptions.cs
index ca1d449..80404a8 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexWriterExceptions.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexWriterExceptions.cs
@@ -65,6 +65,7 @@ namespace Lucene.Net.Index
using Token = Lucene.Net.Analysis.Token;
using TokenFilter = Lucene.Net.Analysis.TokenFilter;
using TokenStream = Lucene.Net.Analysis.TokenStream;
+ using Assert = Lucene.Net.TestFramework.Assert;
[TestFixture]
public class TestIndexWriterExceptions : LuceneTestCase
diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterReader.cs b/src/Lucene.Net.Tests/Index/TestIndexWriterReader.cs
index ca387c0..d8b5216 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexWriterReader.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexWriterReader.cs
@@ -51,6 +51,7 @@ namespace Lucene.Net.Index
using TestUtil = Lucene.Net.Util.TestUtil;
using TextField = TextField;
using TopDocs = Lucene.Net.Search.TopDocs;
+ using Assert = Lucene.Net.TestFramework.Assert;
[TestFixture]
public class TestIndexWriterReader : LuceneTestCase
diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterUnicode.cs b/src/Lucene.Net.Tests/Index/TestIndexWriterUnicode.cs
index a1c27a1..317e16a 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexWriterUnicode.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexWriterUnicode.cs
@@ -36,6 +36,7 @@ namespace Lucene.Net.Index
using MockAnalyzer = Lucene.Net.Analysis.MockAnalyzer;
using UnicodeUtil = Lucene.Net.Util.UnicodeUtil;
+ using Assert = Lucene.Net.TestFramework.Assert;
[TestFixture]
public class TestIndexWriterUnicode : LuceneTestCase
diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterWithThreads.cs b/src/Lucene.Net.Tests/Index/TestIndexWriterWithThreads.cs
index 2659bd3..2b62206 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexWriterWithThreads.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexWriterWithThreads.cs
@@ -26,6 +26,8 @@ namespace Lucene.Net.Index
using LineFileDocs = Lucene.Net.Util.LineFileDocs;
using LockObtainFailedException = Lucene.Net.Store.LockObtainFailedException;
using LuceneTestCase = Lucene.Net.Util.LuceneTestCase;
+ using Assert = Lucene.Net.TestFramework.Assert;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git a/src/Lucene.Net.Tests/Index/TestMixedDocValuesUpdates.cs b/src/Lucene.Net.Tests/Index/TestMixedDocValuesUpdates.cs
index df3a1b4..100ce2d 100644
--- a/src/Lucene.Net.Tests/Index/TestMixedDocValuesUpdates.cs
+++ b/src/Lucene.Net.Tests/Index/TestMixedDocValuesUpdates.cs
@@ -26,6 +26,7 @@ namespace Lucene.Net.Index
using Store = Field.Store;
using StringField = StringField;
using TestUtil = Lucene.Net.Util.TestUtil;
+ using Assert = Lucene.Net.TestFramework.Assert;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/src/Lucene.Net.Tests/Index/TestNumericDocValuesUpdates.cs b/src/Lucene.Net.Tests/Index/TestNumericDocValuesUpdates.cs
index 572a8dc..2efbfb4 100644
--- a/src/Lucene.Net.Tests/Index/TestNumericDocValuesUpdates.cs
+++ b/src/Lucene.Net.Tests/Index/TestNumericDocValuesUpdates.cs
@@ -39,7 +39,8 @@ namespace Lucene.Net.Index
using Store = Field.Store;
using StringField = StringField;
using TestUtil = Lucene.Net.Util.TestUtil;
-
+ using Assert = Lucene.Net.TestFramework.Assert;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
[lucenenet] 07/26: Lucene.Net.Util.OfflineSorter: Removed
unnecessary calls to ElementAt() and Count() LINQ methods,
fixed boxing issue with the Assert.AreEquals call when comparing files
(addresses #295).
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 2dd70a16368443df9deda358f08b4663963fc050
Author: Shad Storhaug <sh...@shadstorhaug.com>
AuthorDate: Tue Jun 23 18:02:30 2020 +0700
Lucene.Net.Util.OfflineSorter: Removed unnecessary calls to ElementAt() and Count() LINQ methods, fixed boxing issue with the Assert.AreEquals call when comparing files (addresses #295).
---
src/Lucene.Net.Tests/Util/TestOfflineSorter.cs | 29 +++++++++++---------------
src/Lucene.Net/Util/OfflineSorter.cs | 7 +++----
2 files changed, 15 insertions(+), 21 deletions(-)
diff --git a/src/Lucene.Net.Tests/Util/TestOfflineSorter.cs b/src/Lucene.Net.Tests/Util/TestOfflineSorter.cs
index 34c4a13..8c56a5a 100644
--- a/src/Lucene.Net.Tests/Util/TestOfflineSorter.cs
+++ b/src/Lucene.Net.Tests/Util/TestOfflineSorter.cs
@@ -1,9 +1,9 @@
+using J2N.Text;
+using Lucene.Net.Attributes;
+using NUnit.Framework;
using System;
using System.Collections.Generic;
using System.IO;
-using NUnit.Framework;
-using Lucene.Net.Attributes;
-using J2N.Text;
using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Util
@@ -157,23 +157,18 @@ namespace Lucene.Net.Util
byte[] buf1 = new byte[64 * 1024];
byte[] buf2 = new byte[64 * 1024];
int len;
- //DataInputStream is1 = new DataInputStream(new FileInputStream(golden));
- //DataInputStream is2 = new DataInputStream(new FileInputStream(sorted));
using (Stream is1 = golden.Open(FileMode.Open, FileAccess.Read, FileShare.Delete))
+ using (Stream is2 = sorted.Open(FileMode.Open, FileAccess.Read, FileShare.Delete))
{
- using (Stream is2 = sorted.Open(FileMode.Open, FileAccess.Read, FileShare.Delete))
+ while ((len = is1.Read(buf1, 0, buf1.Length)) > 0)
{
- while ((len = is1.Read(buf1, 0, buf1.Length)) > 0)
- {
- is2.Read(buf2, 0, len);
- // Refactored test to let NUnit test the byte array rather than iterate each byte
- //for (int i = 0; i < len; i++)
- //{
- // Assert.AreEqual(buf1[i], buf2[i]);
- //}
- Assert.AreEqual(buf1, buf2);
- }
- //IOUtils.Close(is1, is2);
+ is2.Read(buf2, 0, len);
+ // Refactored test to let NUnit test the byte array rather than iterate each byte
+ //for (int i = 0; i < len; i++)
+ //{
+ // Assert.AreEqual(buf1[i], buf2[i]);
+ //}
+ Assert.AreEqual(buf1, buf2);
}
}
}
diff --git a/src/Lucene.Net/Util/OfflineSorter.cs b/src/Lucene.Net/Util/OfflineSorter.cs
index 07910f2..f1c7a54 100644
--- a/src/Lucene.Net/Util/OfflineSorter.cs
+++ b/src/Lucene.Net/Util/OfflineSorter.cs
@@ -5,7 +5,6 @@ using System.Collections.Generic;
using System.Diagnostics;
using System.Globalization;
using System.IO;
-using System.Linq;
using System.Text;
namespace Lucene.Net.Util
@@ -396,13 +395,13 @@ namespace Lucene.Net.Util
var @out = new ByteSequencesWriter(outputFile);
- PriorityQueue<FileAndTop> queue = new PriorityQueueAnonymousInnerClassHelper(this, merges.Count());
+ PriorityQueue<FileAndTop> queue = new PriorityQueueAnonymousInnerClassHelper(this, merges.Count);
- var streams = new ByteSequencesReader[merges.Count()];
+ var streams = new ByteSequencesReader[merges.Count];
try
{
// Open streams and read the top for each file
- for (int i = 0; i < merges.Count(); i++)
+ for (int i = 0; i < merges.Count; i++)
{
streams[i] = new ByteSequencesReader(merges[i]);
byte[] line = streams[i].Read();
[lucenenet] 17/26: Lucene.Net.Tests.Analysis +
Lucene.Net.Tests.Codecs + Lucene.Net.Tests.Document: Switched to using the
Assert class from the test framework instead of NUnit (#295, #261)
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 c08ebefaf1f5c660b0063e12f94aa90989a3db9c
Author: Shad Storhaug <sh...@shadstorhaug.com>
AuthorDate: Wed Jun 24 09:17:42 2020 +0700
Lucene.Net.Tests.Analysis + Lucene.Net.Tests.Codecs + Lucene.Net.Tests.Document: Switched to using the Assert class from the test framework instead of NUnit (#295, #261)
---
.../Analysis/TestCachingTokenFilter.cs | 5 ++-
src/Lucene.Net.Tests/Analysis/TestCharFilter.cs | 7 ++--
src/Lucene.Net.Tests/Analysis/TestMockAnalyzer.cs | 9 ++---
.../Analysis/TestNumericTokenStream.cs | 6 +--
.../Analysis/TestReusableStringReader.cs | 3 +-
src/Lucene.Net.Tests/Analysis/TestToken.cs | 5 ++-
.../TokenAttributes/TestCharTermAttributeImpl.cs | 2 +-
.../TokenAttributes/TestSimpleAttributeImpl.cs | 5 ++-
.../Compressing/AbstractTestCompressionMode.cs | 9 ++---
.../Compressing/AbstractTestLZ4CompressionMode.cs | 1 +
.../TestCompressingStoredFieldsFormat.cs | 1 +
.../TestCompressingTermVectorsFormat.cs | 4 +-
.../Codecs/Lucene3x/TestSurrogates.cs | 1 +
.../Codecs/Lucene3x/TestTermInfosReaderIndex.cs | 2 +-
.../Codecs/Lucene40/TestBitVector.cs | 5 ++-
.../Codecs/Lucene40/TestReuseDocsEnum.cs | 5 +--
.../Codecs/Lucene41/TestBlockPostingsFormat3.cs | 4 +-
.../Codecs/Lucene41/TestForUtil.cs | 9 +++--
.../Codecs/PerField/TestPerFieldDocValuesFormat.cs | 1 +
.../Codecs/PerField/TestPerFieldPostingsFormat2.cs | 1 +
.../Document/TestBinaryDocument.cs | 1 +
src/Lucene.Net.Tests/Document/TestDateTools.cs | 1 +
src/Lucene.Net.Tests/Document/TestDocument.cs | 1 +
src/Lucene.Net.Tests/Document/TestField.cs | 1 +
src/Lucene.Net.Tests/TestDemo.cs | 44 +++++++++++-----------
src/Lucene.Net.Tests/TestExternalCodecs.cs | 33 ++++++++--------
src/Lucene.Net.Tests/TestSearch.cs | 31 +++++++--------
src/Lucene.Net.Tests/TestSearchForDuplicates.cs | 31 +++++++--------
28 files changed, 122 insertions(+), 106 deletions(-)
diff --git a/src/Lucene.Net.Tests/Analysis/TestCachingTokenFilter.cs b/src/Lucene.Net.Tests/Analysis/TestCachingTokenFilter.cs
index dc27aa9..c4c1dcd 100644
--- a/src/Lucene.Net.Tests/Analysis/TestCachingTokenFilter.cs
+++ b/src/Lucene.Net.Tests/Analysis/TestCachingTokenFilter.cs
@@ -1,10 +1,11 @@
using Lucene.Net.Analysis.TokenAttributes;
using Lucene.Net.Documents;
+using Lucene.Net.Store;
+using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Analysis
{
- using Lucene.Net.Store;
- using NUnit.Framework;
using BytesRef = Lucene.Net.Util.BytesRef;
using Directory = Lucene.Net.Store.Directory;
using DocIdSetIterator = Lucene.Net.Search.DocIdSetIterator;
diff --git a/src/Lucene.Net.Tests/Analysis/TestCharFilter.cs b/src/Lucene.Net.Tests/Analysis/TestCharFilter.cs
index 265baae..4eaf743 100644
--- a/src/Lucene.Net.Tests/Analysis/TestCharFilter.cs
+++ b/src/Lucene.Net.Tests/Analysis/TestCharFilter.cs
@@ -1,8 +1,9 @@
+using NUnit.Framework;
+using System.IO;
+using Assert = Lucene.Net.TestFramework.Assert;
+
namespace Lucene.Net.Analysis
{
- using NUnit.Framework;
- using System.IO;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git a/src/Lucene.Net.Tests/Analysis/TestMockAnalyzer.cs b/src/Lucene.Net.Tests/Analysis/TestMockAnalyzer.cs
index 6e3bddb..45fbf16 100644
--- a/src/Lucene.Net.Tests/Analysis/TestMockAnalyzer.cs
+++ b/src/Lucene.Net.Tests/Analysis/TestMockAnalyzer.cs
@@ -1,14 +1,13 @@
-using System;
using Lucene.Net.Attributes;
using Lucene.Net.Documents;
using Lucene.Net.Index;
+using NUnit.Framework;
+using System;
+using System.IO;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Analysis
{
- using Lucene.Net.Randomized.Generators;
- using Lucene.Net.Support;
- using NUnit.Framework;
- using System.IO;
using AtomicReader = Lucene.Net.Index.AtomicReader;
using Automaton = Lucene.Net.Util.Automaton.Automaton;
using AutomatonTestUtil = Lucene.Net.Util.Automaton.AutomatonTestUtil;
diff --git a/src/Lucene.Net.Tests/Analysis/TestNumericTokenStream.cs b/src/Lucene.Net.Tests/Analysis/TestNumericTokenStream.cs
index 19c0dc6..a7b04b8 100644
--- a/src/Lucene.Net.Tests/Analysis/TestNumericTokenStream.cs
+++ b/src/Lucene.Net.Tests/Analysis/TestNumericTokenStream.cs
@@ -1,10 +1,10 @@
using Lucene.Net.Analysis.TokenAttributes;
+using NUnit.Framework;
+using System;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Analysis
{
- using NUnit.Framework;
- using System;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git a/src/Lucene.Net.Tests/Analysis/TestReusableStringReader.cs b/src/Lucene.Net.Tests/Analysis/TestReusableStringReader.cs
index 150a3f8..3185de7 100644
--- a/src/Lucene.Net.Tests/Analysis/TestReusableStringReader.cs
+++ b/src/Lucene.Net.Tests/Analysis/TestReusableStringReader.cs
@@ -1,8 +1,9 @@
using System.Text;
+using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Analysis
{
- using NUnit.Framework;
using LuceneTestCase = Lucene.Net.Util.LuceneTestCase;
/*
diff --git a/src/Lucene.Net.Tests/Analysis/TestToken.cs b/src/Lucene.Net.Tests/Analysis/TestToken.cs
index 6d749f1..46ea1f8 100644
--- a/src/Lucene.Net.Tests/Analysis/TestToken.cs
+++ b/src/Lucene.Net.Tests/Analysis/TestToken.cs
@@ -1,5 +1,8 @@
+using Lucene.Net.Analysis.TokenAttributes;
+using NUnit.Framework;
using System.Collections.Generic;
using System.Text;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Analysis
{
@@ -20,8 +23,6 @@ namespace Lucene.Net.Analysis
* limitations under the License.
*/
- using Lucene.Net.Analysis.TokenAttributes;
- using NUnit.Framework;
using Attribute = Lucene.Net.Util.Attribute;
using BytesRef = Lucene.Net.Util.BytesRef;
using IAttribute = Lucene.Net.Util.IAttribute;
diff --git a/src/Lucene.Net.Tests/Analysis/TokenAttributes/TestCharTermAttributeImpl.cs b/src/Lucene.Net.Tests/Analysis/TokenAttributes/TestCharTermAttributeImpl.cs
index c4f4c34..eac74fb 100644
--- a/src/Lucene.Net.Tests/Analysis/TokenAttributes/TestCharTermAttributeImpl.cs
+++ b/src/Lucene.Net.Tests/Analysis/TokenAttributes/TestCharTermAttributeImpl.cs
@@ -1,9 +1,9 @@
using J2N.Text;
-//using Lucene.Net.Support;
using NUnit.Framework;
using System.Collections.Generic;
using System.Text;
using System.Text.RegularExpressions;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Analysis.TokenAttributes
{
diff --git a/src/Lucene.Net.Tests/Analysis/TokenAttributes/TestSimpleAttributeImpl.cs b/src/Lucene.Net.Tests/Analysis/TokenAttributes/TestSimpleAttributeImpl.cs
index 434f653..3a25b64 100644
--- a/src/Lucene.Net.Tests/Analysis/TokenAttributes/TestSimpleAttributeImpl.cs
+++ b/src/Lucene.Net.Tests/Analysis/TokenAttributes/TestSimpleAttributeImpl.cs
@@ -1,9 +1,10 @@
+using Lucene.Net.Support;
+using NUnit.Framework;
using System.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Analysis.TokenAttributes
{
- using Lucene.Net.Support;
- using NUnit.Framework;
using Attribute = Lucene.Net.Util.Attribute;
using LuceneTestCase = Lucene.Net.Util.LuceneTestCase;
diff --git a/src/Lucene.Net.Tests/Codecs/Compressing/AbstractTestCompressionMode.cs b/src/Lucene.Net.Tests/Codecs/Compressing/AbstractTestCompressionMode.cs
index 1cea797..9e962b4 100644
--- a/src/Lucene.Net.Tests/Codecs/Compressing/AbstractTestCompressionMode.cs
+++ b/src/Lucene.Net.Tests/Codecs/Compressing/AbstractTestCompressionMode.cs
@@ -1,12 +1,11 @@
+using Lucene.Net.Randomized.Generators;
+using Lucene.Net.Support;
+using NUnit.Framework;
using System;
-using Lucene.Net.Util;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Codecs.Compressing
{
- using Lucene.Net.Randomized.Generators;
- using Lucene.Net.Support;
- using NUnit.Framework;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git a/src/Lucene.Net.Tests/Codecs/Compressing/AbstractTestLZ4CompressionMode.cs b/src/Lucene.Net.Tests/Codecs/Compressing/AbstractTestLZ4CompressionMode.cs
index d1ef818..0a7d861 100644
--- a/src/Lucene.Net.Tests/Codecs/Compressing/AbstractTestLZ4CompressionMode.cs
+++ b/src/Lucene.Net.Tests/Codecs/Compressing/AbstractTestLZ4CompressionMode.cs
@@ -3,6 +3,7 @@ using Lucene.Net.Randomized.Generators;
using NUnit.Framework;
using System;
using System.Text;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Codecs.Compressing
{
diff --git a/src/Lucene.Net.Tests/Codecs/Compressing/TestCompressingStoredFieldsFormat.cs b/src/Lucene.Net.Tests/Codecs/Compressing/TestCompressingStoredFieldsFormat.cs
index 4b77dd3..c531306 100644
--- a/src/Lucene.Net.Tests/Codecs/Compressing/TestCompressingStoredFieldsFormat.cs
+++ b/src/Lucene.Net.Tests/Codecs/Compressing/TestCompressingStoredFieldsFormat.cs
@@ -3,6 +3,7 @@ using Lucene.Net.Index.Extensions;
using Lucene.Net.Randomized.Generators;
using NUnit.Framework;
using System;
+using Assert = Lucene.Net.TestFramework.Assert;
using Field = Lucene.Net.Documents.Field;
namespace Lucene.Net.Codecs.Compressing
diff --git a/src/Lucene.Net.Tests/Codecs/Compressing/TestCompressingTermVectorsFormat.cs b/src/Lucene.Net.Tests/Codecs/Compressing/TestCompressingTermVectorsFormat.cs
index 55eea50..d82e18a 100644
--- a/src/Lucene.Net.Tests/Codecs/Compressing/TestCompressingTermVectorsFormat.cs
+++ b/src/Lucene.Net.Tests/Codecs/Compressing/TestCompressingTermVectorsFormat.cs
@@ -1,9 +1,9 @@
using Lucene.Net.Documents;
+using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Codecs.Compressing
{
- using Attributes;
- using NUnit.Framework;
using AtomicReader = Lucene.Net.Index.AtomicReader;
using BaseTermVectorsFormatTestCase = Lucene.Net.Index.BaseTermVectorsFormatTestCase;
using BytesRef = Lucene.Net.Util.BytesRef;
diff --git a/src/Lucene.Net.Tests/Codecs/Lucene3x/TestSurrogates.cs b/src/Lucene.Net.Tests/Codecs/Lucene3x/TestSurrogates.cs
index 0720f56..0793241 100644
--- a/src/Lucene.Net.Tests/Codecs/Lucene3x/TestSurrogates.cs
+++ b/src/Lucene.Net.Tests/Codecs/Lucene3x/TestSurrogates.cs
@@ -8,6 +8,7 @@ using NUnit.Framework;
using System;
using System.Collections.Generic;
using JCG = J2N.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Codecs.Lucene3x
diff --git a/src/Lucene.Net.Tests/Codecs/Lucene3x/TestTermInfosReaderIndex.cs b/src/Lucene.Net.Tests/Codecs/Lucene3x/TestTermInfosReaderIndex.cs
index a708dde..5c97f6f 100644
--- a/src/Lucene.Net.Tests/Codecs/Lucene3x/TestTermInfosReaderIndex.cs
+++ b/src/Lucene.Net.Tests/Codecs/Lucene3x/TestTermInfosReaderIndex.cs
@@ -1,10 +1,10 @@
using J2N.Collections.Generic.Extensions;
using Lucene.Net.Documents;
using Lucene.Net.Index.Extensions;
-using Lucene.Net.Support;
using NUnit.Framework;
using System;
using System.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Codecs.Lucene3x
{
diff --git a/src/Lucene.Net.Tests/Codecs/Lucene40/TestBitVector.cs b/src/Lucene.Net.Tests/Codecs/Lucene40/TestBitVector.cs
index 7005369..e7b89cc 100644
--- a/src/Lucene.Net.Tests/Codecs/Lucene40/TestBitVector.cs
+++ b/src/Lucene.Net.Tests/Codecs/Lucene40/TestBitVector.cs
@@ -1,7 +1,8 @@
+using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
+
namespace Lucene.Net.Codecs.Lucene40
{
- using NUnit.Framework;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git a/src/Lucene.Net.Tests/Codecs/Lucene40/TestReuseDocsEnum.cs b/src/Lucene.Net.Tests/Codecs/Lucene40/TestReuseDocsEnum.cs
index df4cb5c..d7305ee 100644
--- a/src/Lucene.Net.Tests/Codecs/Lucene40/TestReuseDocsEnum.cs
+++ b/src/Lucene.Net.Tests/Codecs/Lucene40/TestReuseDocsEnum.cs
@@ -1,27 +1,26 @@
using J2N.Runtime.CompilerServices;
using Lucene.Net.Index;
using Lucene.Net.Index.Extensions;
-using Lucene.Net.Support;
using NUnit.Framework;
using System;
using System.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
using JCG = J2N.Collections.Generic;
namespace Lucene.Net.Codecs.Lucene40
{
using AtomicReader = Lucene.Net.Index.AtomicReader;
using AtomicReaderContext = Lucene.Net.Index.AtomicReaderContext;
- using IBits = Lucene.Net.Util.IBits;
using BytesRef = Lucene.Net.Util.BytesRef;
using Directory = Lucene.Net.Store.Directory;
using DirectoryReader = Lucene.Net.Index.DirectoryReader;
using DocsEnum = Lucene.Net.Index.DocsEnum;
+ using IBits = Lucene.Net.Util.IBits;
using IndexWriter = Lucene.Net.Index.IndexWriter;
using IOUtils = Lucene.Net.Util.IOUtils;
using LineFileDocs = Lucene.Net.Util.LineFileDocs;
using LuceneTestCase = Lucene.Net.Util.LuceneTestCase;
using MatchNoBits = Lucene.Net.Util.Bits.MatchNoBits;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git a/src/Lucene.Net.Tests/Codecs/Lucene41/TestBlockPostingsFormat3.cs b/src/Lucene.Net.Tests/Codecs/Lucene41/TestBlockPostingsFormat3.cs
index 1b85750..2cae130 100644
--- a/src/Lucene.Net.Tests/Codecs/Lucene41/TestBlockPostingsFormat3.cs
+++ b/src/Lucene.Net.Tests/Codecs/Lucene41/TestBlockPostingsFormat3.cs
@@ -4,13 +4,13 @@ using Lucene.Net.Attributes;
using Lucene.Net.Documents;
using Lucene.Net.Index;
using Lucene.Net.Index.Extensions;
-using Lucene.Net.Support;
using Lucene.Net.Util.Automaton;
using NUnit.Framework;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
+using Assert = Lucene.Net.TestFramework.Assert;
using JCG = J2N.Collections.Generic;
namespace Lucene.Net.Codecs.Lucene41
@@ -36,7 +36,6 @@ namespace Lucene.Net.Codecs.Lucene41
using AtomicReader = Lucene.Net.Index.AtomicReader;
using AtomicReaderContext = Lucene.Net.Index.AtomicReaderContext;
using AutomatonTestUtil = Lucene.Net.Util.Automaton.AutomatonTestUtil;
- using IBits = Lucene.Net.Util.IBits;
using BytesRef = Lucene.Net.Util.BytesRef;
using CompiledAutomaton = Lucene.Net.Util.Automaton.CompiledAutomaton;
using Directory = Lucene.Net.Store.Directory;
@@ -49,6 +48,7 @@ namespace Lucene.Net.Codecs.Lucene41
using Field = Field;
using FieldType = FieldType;
using FixedBitSet = Lucene.Net.Util.FixedBitSet;
+ using IBits = Lucene.Net.Util.IBits;
using IndexWriter = Lucene.Net.Index.IndexWriter;
using IndexWriterConfig = Lucene.Net.Index.IndexWriterConfig;
using LuceneTestCase = Lucene.Net.Util.LuceneTestCase;
diff --git a/src/Lucene.Net.Tests/Codecs/Lucene41/TestForUtil.cs b/src/Lucene.Net.Tests/Codecs/Lucene41/TestForUtil.cs
index 056acd9..1e9b5a3 100644
--- a/src/Lucene.Net.Tests/Codecs/Lucene41/TestForUtil.cs
+++ b/src/Lucene.Net.Tests/Codecs/Lucene41/TestForUtil.cs
@@ -1,9 +1,10 @@
+using Lucene.Net.Randomized.Generators;
+using Lucene.Net.Support;
+using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
+
namespace Lucene.Net.Codecs.Lucene41
{
- using Lucene.Net.Randomized.Generators;
- using Lucene.Net.Support;
- using NUnit.Framework;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git a/src/Lucene.Net.Tests/Codecs/PerField/TestPerFieldDocValuesFormat.cs b/src/Lucene.Net.Tests/Codecs/PerField/TestPerFieldDocValuesFormat.cs
index 14484b7..4d015f5 100644
--- a/src/Lucene.Net.Tests/Codecs/PerField/TestPerFieldDocValuesFormat.cs
+++ b/src/Lucene.Net.Tests/Codecs/PerField/TestPerFieldDocValuesFormat.cs
@@ -4,6 +4,7 @@ using Lucene.Net.Index.Extensions;
using NUnit.Framework;
using System;
using System.Diagnostics;
+using Assert = Lucene.Net.TestFramework.Assert;
using JCG = J2N.Collections.Generic;
namespace Lucene.Net.Codecs.PerField
diff --git a/src/Lucene.Net.Tests/Codecs/PerField/TestPerFieldPostingsFormat2.cs b/src/Lucene.Net.Tests/Codecs/PerField/TestPerFieldPostingsFormat2.cs
index e3316e2..2cea0c3 100644
--- a/src/Lucene.Net.Tests/Codecs/PerField/TestPerFieldPostingsFormat2.cs
+++ b/src/Lucene.Net.Tests/Codecs/PerField/TestPerFieldPostingsFormat2.cs
@@ -12,6 +12,7 @@ using Lucene.Net.Store;
using Lucene.Net.Util;
using NUnit.Framework;
using System;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Codecs.PerField
diff --git a/src/Lucene.Net.Tests/Document/TestBinaryDocument.cs b/src/Lucene.Net.Tests/Document/TestBinaryDocument.cs
index 6d477ec..7405822 100644
--- a/src/Lucene.Net.Tests/Document/TestBinaryDocument.cs
+++ b/src/Lucene.Net.Tests/Document/TestBinaryDocument.cs
@@ -2,6 +2,7 @@ using J2N.Text;
using NUnit.Framework;
using System;
using System.Text;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Documents
{
diff --git a/src/Lucene.Net.Tests/Document/TestDateTools.cs b/src/Lucene.Net.Tests/Document/TestDateTools.cs
index 664c936..3756f7a 100644
--- a/src/Lucene.Net.Tests/Document/TestDateTools.cs
+++ b/src/Lucene.Net.Tests/Document/TestDateTools.cs
@@ -2,6 +2,7 @@ using Lucene.Net.Util;
using NUnit.Framework;
using System;
using System.Globalization;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Documents
{
diff --git a/src/Lucene.Net.Tests/Document/TestDocument.cs b/src/Lucene.Net.Tests/Document/TestDocument.cs
index ff2b2ab..c4d9f2d 100644
--- a/src/Lucene.Net.Tests/Document/TestDocument.cs
+++ b/src/Lucene.Net.Tests/Document/TestDocument.cs
@@ -3,6 +3,7 @@ using NUnit.Framework;
using System;
using System.IO;
using System.Text;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Documents
{
diff --git a/src/Lucene.Net.Tests/Document/TestField.cs b/src/Lucene.Net.Tests/Document/TestField.cs
index 186d4b9..03fcad6 100644
--- a/src/Lucene.Net.Tests/Document/TestField.cs
+++ b/src/Lucene.Net.Tests/Document/TestField.cs
@@ -10,6 +10,7 @@ using Lucene.Net.Util;
using NUnit.Framework;
using System.IO;
using System.Text;
+using Assert = Lucene.Net.TestFramework.Assert;
using Directory = Lucene.Net.Store.Directory;
namespace Lucene.Net.Documents
diff --git a/src/Lucene.Net.Tests/TestDemo.cs b/src/Lucene.Net.Tests/TestDemo.cs
index 7f669de..1c2713a 100644
--- a/src/Lucene.Net.Tests/TestDemo.cs
+++ b/src/Lucene.Net.Tests/TestDemo.cs
@@ -1,35 +1,35 @@
+using Lucene.Net.Search;
using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net
{
/*
- * 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.
+ */
using Analyzer = Lucene.Net.Analysis.Analyzer;
- using MockAnalyzer = Lucene.Net.Analysis.MockAnalyzer;
- using Document = Lucene.Net.Documents.Document;
- using Field = Lucene.Net.Documents.Field;
+ using Directory = Lucene.Net.Store.Directory;
using DirectoryReader = Lucene.Net.Index.DirectoryReader;
+ using Field = Lucene.Net.Documents.Field;
using IndexReader = Lucene.Net.Index.IndexReader;
- using Term = Lucene.Net.Index.Term;
- using RandomIndexWriter = Lucene.Net.Index.RandomIndexWriter;
- using Lucene.Net.Search;
- using Directory = Lucene.Net.Store.Directory;
using LuceneTestCase = Lucene.Net.Util.LuceneTestCase;
+ using MockAnalyzer = Lucene.Net.Analysis.MockAnalyzer;
+ using RandomIndexWriter = Lucene.Net.Index.RandomIndexWriter;
+ using Term = Lucene.Net.Index.Term;
/// <summary>
/// A very simple demo used in the API documentation (src/java/overview.html).
diff --git a/src/Lucene.Net.Tests/TestExternalCodecs.cs b/src/Lucene.Net.Tests/TestExternalCodecs.cs
index 52b27d4..1fc1060 100644
--- a/src/Lucene.Net.Tests/TestExternalCodecs.cs
+++ b/src/Lucene.Net.Tests/TestExternalCodecs.cs
@@ -1,26 +1,27 @@
using Lucene.Net.Index.Extensions;
using NUnit.Framework;
using System;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net
{
/*
- * 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.
+ */
using MockAnalyzer = Lucene.Net.Analysis.MockAnalyzer;
using PostingsFormat = Lucene.Net.Codecs.PostingsFormat;
@@ -38,7 +39,7 @@ namespace Lucene.Net
/* Intentionally outside of oal.index to verify fully
- external codecs work fine */
+ external codecs work fine */
public class TestExternalCodecs : LuceneTestCase
{
diff --git a/src/Lucene.Net.Tests/TestSearch.cs b/src/Lucene.Net.Tests/TestSearch.cs
index ca9cb15..8be07ba 100644
--- a/src/Lucene.Net.Tests/TestSearch.cs
+++ b/src/Lucene.Net.Tests/TestSearch.cs
@@ -7,27 +7,28 @@ using NUnit.Framework;
using System;
using System.Collections.Generic;
using System.IO;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
using Occur = Lucene.Net.Search.Occur;
namespace Lucene.Net
{
/*
- * 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>
/// JUnit adaptation of an older test case SearchTest. </summary>
diff --git a/src/Lucene.Net.Tests/TestSearchForDuplicates.cs b/src/Lucene.Net.Tests/TestSearchForDuplicates.cs
index fef0d22..a55e608 100644
--- a/src/Lucene.Net.Tests/TestSearchForDuplicates.cs
+++ b/src/Lucene.Net.Tests/TestSearchForDuplicates.cs
@@ -6,26 +6,27 @@ using Lucene.Net.Util;
using NUnit.Framework;
using System;
using System.IO;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net
{
/*
- * 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.
+ */
public class TestSearchForDuplicates : LuceneTestCase
{
[lucenenet] 09/26: Lucene.Net.TestFramework: Added overloads for
int to Assert.AreEqual (addresses #295, #261)
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 6f504d239f740c2a5a1ed5f1b991e3b6bf8cf451
Author: Shad Storhaug <sh...@shadstorhaug.com>
AuthorDate: Tue Jun 23 18:33:04 2020 +0700
Lucene.Net.TestFramework: Added overloads for int to Assert.AreEqual (addresses #295, #261)
---
.../Support/TestFramework/Assert.cs | 72 ++++++++++++++++++++--
.../Index/BaseStoredFieldsFormatTestCase.cs | 2 +-
.../Support/JavaCompatibility/LuceneTestCase.cs | 20 ++++++
src/Lucene.Net.Tests/Util/Fst/TestFSTs.cs | 2 +-
4 files changed, 88 insertions(+), 8 deletions(-)
diff --git a/src/Lucene.Net.TestFramework.NUnit/Support/TestFramework/Assert.cs b/src/Lucene.Net.TestFramework.NUnit/Support/TestFramework/Assert.cs
index 91546a7..c4286c3 100644
--- a/src/Lucene.Net.TestFramework.NUnit/Support/TestFramework/Assert.cs
+++ b/src/Lucene.Net.TestFramework.NUnit/Support/TestFramework/Assert.cs
@@ -177,9 +177,48 @@ namespace Lucene.Net.TestFramework
//
// actual:
// The actual value
+ public static void AreEqual(int expected, int actual)
+ {
+ _NUnit.Assert.True(expected.Equals(actual));
+ }
+
+ //
+ // Summary:
+ // Verifies that two objects are equal. Two objects are considered equal if both
+ // are null, or if both have the same value. NUnit has special semantics for some
+ // object types. If they are not equal an NUnit.Framework.AssertionException is
+ // thrown.
+ //
+ // Parameters:
+ // expected:
+ // The value that is expected
+ //
+ // message:
+ // The message to display in case of failure
+ //
+ // actual:
+ // The actual value
+ public static void AreEqual(int expected, int actual, string message)
+ {
+ _NUnit.Assert.True(expected.Equals(actual), message);
+ }
+
+ //
+ // Summary:
+ // Verifies that two objects are equal. Two objects are considered equal if both
+ // are null, or if both have the same value. NUnit has special semantics for some
+ // object types. If they are not equal an NUnit.Framework.AssertionException is
+ // thrown.
+ //
+ // Parameters:
+ // expected:
+ // The value that is expected
+ //
+ // actual:
+ // The actual value
public static void AreEqual(long expected, long actual)
{
- _NUnit.Assert.True(expected == actual);
+ _NUnit.Assert.True(expected.Equals(actual));
}
//
@@ -200,7 +239,25 @@ namespace Lucene.Net.TestFramework
// The actual value
public static void AreEqual(long expected, long actual, string message)
{
- _NUnit.Assert.True(expected == actual, message);
+ _NUnit.Assert.True(expected.Equals(actual), message);
+ }
+
+ //
+ // Summary:
+ // Verifies that two objects are equal. Two objects are considered equal if both
+ // are null, or if both have the same value. NUnit has special semantics for some
+ // object types. If they are not equal an NUnit.Framework.AssertionException is
+ // thrown.
+ //
+ // Parameters:
+ // expected:
+ // The value that is expected
+ //
+ // actual:
+ // The actual value
+ public static void AreEqual(byte expected, byte actual)
+ {
+ _NUnit.Assert.True(expected.Equals(actual));
}
//
@@ -214,12 +271,15 @@ namespace Lucene.Net.TestFramework
// expected:
// The value that is expected
//
+ // message:
+ // The message to display in case of failure
+ //
// actual:
// The actual value
- //public static void AreEqual(byte expected, byte actual)
- //{
- // _NUnit.Assert.True(expected == actual);
- //}
+ public static void AreEqual(byte expected, byte actual, string message)
+ {
+ _NUnit.Assert.True(expected.Equals(actual), message);
+ }
// From CollectionAssert
public static void AreEqual<T>(T[] expected, T[] actual)
diff --git a/src/Lucene.Net.TestFramework/Index/BaseStoredFieldsFormatTestCase.cs b/src/Lucene.Net.TestFramework/Index/BaseStoredFieldsFormatTestCase.cs
index da7f856..5300826 100644
--- a/src/Lucene.Net.TestFramework/Index/BaseStoredFieldsFormatTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Index/BaseStoredFieldsFormatTestCase.cs
@@ -266,7 +266,7 @@ namespace Lucene.Net.Index
b = f2.GetBinaryValue().Bytes;
Assert.IsTrue(b != null);
Assert.AreEqual(17, b.Length, 17);
- Assert.AreEqual(87, b[0]);
+ Assert.AreEqual((byte)87, b[0]);
} // ir.Dispose();
} // dir.Dispose();
}
diff --git a/src/Lucene.Net.TestFramework/Support/JavaCompatibility/LuceneTestCase.cs b/src/Lucene.Net.TestFramework/Support/JavaCompatibility/LuceneTestCase.cs
index 20e1815..c14960d 100644
--- a/src/Lucene.Net.TestFramework/Support/JavaCompatibility/LuceneTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Support/JavaCompatibility/LuceneTestCase.cs
@@ -102,6 +102,26 @@ namespace Lucene.Net.Util
//Assert.AreEqual(expected, actual, message);
}
+ internal static void assertEquals(int expected, int actual)
+ {
+ Assert.AreEqual(expected, actual);
+ }
+
+ internal static void assertEquals(string message, int expected, int actual)
+ {
+ Assert.AreEqual(expected, actual, message);
+ }
+
+ internal static void assertEquals(byte expected, byte actual)
+ {
+ Assert.AreEqual(expected, actual);
+ }
+
+ internal static void assertEquals(string message, byte expected, byte actual)
+ {
+ Assert.AreEqual(expected, actual, message);
+ }
+
internal static void assertEquals<T>(ISet<T> expected, ISet<T> actual)
{
Assert.True(JCG.SetEqualityComparer<T>.Default.Equals(expected, actual));
diff --git a/src/Lucene.Net.Tests/Util/Fst/TestFSTs.cs b/src/Lucene.Net.Tests/Util/Fst/TestFSTs.cs
index dbce10d..2868051 100644
--- a/src/Lucene.Net.Tests/Util/Fst/TestFSTs.cs
+++ b/src/Lucene.Net.Tests/Util/Fst/TestFSTs.cs
@@ -1882,7 +1882,7 @@ namespace Lucene.Net.Util.Fst
Assert.AreEqual(result.Bytes[result.Offset], arc);
for (int byteIDX = 1; byteIDX < result.Length; byteIDX++)
{
- Assert.AreEqual(0, result.Bytes[result.Offset + byteIDX]);
+ Assert.AreEqual((byte)0, result.Bytes[result.Offset + byteIDX]);
}
}
}
[lucenenet] 12/26:
Lucene.Net.Tests.Util.TestOfflineSorter::AssertFilesIdentical(): Changed
test to utilize the J2N's ArrayEqualityComparer to optimize the speed of
the test (#295, #261)
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 b0d23b25d83a004f29ecd2131d711b0398048ac6
Author: Shad Storhaug <sh...@shadstorhaug.com>
AuthorDate: Tue Jun 23 22:12:57 2020 +0700
Lucene.Net.Tests.Util.TestOfflineSorter::AssertFilesIdentical(): Changed test to utilize the J2N's ArrayEqualityComparer to optimize the speed of the test (#295, #261)
---
src/Lucene.Net.Tests/Util/TestOfflineSorter.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/Lucene.Net.Tests/Util/TestOfflineSorter.cs b/src/Lucene.Net.Tests/Util/TestOfflineSorter.cs
index 8c56a5a..e5bdef0 100644
--- a/src/Lucene.Net.Tests/Util/TestOfflineSorter.cs
+++ b/src/Lucene.Net.Tests/Util/TestOfflineSorter.cs
@@ -163,12 +163,12 @@ namespace Lucene.Net.Util
while ((len = is1.Read(buf1, 0, buf1.Length)) > 0)
{
is2.Read(buf2, 0, len);
- // Refactored test to let NUnit test the byte array rather than iterate each byte
+ // LUCENENET: Refactored test to let J2N test the byte array rather than iterate each byte
//for (int i = 0; i < len; i++)
//{
// Assert.AreEqual(buf1[i], buf2[i]);
//}
- Assert.AreEqual(buf1, buf2);
+ Assert.IsTrue(J2N.Collections.ArrayEqualityComparer<byte>.OneDimensional.Equals(buf1, buf2));
}
}
}
[lucenenet] 10/26:
Lucene.Net.TestFramework.Support.JavaCompatibility.LuceneTestCase: Updated
assertEquals overloads to support additional collection types
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 dadf70dec0bff0905d25bb77783ceab5f0f737e9
Author: Shad Storhaug <sh...@shadstorhaug.com>
AuthorDate: Tue Jun 23 20:56:27 2020 +0700
Lucene.Net.TestFramework.Support.JavaCompatibility.LuceneTestCase: Updated assertEquals overloads to support additional collection types
---
.../Support/JavaCompatibility/LuceneTestCase.cs | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/Lucene.Net.TestFramework/Support/JavaCompatibility/LuceneTestCase.cs b/src/Lucene.Net.TestFramework/Support/JavaCompatibility/LuceneTestCase.cs
index c14960d..6bbd830 100644
--- a/src/Lucene.Net.TestFramework/Support/JavaCompatibility/LuceneTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Support/JavaCompatibility/LuceneTestCase.cs
@@ -132,12 +132,17 @@ namespace Lucene.Net.Util
Assert.True(JCG.SetEqualityComparer<T>.Default.Equals(expected, actual), message);
}
- internal static void assertEquals<T, S>(IDictionary<T, S> expected, IDictionary<T, S> actual)
+ internal static void assertEquals<T>(IList<T> expected, IList<T> actual)
{
- Assert.AreEqual(expected, actual);
+ Assert.True(JCG.ListEqualityComparer<T>.Aggressive.Equals(expected, actual));
+ }
+
+ internal static void assertEquals<T>(string message, IList<T> expected, IList<T> actual)
+ {
+ Assert.True(JCG.SetEqualityComparer<T>.Aggressive.Equals(expected, actual), message);
}
- internal static void assertEquals(ICollection expected, ICollection actual)
+ internal static void assertEquals<T, S>(IDictionary<T, S> expected, IDictionary<T, S> actual)
{
Assert.AreEqual(expected, actual);
}
[lucenenet] 13/26: Lucene.Net.Tests.Index.TestIndexWriter: Fixed
ambiguous call issue with Assert.AreEqual
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 cd51cc8cdc9d6bcb06e3790b792abd956dab900d
Author: Shad Storhaug <sh...@shadstorhaug.com>
AuthorDate: Wed Jun 24 05:31:57 2020 +0700
Lucene.Net.Tests.Index.TestIndexWriter: Fixed ambiguous call issue with Assert.AreEqual
---
src/Lucene.Net.Tests/Index/TestIndexWriter.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriter.cs b/src/Lucene.Net.Tests/Index/TestIndexWriter.cs
index 0a8a619..f112acf 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexWriter.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexWriter.cs
@@ -1568,7 +1568,7 @@ namespace Lucene.Net.Index
b = f3.GetBinaryValue().Bytes;
Assert.IsTrue(b != null);
Assert.AreEqual(17, b.Length, 17);
- Assert.AreEqual(87, b[0]);
+ Assert.AreEqual((byte)87, b[0]);
Assert.IsTrue(ir.Document(0).GetField("binary").GetBinaryValue() != null);
Assert.IsTrue(ir.Document(1).GetField("binary").GetBinaryValue() != null);
[lucenenet] 21/26: Lucene.Net.TestFramework: Added assert overloads
for float (#295, #261)
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 124decc2e9c2376835a9b8e2ea0a304715f489e0
Author: Shad Storhaug <sh...@shadstorhaug.com>
AuthorDate: Wed Jun 24 12:45:37 2020 +0700
Lucene.Net.TestFramework: Added assert overloads for float (#295, #261)
---
.../Support/TestFramework/Assert.cs | 51 +++++++++++++++++++++-
.../Support/JavaCompatibility/LuceneTestCase.cs | 30 ++++++++-----
2 files changed, 70 insertions(+), 11 deletions(-)
diff --git a/src/Lucene.Net.TestFramework.NUnit/Support/TestFramework/Assert.cs b/src/Lucene.Net.TestFramework.NUnit/Support/TestFramework/Assert.cs
index a3fd36c..b03a80b 100644
--- a/src/Lucene.Net.TestFramework.NUnit/Support/TestFramework/Assert.cs
+++ b/src/Lucene.Net.TestFramework.NUnit/Support/TestFramework/Assert.cs
@@ -163,7 +163,56 @@ namespace Lucene.Net.TestFramework
{
_NUnit.Assert.AreEqual(expected, actual, delta);
}
-
+ //
+ // Summary:
+ // Verifies that two doubles are equal considering a delta. If the expected value
+ // is infinity then the delta value is ignored. If they are not equal then an NUnit.Framework.AssertionException
+ // is thrown.
+ //
+ // Parameters:
+ // expected:
+ // The expected value
+ //
+ // actual:
+ // The actual value
+ //
+ // delta:
+ // The maximum acceptable difference between the the expected and the actual
+ //
+ // message:
+ // The message to display in case of failure
+ //
+ // args:
+ // Array of objects to be used in formatting the message
+ public static void AreEqual(float expected, float actual, float delta, string message, params object[] args)
+ {
+ if (Math.Abs(expected - actual) > delta)
+ {
+ _NUnit.Assert.AreEqual(expected, actual, delta, message, args);
+ }
+ }
+ //
+ // Summary:
+ // Verifies that two doubles are equal considering a delta. If the expected value
+ // is infinity then the delta value is ignored. If they are not equal then an NUnit.Framework.AssertionException
+ // is thrown.
+ //
+ // Parameters:
+ // expected:
+ // The expected value
+ //
+ // actual:
+ // The actual value
+ //
+ // delta:
+ // The maximum acceptable difference between the the expected and the actual
+ public static void AreEqual(float expected, float actual, float delta)
+ {
+ if (Math.Abs(expected - actual) > delta)
+ {
+ _NUnit.Assert.AreEqual(expected, actual, delta);
+ }
+ }
//
// Summary:
// Verifies that two objects are equal. Two objects are considered equal if both
diff --git a/src/Lucene.Net.TestFramework/Support/JavaCompatibility/LuceneTestCase.cs b/src/Lucene.Net.TestFramework/Support/JavaCompatibility/LuceneTestCase.cs
index 0c067b0..3e36f90 100644
--- a/src/Lucene.Net.TestFramework/Support/JavaCompatibility/LuceneTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Support/JavaCompatibility/LuceneTestCase.cs
@@ -118,6 +118,26 @@ namespace Lucene.Net.Util
Assert.AreEqual(expected, actual, message);
}
+ internal static void assertEquals(double d1, double d2, double delta)
+ {
+ Assert.AreEqual(d1, d2, delta);
+ }
+
+ internal static void assertEquals(string msg, float d1, float d2, float delta)
+ {
+ Assert.AreEqual(d1, d2, delta, msg);
+ }
+
+ internal static void assertEquals(float d1, float d2, float delta)
+ {
+ Assert.AreEqual(d1, d2, delta);
+ }
+
+ internal static void assertEquals(string msg, double d1, double d2, double delta)
+ {
+ Assert.AreEqual(d1, d2, delta, msg);
+ }
+
internal static void assertEquals<T>(ISet<T> expected, ISet<T> actual)
{
Assert.True(JCG.SetEqualityComparer<T>.Default.Equals(expected, actual));
@@ -163,16 +183,6 @@ namespace Lucene.Net.Util
Assert.AreNotSame(unexpected, actual, message);
}
- internal static void assertEquals(double d1, double d2, double delta)
- {
- Assert.AreEqual(d1, d2, delta);
- }
-
- internal static void assertEquals(string msg, double d1, double d2, double delta)
- {
- Assert.AreEqual(d1, d2, delta, msg);
- }
-
internal static void assertNotNull(object o)
{
Assert.NotNull(o);
[lucenenet] 01/26: Reformated Debug assert call with String.Format
with interpolation call. Improvement of 15%
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 cdf7cf9ece55506fbd07eccf122597fad0e80347
Author: Michael <mi...@hotmail.com>
AuthorDate: Sat Jun 20 12:16:46 2020 +0700
Reformated Debug assert call with String.Format with interpolation call. Improvement of 15%
---
.../Support/Randomized/Generators/RandomInts.cs | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/Lucene.Net.TestFramework/Support/Randomized/Generators/RandomInts.cs b/src/Lucene.Net.TestFramework/Support/Randomized/Generators/RandomInts.cs
index fb5e379..91acfb1 100644
--- a/src/Lucene.Net.TestFramework/Support/Randomized/Generators/RandomInts.cs
+++ b/src/Lucene.Net.TestFramework/Support/Randomized/Generators/RandomInts.cs
@@ -32,7 +32,8 @@ namespace Lucene.Net.Randomized.Generators
/// </summary>
public static int RandomInt32Between(Random random, int min, int max)
{
- Debug.Assert(min <= max, String.Format("Min must be less than or equal max int. min: {0}, max: {1}", min, max));
+ Debug.Assert(min <= max,
+ $"Min must be less than or equal max int. min: {min.ToString()}, max: {max.ToString()}");
var range = max - min;
if (range < Int32.MaxValue)
return min + random.Next(1 + range);
[lucenenet] 14/26: Lucene.Net.TestFramework: Optimized array
asserts by first checking with J2N.Collections.ArrayEqualityComparer
before cascading only the failing calls to NUnit.CollectionAssert.AreEqual
to generate the error message (#295, #261)
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 2e0f25d513b5e39f80f66fca2e7d0afbe02d0331
Author: Shad Storhaug <sh...@shadstorhaug.com>
AuthorDate: Wed Jun 24 06:12:04 2020 +0700
Lucene.Net.TestFramework: Optimized array asserts by first checking with J2N.Collections.ArrayEqualityComparer<T> before cascading only the failing calls to NUnit.CollectionAssert.AreEqual to generate the error message (#295, #261)
---
.../Support/TestFramework/Assert.cs | 14 +++++++++++--
.../Support/JavaCompatibility/LuceneTestCase.cs | 24 ++++++++++++++--------
2 files changed, 27 insertions(+), 11 deletions(-)
diff --git a/src/Lucene.Net.TestFramework.NUnit/Support/TestFramework/Assert.cs b/src/Lucene.Net.TestFramework.NUnit/Support/TestFramework/Assert.cs
index c4286c3..40334c8 100644
--- a/src/Lucene.Net.TestFramework.NUnit/Support/TestFramework/Assert.cs
+++ b/src/Lucene.Net.TestFramework.NUnit/Support/TestFramework/Assert.cs
@@ -284,13 +284,23 @@ namespace Lucene.Net.TestFramework
// From CollectionAssert
public static void AreEqual<T>(T[] expected, T[] actual)
{
- _NUnit.CollectionAssert.AreEqual(expected, actual);
+ // LUCENENET: Do the initial check with the (fast) J2N array comparison. If it fails,
+ // then use CollectionAssert to re-do the check in a slower way and generate the assert message.
+ if (!J2N.Collections.ArrayEqualityComparer<T>.OneDimensional.Equals(expected, actual))
+ {
+ _NUnit.CollectionAssert.AreEqual(expected, actual);
+ }
}
// From CollectionAssert
public static void AreEqual<T>(T[] expected, T[] actual, string message, params object[] args)
{
- _NUnit.CollectionAssert.AreEqual(expected, actual, message, args);
+ // LUCENENET: Do the initial check with the (fast) J2N array comparison. If it fails,
+ // then use CollectionAssert to re-do the check in a slower way and generate the assert message.
+ if (!J2N.Collections.ArrayEqualityComparer<T>.OneDimensional.Equals(expected, actual))
+ {
+ _NUnit.CollectionAssert.AreEqual(expected, actual, message, args);
+ }
}
public static void AreEqual<T, S>(IDictionary<T, S> expected, IDictionary<T, S> actual)
diff --git a/src/Lucene.Net.TestFramework/Support/JavaCompatibility/LuceneTestCase.cs b/src/Lucene.Net.TestFramework/Support/JavaCompatibility/LuceneTestCase.cs
index 6bbd830..0c067b0 100644
--- a/src/Lucene.Net.TestFramework/Support/JavaCompatibility/LuceneTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Support/JavaCompatibility/LuceneTestCase.cs
@@ -80,26 +80,22 @@ namespace Lucene.Net.Util
internal static void assertEquals(bool expected, bool actual)
{
- Assert.IsTrue(expected.Equals(actual));
- //Assert.AreEqual(expected, actual);
+ Assert.AreEqual(expected, actual);
}
internal static void assertEquals(string message, bool expected, bool actual)
{
- Assert.IsTrue(expected.Equals(actual), message);
- //Assert.AreEqual(expected, actual, message);
+ Assert.AreEqual(expected, actual, message);
}
internal static void assertEquals(long expected, long actual)
{
- Assert.True(expected == actual);
- //Assert.AreEqual(expected, actual);
+ Assert.AreEqual(expected, actual);
}
internal static void assertEquals(string message, long expected, long actual)
{
- Assert.True(expected == actual, message);
- //Assert.AreEqual(expected, actual, message);
+ Assert.AreEqual(expected, actual, message);
}
internal static void assertEquals(int expected, int actual)
@@ -142,6 +138,16 @@ namespace Lucene.Net.Util
Assert.True(JCG.SetEqualityComparer<T>.Aggressive.Equals(expected, actual), message);
}
+ internal static void assertEquals<T>(T[] expected, T[] actual)
+ {
+ Assert.AreEqual(expected, actual);
+ }
+
+ internal static void assertEquals<T>(string message, T[] expected, T[] actual)
+ {
+ Assert.AreEqual(expected, actual, message);
+ }
+
internal static void assertEquals<T, S>(IDictionary<T, S> expected, IDictionary<T, S> actual)
{
Assert.AreEqual(expected, actual);
@@ -189,7 +195,7 @@ namespace Lucene.Net.Util
internal static void assertArrayEquals<T>(T[] a1, T[] a2)
{
- CollectionAssert.AreEqual(a1, a2);
+ Assert.AreEqual(a1, a2);
}
internal static void assertSame(Object expected, Object actual)
[lucenenet] 04/26: Updated to passive from aggressive
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 3a2f7f8c948b5006c258d87e1cb8d1d85b2ceddb
Author: Michael <mi...@hotmail.com>
AuthorDate: Tue Jun 23 20:31:17 2020 +0700
Updated to passive from aggressive
---
.../Support/JavaCompatibility/LuceneTestCase.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/Lucene.Net.TestFramework/Support/JavaCompatibility/LuceneTestCase.cs b/src/Lucene.Net.TestFramework/Support/JavaCompatibility/LuceneTestCase.cs
index 2bd29bc..20e1815 100644
--- a/src/Lucene.Net.TestFramework/Support/JavaCompatibility/LuceneTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Support/JavaCompatibility/LuceneTestCase.cs
@@ -104,12 +104,12 @@ namespace Lucene.Net.Util
internal static void assertEquals<T>(ISet<T> expected, ISet<T> actual)
{
- Assert.True(JCG.SetEqualityComparer<T>.Aggressive.Equals(expected, actual));
+ Assert.True(JCG.SetEqualityComparer<T>.Default.Equals(expected, actual));
}
internal static void assertEquals<T>(string message, ISet<T> expected, ISet<T> actual)
{
- Assert.True(JCG.SetEqualityComparer<T>.Aggressive.Equals(expected, actual), message);
+ Assert.True(JCG.SetEqualityComparer<T>.Default.Equals(expected, actual), message);
}
internal static void assertEquals<T, S>(IDictionary<T, S> expected, IDictionary<T, S> actual)
[lucenenet] 03/26: addresses #295 updated lucene test case asserts
and modified IEnumerable to IList to take advantage of indexing
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 e91e086e43f2433fcecc7e5577ae5a2817f3fa68
Author: Michael <mi...@hotmail.com>
AuthorDate: Tue Jun 23 17:05:08 2020 +0700
addresses #295 updated lucene test case asserts and modified IEnumerable to IList to take advantage of indexing
---
.../Support/TestFramework/Assert.cs | 8 ++++----
.../Support/JavaCompatibility/LuceneTestCase.cs | 12 ++++++++----
src/Lucene.Net.Tests/Util/TestFixedBitSet.cs | 1 +
src/Lucene.Net.Tests/Util/TestOfflineSorter.cs | 11 +++++++----
src/Lucene.Net/Util/OfflineSorter.cs | 4 ++--
5 files changed, 22 insertions(+), 14 deletions(-)
diff --git a/src/Lucene.Net.TestFramework.NUnit/Support/TestFramework/Assert.cs b/src/Lucene.Net.TestFramework.NUnit/Support/TestFramework/Assert.cs
index 2c0af47..91546a7 100644
--- a/src/Lucene.Net.TestFramework.NUnit/Support/TestFramework/Assert.cs
+++ b/src/Lucene.Net.TestFramework.NUnit/Support/TestFramework/Assert.cs
@@ -216,10 +216,10 @@ namespace Lucene.Net.TestFramework
//
// actual:
// The actual value
- public static void AreEqual(byte expected, byte actual)
- {
- _NUnit.Assert.True(expected == actual);
- }
+ //public static void AreEqual(byte expected, byte actual)
+ //{
+ // _NUnit.Assert.True(expected == actual);
+ //}
// From CollectionAssert
public static void AreEqual<T>(T[] expected, T[] actual)
diff --git a/src/Lucene.Net.TestFramework/Support/JavaCompatibility/LuceneTestCase.cs b/src/Lucene.Net.TestFramework/Support/JavaCompatibility/LuceneTestCase.cs
index aaca9df..2bd29bc 100644
--- a/src/Lucene.Net.TestFramework/Support/JavaCompatibility/LuceneTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Support/JavaCompatibility/LuceneTestCase.cs
@@ -80,22 +80,26 @@ namespace Lucene.Net.Util
internal static void assertEquals(bool expected, bool actual)
{
- Assert.AreEqual(expected, actual);
+ Assert.IsTrue(expected.Equals(actual));
+ //Assert.AreEqual(expected, actual);
}
internal static void assertEquals(string message, bool expected, bool actual)
{
- Assert.AreEqual(expected, actual, message);
+ Assert.IsTrue(expected.Equals(actual), message);
+ //Assert.AreEqual(expected, actual, message);
}
internal static void assertEquals(long expected, long actual)
{
- Assert.AreEqual(expected, actual);
+ Assert.True(expected == actual);
+ //Assert.AreEqual(expected, actual);
}
internal static void assertEquals(string message, long expected, long actual)
{
- Assert.AreEqual(expected, actual, message);
+ Assert.True(expected == actual, message);
+ //Assert.AreEqual(expected, actual, message);
}
internal static void assertEquals<T>(ISet<T> expected, ISet<T> actual)
diff --git a/src/Lucene.Net.Tests/Util/TestFixedBitSet.cs b/src/Lucene.Net.Tests/Util/TestFixedBitSet.cs
index faafdb4..278058d 100644
--- a/src/Lucene.Net.Tests/Util/TestFixedBitSet.cs
+++ b/src/Lucene.Net.Tests/Util/TestFixedBitSet.cs
@@ -23,6 +23,7 @@ using System.Collections;
*/
using System.Linq;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Util
{
diff --git a/src/Lucene.Net.Tests/Util/TestOfflineSorter.cs b/src/Lucene.Net.Tests/Util/TestOfflineSorter.cs
index b3b7325..34c4a13 100644
--- a/src/Lucene.Net.Tests/Util/TestOfflineSorter.cs
+++ b/src/Lucene.Net.Tests/Util/TestOfflineSorter.cs
@@ -4,6 +4,7 @@ using System.IO;
using NUnit.Framework;
using Lucene.Net.Attributes;
using J2N.Text;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Util
{
@@ -165,10 +166,12 @@ namespace Lucene.Net.Util
while ((len = is1.Read(buf1, 0, buf1.Length)) > 0)
{
is2.Read(buf2, 0, len);
- for (int i = 0; i < len; i++)
- {
- Assert.AreEqual(buf1[i], buf2[i]);
- }
+ // Refactored test to let NUnit test the byte array rather than iterate each byte
+ //for (int i = 0; i < len; i++)
+ //{
+ // Assert.AreEqual(buf1[i], buf2[i]);
+ //}
+ Assert.AreEqual(buf1, buf2);
}
//IOUtils.Close(is1, is2);
}
diff --git a/src/Lucene.Net/Util/OfflineSorter.cs b/src/Lucene.Net/Util/OfflineSorter.cs
index 7c8953b..07910f2 100644
--- a/src/Lucene.Net/Util/OfflineSorter.cs
+++ b/src/Lucene.Net/Util/OfflineSorter.cs
@@ -390,7 +390,7 @@ namespace Lucene.Net.Util
/// <summary>
/// Merge a list of sorted temporary files (partitions) into an output file. </summary>
- internal void MergePartitions(IEnumerable<FileInfo> merges, FileInfo outputFile)
+ internal void MergePartitions(IList<FileInfo> merges, FileInfo outputFile)
{
long start = Environment.TickCount;
@@ -404,7 +404,7 @@ namespace Lucene.Net.Util
// Open streams and read the top for each file
for (int i = 0; i < merges.Count(); i++)
{
- streams[i] = new ByteSequencesReader(merges.ElementAt(i));
+ streams[i] = new ByteSequencesReader(merges[i]);
byte[] line = streams[i].Read();
if (line != null)
{
[lucenenet] 05/26: commented unused code throwing an expection and
slowing test
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 710e9a75ee5c82510272f7e15d49b54415c82136
Author: Michael <mi...@hotmail.com>
AuthorDate: Tue Jun 23 20:31:39 2020 +0700
commented unused code throwing an expection and slowing test
---
.../Codecs/Asserting/AssertingDocValuesFormat.cs | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/src/Lucene.Net.TestFramework/Codecs/Asserting/AssertingDocValuesFormat.cs b/src/Lucene.Net.TestFramework/Codecs/Asserting/AssertingDocValuesFormat.cs
index e88c5c4..dbab410 100644
--- a/src/Lucene.Net.TestFramework/Codecs/Asserting/AssertingDocValuesFormat.cs
+++ b/src/Lucene.Net.TestFramework/Codecs/Asserting/AssertingDocValuesFormat.cs
@@ -243,15 +243,17 @@ namespace Lucene.Net.Codecs.Asserting
Debug.Assert(hasNext);
T v = iterator.Current;
Debug.Assert(allowNull || v != null);
- try
- {
- iterator.Reset();
- throw new InvalidOperationException("broken iterator (supports remove): " + iterator);
- }
- catch (System.NotSupportedException)
- {
- // ok
- }
+
+ // LUCENE.NET specific. removed call to Reset().
+ //try
+ //{
+ // iterator.Reset();
+ // throw new InvalidOperationException("broken iterator (supports remove): " + iterator);
+ //}
+ //catch (System.NotSupportedException)
+ //{
+ // // ok
+ //}
}
Debug.Assert(!iterator.MoveNext());
/*try
[lucenenet] 08/26: Lucene.Net.Tests.Suggest.Fst.FSTCompletionTest:
Removed unnecessary calls to ElementAt() and Count() LINQ (Addresses #261)
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 6df2371edf597669de3aad58af80fe97670c3f82
Author: Shad Storhaug <sh...@shadstorhaug.com>
AuthorDate: Tue Jun 23 18:07:43 2020 +0700
Lucene.Net.Tests.Suggest.Fst.FSTCompletionTest: Removed unnecessary calls to ElementAt() and Count() LINQ (Addresses #261)
---
.../Suggest/Fst/FSTCompletionTest.cs | 25 +++++++++++-----------
1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/src/Lucene.Net.Tests.Suggest/Suggest/Fst/FSTCompletionTest.cs b/src/Lucene.Net.Tests.Suggest/Suggest/Fst/FSTCompletionTest.cs
index afa82dd..b404330 100644
--- a/src/Lucene.Net.Tests.Suggest/Suggest/Fst/FSTCompletionTest.cs
+++ b/src/Lucene.Net.Tests.Suggest/Suggest/Fst/FSTCompletionTest.cs
@@ -5,7 +5,6 @@ using NUnit.Framework;
using System;
using System.Collections.Generic;
using System.Globalization;
-using System.Linq;
using System.Text;
using System.Text.RegularExpressions;
using Console = Lucene.Net.Util.SystemConsole;
@@ -173,8 +172,8 @@ namespace Lucene.Net.Search.Suggest.Fst
builder.Add(new BytesRef(key), 0);
FSTCompletion lookup = builder.Build();
- IEnumerable<FSTCompletion.Completion> result = lookup.DoLookup(StringToCharSequence(key).ToString(), 1);
- assertEquals(1, result.Count());
+ IList<FSTCompletion.Completion> result = lookup.DoLookup(StringToCharSequence(key).ToString(), 1);
+ assertEquals(1, result.Count);
}
[Test]
@@ -265,12 +264,12 @@ namespace Lucene.Net.Search.Suggest.Fst
return TestUtil.StringToCharSequence(prefix, Random);
}
- private void AssertMatchEquals(IEnumerable<FSTCompletion.Completion> res, params string[] expected)
+ private void AssertMatchEquals(IList<FSTCompletion.Completion> res, params string[] expected)
{
- string[] result = new string[res.Count()];
- for (int i = 0; i < res.Count(); i++)
+ string[] result = new string[res.Count];
+ for (int i = 0; i < res.Count; i++)
{
- result[i] = res.ElementAt(i).toString();
+ result[i] = res[i].ToString();
}
if (!ArrayEqualityComparer<string>.OneDimensional.Equals(StripScore(expected), StripScore(result)))
@@ -279,25 +278,27 @@ namespace Lucene.Net.Search.Suggest.Fst
StringBuilder b = new StringBuilder();
string format = "{0," + colLen + "} {1," + colLen + "}\n";
- b.append(string.Format(CultureInfo.InvariantCulture, format, "Expected", "Result"));
+ b.Append(string.Format(CultureInfo.InvariantCulture, format, "Expected", "Result"));
for (int i = 0; i < Math.Max(result.Length, expected.Length); i++)
{
- b.append(string.Format(CultureInfo.InvariantCulture, format,
+ b.Append(string.Format(CultureInfo.InvariantCulture, format,
i < expected.Length ? expected[i] : "--",
i < result.Length ? result[i] : "--"));
}
- Console.WriteLine(b.toString());
- fail("Expected different output:\n" + b.toString());
+ Console.WriteLine(b.ToString());
+ fail("Expected different output:\n" + b.ToString());
}
}
+ private static readonly Regex Score = new Regex("\\/[0-9\\.]+", RegexOptions.Compiled);
+
private string[] StripScore(string[] expected)
{
string[] result = new string[expected.Length];
for (int i = 0; i < result.Length; i++)
{
- result[i] = Regex.Replace(expected[i], "\\/[0-9\\.]+", "");
+ result[i] = Score.Replace(expected[i], string.Empty);
}
return result;
}
[lucenenet] 25/26: Downgraded tests from netcoreapp2.2 to
netcoreapp2.1 because 2.2 is no longer supported and 2.1 is:
https://devblogs.microsoft.com/dotnet/net-core-2-2-will-reach-end-of-life-on-december-23-2019/
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 d2ade831c5121b74d5bc9ec76c0899b1bb50cceb
Author: Shad Storhaug <sh...@shadstorhaug.com>
AuthorDate: Wed Jun 24 20:58:16 2020 +0700
Downgraded tests from netcoreapp2.2 to netcoreapp2.1 because 2.2 is no longer supported and 2.1 is: https://devblogs.microsoft.com/dotnet/net-core-2-2-will-reach-end-of-life-on-december-23-2019/
---
TestTargetFramework.props | 4 ++--
azure-pipelines.yml | 10 +++++-----
.../azure-templates/publish-test-results-for-test-projects.yml | 2 +-
build/build.ps1 | 2 +-
.../Lucene.Net.Tests.TestFramework.csproj | 2 +-
.../Lucene.Net.Tests.CodeAnalysis.csproj | 2 +-
6 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/TestTargetFramework.props b/TestTargetFramework.props
index 28d2b2f..57b4430 100644
--- a/TestTargetFramework.props
+++ b/TestTargetFramework.props
@@ -27,13 +27,13 @@
Note that the main libraries are multi-targeted, so this has no effect on how they are compiled,
this setting only affects the test projects. -->
<!--<TargetFramework>net48</TargetFramework>-->
- <!--<TargetFramework>netcoreapp2.2</TargetFramework>-->
+ <!--<TargetFramework>netcoreapp2.1</TargetFramework>-->
<TargetFramework>netcoreapp3.1</TargetFramework>
<!-- Allow the build script to pass in the test frameworks to build for.
This overrides the above TargetFramework setting.
LUCENENET TODO: Due to a parsing bug, we cannot pass a string with a ; to dotnet msbuild, so passing true as a workaround -->
- <TargetFrameworks Condition=" '$(TestFrameworks)' == 'true' ">netcoreapp3.1;netcoreapp2.2</TargetFrameworks>
+ <TargetFrameworks Condition=" '$(TestFrameworks)' == 'true' ">netcoreapp3.1;netcoreapp2.1</TargetFrameworks>
<TargetFrameworks Condition=" '$(TestFrameworks)' == 'true' AND $([MSBuild]::IsOsPlatform('Windows')) ">$(TargetFrameworks);net48</TargetFrameworks>
<TargetFramework Condition=" '$(TargetFrameworks)' != '' "></TargetFramework>
</PropertyGroup>
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 8c71e9d..432768f 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -125,11 +125,11 @@ stages:
condition: and(succeeded(), ne(variables['RunTests'], 'false'))
- task: ArchiveFiles@2
- displayName: 'Zip $(PublishTempDirectory)/netcoreapp2.2'
+ displayName: 'Zip $(PublishTempDirectory)/netcoreapp2.1'
inputs:
- rootFolderOrFile: '$(PublishTempDirectory)/netcoreapp2.2'
+ rootFolderOrFile: '$(PublishTempDirectory)/netcoreapp2.1'
includeRootFolder: false
- archiveFile: '$(PublishDirectory)/netcoreapp2.2/$(PublishedArtifactZipFileName)'
+ archiveFile: '$(PublishDirectory)/netcoreapp2.1/$(PublishedArtifactZipFileName)'
condition: and(succeeded(), ne(variables['RunTests'], 'false'))
- task: ArchiveFiles@2
@@ -295,14 +295,14 @@ stages:
osName: 'macOS'
imageName: 'macOS-10.14'
maximumAllowedFailures: 4 # Maximum allowed failures for a successful build
- displayName: 'Test netcoreapp2.2 on'
+ displayName: 'Test netcoreapp2.1 on'
pool:
vmImage: $(imageName)
steps:
- template: 'build/azure-templates/run-tests-on-os.yml'
parameters:
osName: $(osName)
- framework: 'netcoreapp2.2'
+ framework: 'netcoreapp2.1'
testResultsArtifactName: '$(TestResultsArtifactName)'
publishedArtifactZipFileName: '$(PublishedArtifactZipFileName)'
maximumParallelJobs: 8
diff --git a/build/azure-templates/publish-test-results-for-test-projects.yml b/build/azure-templates/publish-test-results-for-test-projects.yml
index d0605f9..04f6eb3 100644
--- a/build/azure-templates/publish-test-results-for-test-projects.yml
+++ b/build/azure-templates/publish-test-results-for-test-projects.yml
@@ -69,7 +69,7 @@ steps:
# Special case: Only supports .NET Standard 2.0
- template: publish-test-results.yml
parameters:
- framework: 'netcoreapp2.2' # Since condtions are not supported for templates, we check for the file existence within publish-test-results.yml
+ framework: 'netcoreapp2.1' # Since condtions are not supported for templates, we check for the file existence within publish-test-results.yml
testProjectName: 'Lucene.Net.Tests.CodeAnalysis'
osName: '${{ parameters.osName }}'
testResultsFormat: '${{ parameters.testResultsFormat }}'
diff --git a/build/build.ps1 b/build/build.ps1
index 36c82d1..ead5044 100644
--- a/build/build.ps1
+++ b/build/build.ps1
@@ -48,7 +48,7 @@ properties {
[int]$maximumParalellJobs = 8
#test paramters
- [string]$frameworks_to_test = "netcoreapp3.1,netcoreapp2.2,net48"
+ [string]$frameworks_to_test = "netcoreapp3.1,netcoreapp2.1,net48"
[string]$where = ""
}
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 8aae68c..4efffa7 100644
--- a/src/Lucene.Net.Tests.TestFramework/Lucene.Net.Tests.TestFramework.csproj
+++ b/src/Lucene.Net.Tests.TestFramework/Lucene.Net.Tests.TestFramework.csproj
@@ -58,7 +58,7 @@
<PackageReference Include="System.Net.Primitives" Version="$(SystemNetPrimitivesPackageVersion)" />
</ItemGroup>
- <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.2' ">
+ <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="$(MicrosoftExtensionsConfigurationPackageVersion)" />
</ItemGroup>
diff --git a/src/dotnet/Lucene.Net.Tests.CodeAnalysis/Lucene.Net.Tests.CodeAnalysis.csproj b/src/dotnet/Lucene.Net.Tests.CodeAnalysis/Lucene.Net.Tests.CodeAnalysis.csproj
index b94c9c6..3e39c33 100644
--- a/src/dotnet/Lucene.Net.Tests.CodeAnalysis/Lucene.Net.Tests.CodeAnalysis.csproj
+++ b/src/dotnet/Lucene.Net.Tests.CodeAnalysis/Lucene.Net.Tests.CodeAnalysis.csproj
@@ -22,7 +22,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
- <TargetFramework>netcoreapp2.2</TargetFramework>
+ <TargetFramework>netcoreapp2.1</TargetFramework>
<RootNamespace>Lucene.Net.CodeAnalysis</RootNamespace>
</PropertyGroup>
[lucenenet] 02/26: addresses #295 optimised some Assert calls using
long,
long. NUnit seems to not treat these as numerics or at least elongates test
times.
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 a49ff752e14c59d6fa4a28aa647cf7ab33966e2f
Author: Michael <mi...@hotmail.com>
AuthorDate: Tue Jun 23 13:04:51 2020 +0700
addresses #295 optimised some Assert calls using long, long. NUnit seems to not treat these as numerics or at least elongates test times.
Did the same for byte comparisons.
---
.../Support/TestFramework/Assert.cs | 64 +++++++++++++++++++++-
.../Support/TestFramework/SeedAttribute.cs | 54 ++++++++++++++++++
src/Lucene.Net.Tests/Util/Fst/TestBytesStore.cs | 2 +
src/Lucene.Net.Tests/Util/Fst/TestFSTs.cs | 2 +
.../Util/Packed/TestEliasFanoSequence.cs | 2 +
src/Lucene.Net.Tests/Util/Packed/TestPackedInts.cs | 2 +
src/Lucene.Net.Tests/Util/TestBroadWord.cs | 1 +
src/Lucene.Net.Tests/Util/TestByteBlockPool.cs | 1 +
src/Lucene.Net.Tests/Util/TestIdentityHashSet.cs | 2 +
src/Lucene.Net.Tests/Util/TestNumericUtils.cs | 3 +-
src/Lucene.Net.Tests/Util/TestOpenBitSet.cs | 1 +
src/Lucene.Net.Tests/Util/TestPagedBytes.cs | 9 ++-
src/Lucene.Net.Tests/Util/TestWAH8DocIdSet.cs | 3 +
src/Lucene.Net/Util/Packed/EliasFanoDecoder.cs | 2 +-
14 files changed, 140 insertions(+), 8 deletions(-)
diff --git a/src/Lucene.Net.TestFramework.NUnit/Support/TestFramework/Assert.cs b/src/Lucene.Net.TestFramework.NUnit/Support/TestFramework/Assert.cs
index 428e476..2c0af47 100644
--- a/src/Lucene.Net.TestFramework.NUnit/Support/TestFramework/Assert.cs
+++ b/src/Lucene.Net.TestFramework.NUnit/Support/TestFramework/Assert.cs
@@ -4,6 +4,7 @@ using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
+using NUnit.Framework.Constraints;
using _NUnit = NUnit.Framework;
namespace Lucene.Net.TestFramework
@@ -163,6 +164,63 @@ namespace Lucene.Net.TestFramework
_NUnit.Assert.AreEqual(expected, actual, delta);
}
+ //
+ // Summary:
+ // Verifies that two objects are equal. Two objects are considered equal if both
+ // are null, or if both have the same value. NUnit has special semantics for some
+ // object types. If they are not equal an NUnit.Framework.AssertionException is
+ // thrown.
+ //
+ // Parameters:
+ // expected:
+ // The value that is expected
+ //
+ // actual:
+ // The actual value
+ public static void AreEqual(long expected, long actual)
+ {
+ _NUnit.Assert.True(expected == actual);
+ }
+
+ //
+ // Summary:
+ // Verifies that two objects are equal. Two objects are considered equal if both
+ // are null, or if both have the same value. NUnit has special semantics for some
+ // object types. If they are not equal an NUnit.Framework.AssertionException is
+ // thrown.
+ //
+ // Parameters:
+ // expected:
+ // The value that is expected
+ //
+ // message:
+ // The message to display in case of failure
+ //
+ // actual:
+ // The actual value
+ public static void AreEqual(long expected, long actual, string message)
+ {
+ _NUnit.Assert.True(expected == actual, message);
+ }
+
+ //
+ // Summary:
+ // Verifies that two objects are equal. Two objects are considered equal if both
+ // are null, or if both have the same value. NUnit has special semantics for some
+ // object types. If they are not equal an NUnit.Framework.AssertionException is
+ // thrown.
+ //
+ // Parameters:
+ // expected:
+ // The value that is expected
+ //
+ // actual:
+ // The actual value
+ public static void AreEqual(byte expected, byte actual)
+ {
+ _NUnit.Assert.True(expected == actual);
+ }
+
// From CollectionAssert
public static void AreEqual<T>(T[] expected, T[] actual)
{
@@ -362,7 +420,7 @@ namespace Lucene.Net.TestFramework
// The evaluated condition
public static void False(bool condition)
{
- _NUnit.Assert.False(condition);
+ _NUnit.Assert.That(condition, _NUnit.Is.False);
}
//
@@ -375,7 +433,7 @@ namespace Lucene.Net.TestFramework
// The evaluated condition
public static void IsFalse(bool condition)
{
- _NUnit.Assert.IsFalse(condition);
+ _NUnit.Assert.That(condition, _NUnit.Is.False);
}
//
@@ -394,7 +452,7 @@ namespace Lucene.Net.TestFramework
// Array of objects to be used in formatting the message
public static void IsFalse(bool condition, string message, params object[] args)
{
- _NUnit.Assert.IsFalse(condition, message, args);
+ _NUnit.Assert.That(condition, _NUnit.Is.False, message, args);
}
//
diff --git a/src/Lucene.Net.TestFramework/Support/TestFramework/SeedAttribute.cs b/src/Lucene.Net.TestFramework/Support/TestFramework/SeedAttribute.cs
new file mode 100644
index 0000000..5cdea8a
--- /dev/null
+++ b/src/Lucene.Net.TestFramework/Support/TestFramework/SeedAttribute.cs
@@ -0,0 +1,54 @@
+using System;
+using System.Reflection;
+using NUnit.Framework.Interfaces;
+using NUnit.Framework.Internal;
+using NUnit.Framework.Internal.Commands;
+
+[AttributeUsage(AttributeTargets.Method)]
+public sealed class SeedAttribute : Attribute, IWrapSetUpTearDown
+{
+ public SeedAttribute(int randomSeed)
+ {
+ RandomSeed = randomSeed;
+ }
+
+ public int RandomSeed { get; }
+
+ public TestCommand Wrap(TestCommand command)
+ {
+ return new SeedCommand(command, RandomSeed);
+ }
+
+ private sealed class SeedCommand : DelegatingTestCommand
+ {
+ private readonly int randomSeed;
+
+ public SeedCommand(TestCommand innerCommand, int randomSeed) : base(innerCommand)
+ {
+ this.randomSeed = randomSeed;
+ }
+
+ public override TestResult Execute(TestExecutionContext context)
+ {
+ ResetRandomSeed(context, randomSeed);
+ try
+ {
+ return innerCommand.Execute(context);
+ }
+ finally
+ {
+ if (context.CurrentTest.Seed != randomSeed)
+ throw new InvalidOperationException($"{nameof(SeedAttribute)} cannot be used together with an attribute or test that changes the seed.");
+ }
+ }
+ }
+
+ private static void ResetRandomSeed(TestExecutionContext context, int seed)
+ {
+ context.CurrentTest.Seed = seed;
+
+ typeof(TestExecutionContext)
+ .GetField("_randomGenerator", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly)
+ .SetValue(context, null);
+ }
+}
\ No newline at end of file
diff --git a/src/Lucene.Net.Tests/Util/Fst/TestBytesStore.cs b/src/Lucene.Net.Tests/Util/Fst/TestBytesStore.cs
index 7ab90b1..3c54f7c 100644
--- a/src/Lucene.Net.Tests/Util/Fst/TestBytesStore.cs
+++ b/src/Lucene.Net.Tests/Util/Fst/TestBytesStore.cs
@@ -2,6 +2,7 @@ using System;
using Lucene.Net.Randomized.Generators;
using NUnit.Framework;
using Console = Lucene.Net.Util.SystemConsole;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Util.Fst
{
@@ -34,6 +35,7 @@ namespace Lucene.Net.Util.Fst
{
[Test, LongRunningTest]
+ [Seed(1249648971)]
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 56bfe33..dbce10d 100644
--- a/src/Lucene.Net.Tests/Util/Fst/TestFSTs.cs
+++ b/src/Lucene.Net.Tests/Util/Fst/TestFSTs.cs
@@ -14,6 +14,7 @@ using System.Text;
using JCG = J2N.Collections.Generic;
using Console = Lucene.Net.Util.SystemConsole;
using J2N.Collections.Generic.Extensions;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Util.Fst
{
@@ -272,6 +273,7 @@ namespace Lucene.Net.Util.Fst
[Test, LongRunningTest] // Can take up to 15 minutes
+ [Seed(1249648971)]
public virtual void TestRandomWords()
{
// LUCENENET specific: NUnit will crash with an OOM if we do the full test
diff --git a/src/Lucene.Net.Tests/Util/Packed/TestEliasFanoSequence.cs b/src/Lucene.Net.Tests/Util/Packed/TestEliasFanoSequence.cs
index 8bbd490..20bad81 100644
--- a/src/Lucene.Net.Tests/Util/Packed/TestEliasFanoSequence.cs
+++ b/src/Lucene.Net.Tests/Util/Packed/TestEliasFanoSequence.cs
@@ -2,6 +2,8 @@ using Lucene.Net.Attributes;
using NUnit.Framework;
using System;
using System.Diagnostics;
+using Assert = Lucene.Net.TestFramework.Assert;
+
namespace Lucene.Net.Util.Packed
{
diff --git a/src/Lucene.Net.Tests/Util/Packed/TestPackedInts.cs b/src/Lucene.Net.Tests/Util/Packed/TestPackedInts.cs
index b3b6ad0..5975a0b 100644
--- a/src/Lucene.Net.Tests/Util/Packed/TestPackedInts.cs
+++ b/src/Lucene.Net.Tests/Util/Packed/TestPackedInts.cs
@@ -38,6 +38,7 @@ namespace Lucene.Net.Util.Packed
using RAMDirectory = Lucene.Net.Store.RAMDirectory;
//using Slow = Lucene.Net.Util.LuceneTestCase.Slow;
using Reader = Lucene.Net.Util.Packed.PackedInt32s.Reader;
+ using Assert = Lucene.Net.TestFramework.Assert;
using Attributes;
[TestFixture]
@@ -1127,6 +1128,7 @@ namespace Lucene.Net.Util.Packed
[Test, LongRunningTest]
+ [Seed(1249648971)]
public virtual void TestAppendingLongBuffer()
{
diff --git a/src/Lucene.Net.Tests/Util/TestBroadWord.cs b/src/Lucene.Net.Tests/Util/TestBroadWord.cs
index 1bd519d..b1ed9a2 100644
--- a/src/Lucene.Net.Tests/Util/TestBroadWord.cs
+++ b/src/Lucene.Net.Tests/Util/TestBroadWord.cs
@@ -2,6 +2,7 @@ using J2N.Numerics;
using Lucene.Net.Attributes;
using Lucene.Net.Support;
using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Util
{
diff --git a/src/Lucene.Net.Tests/Util/TestByteBlockPool.cs b/src/Lucene.Net.Tests/Util/TestByteBlockPool.cs
index a47c35c..b5e30e9 100644
--- a/src/Lucene.Net.Tests/Util/TestByteBlockPool.cs
+++ b/src/Lucene.Net.Tests/Util/TestByteBlockPool.cs
@@ -1,6 +1,7 @@
using Lucene.Net.Randomized.Generators;
using NUnit.Framework;
using System.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Util
{
diff --git a/src/Lucene.Net.Tests/Util/TestIdentityHashSet.cs b/src/Lucene.Net.Tests/Util/TestIdentityHashSet.cs
index db62dff..6bccb73 100644
--- a/src/Lucene.Net.Tests/Util/TestIdentityHashSet.cs
+++ b/src/Lucene.Net.Tests/Util/TestIdentityHashSet.cs
@@ -3,6 +3,7 @@ using NUnit.Framework;
using System;
using System.Collections.Generic;
using JCG = J2N.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Util
{
@@ -28,6 +29,7 @@ namespace Lucene.Net.Util
{
[Test]
+ [Seed(1249648971)]
public virtual void TestCheck()
{
Random rnd = Random;
diff --git a/src/Lucene.Net.Tests/Util/TestNumericUtils.cs b/src/Lucene.Net.Tests/Util/TestNumericUtils.cs
index e6c8f7c..0995959 100644
--- a/src/Lucene.Net.Tests/Util/TestNumericUtils.cs
+++ b/src/Lucene.Net.Tests/Util/TestNumericUtils.cs
@@ -3,6 +3,7 @@ using Lucene.Net.Attributes;
using NUnit.Framework;
using System;
using System.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Util
{
@@ -358,8 +359,8 @@ 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]
+ [Seed(1249648971)]
public virtual void TestRandomSplit()
{
long num = (long)AtLeast(10);
diff --git a/src/Lucene.Net.Tests/Util/TestOpenBitSet.cs b/src/Lucene.Net.Tests/Util/TestOpenBitSet.cs
index abfc039..e3b8e73 100644
--- a/src/Lucene.Net.Tests/Util/TestOpenBitSet.cs
+++ b/src/Lucene.Net.Tests/Util/TestOpenBitSet.cs
@@ -21,6 +21,7 @@ using Lucene.Net.Randomized.Generators;
using Lucene.Net.Support;
using NUnit.Framework;
using System.Collections;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Util
{
diff --git a/src/Lucene.Net.Tests/Util/TestPagedBytes.cs b/src/Lucene.Net.Tests/Util/TestPagedBytes.cs
index 7467891..1c6e307 100644
--- a/src/Lucene.Net.Tests/Util/TestPagedBytes.cs
+++ b/src/Lucene.Net.Tests/Util/TestPagedBytes.cs
@@ -21,6 +21,9 @@ using Lucene.Net.Store;
using Lucene.Net.Support;
using NUnit.Framework;
using System;
+using System.Collections;
+using System.Runtime.InteropServices;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Util
{
@@ -35,11 +38,11 @@ namespace Lucene.Net.Util
[TestFixture]
public class TestPagedBytes : LuceneTestCase
{
-
// Writes random byte/s to "normal" file in dir, then
// copies into PagedBytes and verifies with
// PagedBytes.Reader:
[Test, LongRunningTest]
+ [Seed(1249648971)]
public virtual void TestDataInputOutput()
{
Random random = Random;
@@ -180,7 +183,7 @@ namespace Lucene.Net.Util
}
}
- [Ignore("// memory hole")]
+ [Ignore("// memory hole")]
[Test, LongRunningTest]
public virtual void TestOverflow()
{
@@ -199,7 +202,7 @@ namespace Lucene.Net.Util
long numBytes = (1L << 31) + TestUtil.NextInt32(Random, 1, blockSize * 3);
var p = new PagedBytes(blockBits);
var @out = dir.CreateOutput("foo", IOContext.DEFAULT);
- for (long i = 0; i < numBytes; )
+ for (long i = 0; i < numBytes;)
{
Assert.AreEqual(i, @out.GetFilePointer());
int len = (int)Math.Min(arr.Length, numBytes - i);
diff --git a/src/Lucene.Net.Tests/Util/TestWAH8DocIdSet.cs b/src/Lucene.Net.Tests/Util/TestWAH8DocIdSet.cs
index eb842c8..24f036e 100644
--- a/src/Lucene.Net.Tests/Util/TestWAH8DocIdSet.cs
+++ b/src/Lucene.Net.Tests/Util/TestWAH8DocIdSet.cs
@@ -2,6 +2,7 @@ using Lucene.Net.Support;
using NUnit.Framework;
using System.Collections;
using System.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Util
{
@@ -43,6 +44,7 @@ namespace Lucene.Net.Util
}
[Test]
+ [Seed(1249648971)]
public virtual void TestUnion()
{
int numBits = TestUtil.NextInt32(Random, 100, 1 << 20);
@@ -71,6 +73,7 @@ namespace Lucene.Net.Util
}
[Test]
+ [Seed(1249648971)]
public virtual void TestIntersection()
{
int numBits = TestUtil.NextInt32(Random, 100, 1 << 20);
diff --git a/src/Lucene.Net/Util/Packed/EliasFanoDecoder.cs b/src/Lucene.Net/Util/Packed/EliasFanoDecoder.cs
index a720b02..b188d0c 100644
--- a/src/Lucene.Net/Util/Packed/EliasFanoDecoder.cs
+++ b/src/Lucene.Net/Util/Packed/EliasFanoDecoder.cs
@@ -134,7 +134,7 @@ namespace Lucene.Net.Util.Packed
/// <returns> The low value for the current decoding index. </returns>
private long CurrentLowValue()
{
- Debug.Assert(((efIndex >= 0) && (efIndex < numEncoded)), "efIndex " + efIndex);
+ Debug.Assert(((efIndex >= 0) && (efIndex < numEncoded)), $"efIndex {efIndex.ToString()}");
return UnPackValue(efEncoder.lowerLongs, efEncoder.numLowBits, efIndex, efEncoder.lowerBitsMask);
}
[lucenenet] 23/26: Lucene.Net.TestFramework: Removed SeedAttribute
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 d45d363c329d8df05958cffe733b8283ec29e986
Author: Shad Storhaug <sh...@shadstorhaug.com>
AuthorDate: Wed Jun 24 20:24:51 2020 +0700
Lucene.Net.TestFramework: Removed SeedAttribute
---
.../Support/TestFramework/SeedAttribute.cs | 54 ----------------------
src/Lucene.Net.Tests/Util/Fst/TestBytesStore.cs | 1 -
src/Lucene.Net.Tests/Util/Fst/TestFSTs.cs | 1 -
src/Lucene.Net.Tests/Util/Packed/TestPackedInts.cs | 1 -
src/Lucene.Net.Tests/Util/TestIdentityHashSet.cs | 1 -
src/Lucene.Net.Tests/Util/TestNumericUtils.cs | 1 -
src/Lucene.Net.Tests/Util/TestPagedBytes.cs | 1 -
src/Lucene.Net.Tests/Util/TestWAH8DocIdSet.cs | 2 -
8 files changed, 62 deletions(-)
diff --git a/src/Lucene.Net.TestFramework/Support/TestFramework/SeedAttribute.cs b/src/Lucene.Net.TestFramework/Support/TestFramework/SeedAttribute.cs
deleted file mode 100644
index 5cdea8a..0000000
--- a/src/Lucene.Net.TestFramework/Support/TestFramework/SeedAttribute.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-using System;
-using System.Reflection;
-using NUnit.Framework.Interfaces;
-using NUnit.Framework.Internal;
-using NUnit.Framework.Internal.Commands;
-
-[AttributeUsage(AttributeTargets.Method)]
-public sealed class SeedAttribute : Attribute, IWrapSetUpTearDown
-{
- public SeedAttribute(int randomSeed)
- {
- RandomSeed = randomSeed;
- }
-
- public int RandomSeed { get; }
-
- public TestCommand Wrap(TestCommand command)
- {
- return new SeedCommand(command, RandomSeed);
- }
-
- private sealed class SeedCommand : DelegatingTestCommand
- {
- private readonly int randomSeed;
-
- public SeedCommand(TestCommand innerCommand, int randomSeed) : base(innerCommand)
- {
- this.randomSeed = randomSeed;
- }
-
- public override TestResult Execute(TestExecutionContext context)
- {
- ResetRandomSeed(context, randomSeed);
- try
- {
- return innerCommand.Execute(context);
- }
- finally
- {
- if (context.CurrentTest.Seed != randomSeed)
- throw new InvalidOperationException($"{nameof(SeedAttribute)} cannot be used together with an attribute or test that changes the seed.");
- }
- }
- }
-
- private static void ResetRandomSeed(TestExecutionContext context, int seed)
- {
- context.CurrentTest.Seed = seed;
-
- typeof(TestExecutionContext)
- .GetField("_randomGenerator", BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.DeclaredOnly)
- .SetValue(context, null);
- }
-}
\ No newline at end of file
diff --git a/src/Lucene.Net.Tests/Util/Fst/TestBytesStore.cs b/src/Lucene.Net.Tests/Util/Fst/TestBytesStore.cs
index 3c54f7c..7b07911 100644
--- a/src/Lucene.Net.Tests/Util/Fst/TestBytesStore.cs
+++ b/src/Lucene.Net.Tests/Util/Fst/TestBytesStore.cs
@@ -35,7 +35,6 @@ namespace Lucene.Net.Util.Fst
{
[Test, LongRunningTest]
- [Seed(1249648971)]
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 2868051..c7bc993 100644
--- a/src/Lucene.Net.Tests/Util/Fst/TestFSTs.cs
+++ b/src/Lucene.Net.Tests/Util/Fst/TestFSTs.cs
@@ -273,7 +273,6 @@ namespace Lucene.Net.Util.Fst
[Test, LongRunningTest] // Can take up to 15 minutes
- [Seed(1249648971)]
public virtual void TestRandomWords()
{
// LUCENENET specific: NUnit will crash with an OOM if we do the full test
diff --git a/src/Lucene.Net.Tests/Util/Packed/TestPackedInts.cs b/src/Lucene.Net.Tests/Util/Packed/TestPackedInts.cs
index 5975a0b..d0de157 100644
--- a/src/Lucene.Net.Tests/Util/Packed/TestPackedInts.cs
+++ b/src/Lucene.Net.Tests/Util/Packed/TestPackedInts.cs
@@ -1128,7 +1128,6 @@ namespace Lucene.Net.Util.Packed
[Test, LongRunningTest]
- [Seed(1249648971)]
public virtual void TestAppendingLongBuffer()
{
diff --git a/src/Lucene.Net.Tests/Util/TestIdentityHashSet.cs b/src/Lucene.Net.Tests/Util/TestIdentityHashSet.cs
index 6bccb73..b27c6f2 100644
--- a/src/Lucene.Net.Tests/Util/TestIdentityHashSet.cs
+++ b/src/Lucene.Net.Tests/Util/TestIdentityHashSet.cs
@@ -29,7 +29,6 @@ namespace Lucene.Net.Util
{
[Test]
- [Seed(1249648971)]
public virtual void TestCheck()
{
Random rnd = Random;
diff --git a/src/Lucene.Net.Tests/Util/TestNumericUtils.cs b/src/Lucene.Net.Tests/Util/TestNumericUtils.cs
index 0995959..7f83222 100644
--- a/src/Lucene.Net.Tests/Util/TestNumericUtils.cs
+++ b/src/Lucene.Net.Tests/Util/TestNumericUtils.cs
@@ -360,7 +360,6 @@ namespace Lucene.Net.Util
AssertLongRangeSplit(long.MinValue, long.MinValue + 0x10L, 4, true, new long[] { 0x0000000000000010L, 0x0000000000000010L, 0x000000000000000L, 0x000000000000000L }, new int[] { 0, 4 });
}
[Test, LongRunningTest]
- [Seed(1249648971)]
public virtual void TestRandomSplit()
{
long num = (long)AtLeast(10);
diff --git a/src/Lucene.Net.Tests/Util/TestPagedBytes.cs b/src/Lucene.Net.Tests/Util/TestPagedBytes.cs
index 1c6e307..e6f5fbe 100644
--- a/src/Lucene.Net.Tests/Util/TestPagedBytes.cs
+++ b/src/Lucene.Net.Tests/Util/TestPagedBytes.cs
@@ -42,7 +42,6 @@ namespace Lucene.Net.Util
// copies into PagedBytes and verifies with
// PagedBytes.Reader:
[Test, LongRunningTest]
- [Seed(1249648971)]
public virtual void TestDataInputOutput()
{
Random random = Random;
diff --git a/src/Lucene.Net.Tests/Util/TestWAH8DocIdSet.cs b/src/Lucene.Net.Tests/Util/TestWAH8DocIdSet.cs
index 24f036e..fccef80 100644
--- a/src/Lucene.Net.Tests/Util/TestWAH8DocIdSet.cs
+++ b/src/Lucene.Net.Tests/Util/TestWAH8DocIdSet.cs
@@ -44,7 +44,6 @@ namespace Lucene.Net.Util
}
[Test]
- [Seed(1249648971)]
public virtual void TestUnion()
{
int numBits = TestUtil.NextInt32(Random, 100, 1 << 20);
@@ -73,7 +72,6 @@ namespace Lucene.Net.Util
}
[Test]
- [Seed(1249648971)]
public virtual void TestIntersection()
{
int numBits = TestUtil.NextInt32(Random, 100, 1 << 20);
[lucenenet] 15/26: Lucene.Net.Tests.Search +
Lucene.Net.Tests.Support: Switched to using the Assert class in the test
framework instead of NUnit (#295, #261)
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 b5f8a944060a372dbfdd01fbe33584bf39014e12
Author: Shad Storhaug <sh...@shadstorhaug.com>
AuthorDate: Wed Jun 24 07:36:16 2020 +0700
Lucene.Net.Tests.Search + Lucene.Net.Tests.Support: Switched to using the Assert class in the test framework instead of NUnit (#295, #261)
---
.../Support/TestFramework/Assert.cs | 10 ++
.../Analysis/Hunspell/StemmerTestBase.cs | 2 +-
src/Lucene.Net.Tests/Search/BaseTestRangeFilter.cs | 1 +
.../Search/FuzzyTermOnShortTermsTest.cs | 1 +
.../Search/Payloads/TestPayloadNearQuery.cs | 1 +
.../Search/Similarities/TestSimilarity2.cs | 3 +-
.../Search/Similarities/TestSimilarityBase.cs | 3 +-
src/Lucene.Net.Tests/Search/Spans/TestBasics.cs | 10 +-
.../Search/Spans/TestFieldMaskingSpanQuery.cs | 1 +
.../Search/Spans/TestNearSpansOrdered.cs | 1 +
.../Search/Spans/TestPayloadSpans.cs | 1 +
.../Search/Spans/TestSpanFirstQuery.cs | 34 +++---
.../Search/Spans/TestSpanMultiTermQueryWrapper.cs | 3 +-
src/Lucene.Net.Tests/Search/Spans/TestSpans.cs | 1 +
.../Search/Spans/TestSpansAdvanced.cs | 1 +
.../Search/Spans/TestSpansAdvanced2.cs | 1 +
src/Lucene.Net.Tests/Search/TestAutomatonQuery.cs | 1 +
.../Search/TestAutomatonQueryUnicode.cs | 3 +-
src/Lucene.Net.Tests/Search/TestBoolean2.cs | 1 +
.../Search/TestBooleanMinShouldMatch.cs | 4 +-
src/Lucene.Net.Tests/Search/TestBooleanOr.cs | 1 +
src/Lucene.Net.Tests/Search/TestBooleanQuery.cs | 14 +--
.../Search/TestBooleanQueryVisitSubscorers.cs | 1 +
src/Lucene.Net.Tests/Search/TestBooleanScorer.cs | 11 +-
.../Search/TestCachingCollector.cs | 7 +-
.../Search/TestCachingWrapperFilter.cs | 1 +
src/Lucene.Net.Tests/Search/TestConjunctions.cs | 1 +
.../Search/TestConstantScoreQuery.cs | 5 +-
.../Search/TestCustomSearcherSort.cs | 5 +-
src/Lucene.Net.Tests/Search/TestDateFilter.cs | 5 +-
.../Search/TestDisjunctionMaxQuery.cs | 1 +
src/Lucene.Net.Tests/Search/TestDocIdSet.cs | 10 +-
.../Search/TestDocTermOrdsRewriteMethod.cs | 1 +
.../Search/TestDocValuesScoring.cs | 9 +-
.../Search/TestElevationComparator.cs | 1 +
src/Lucene.Net.Tests/Search/TestFieldCache.cs | 7 +-
.../Search/TestFieldCacheRangeFilter.cs | 1 +
.../Search/TestFieldCacheRewriteMethod.cs | 4 +-
.../Search/TestFieldCacheTermsFilter.cs | 5 +-
.../Search/TestFieldValueFilter.cs | 4 +-
src/Lucene.Net.Tests/Search/TestFilteredQuery.cs | 1 +
src/Lucene.Net.Tests/Search/TestFilteredSearch.cs | 1 +
src/Lucene.Net.Tests/Search/TestFuzzyQuery.cs | 7 +-
src/Lucene.Net.Tests/Search/TestLiveFieldValues.cs | 1 +
.../Search/TestMatchAllDocsQuery.cs | 1 +
src/Lucene.Net.Tests/Search/TestMinShouldMatch2.cs | 1 +
.../Search/TestMultiPhraseQuery.cs | 1 +
.../Search/TestMultiTermConstantScore.cs | 122 ++++++++++-----------
.../Search/TestMultiTermQueryRewrites.cs | 8 +-
.../Search/TestMultiValuedNumericRangeQuery.cs | 1 +
.../Search/TestNGramPhraseQuery.cs | 4 +-
src/Lucene.Net.Tests/Search/TestNot.cs | 3 +-
.../Search/TestNumericRangeQuery32.cs | 1 +
.../Search/TestNumericRangeQuery64.cs | 1 +
.../Search/TestPhrasePrefixQuery.cs | 3 +-
src/Lucene.Net.Tests/Search/TestPhraseQuery.cs | 1 +
.../Search/TestPositionIncrement.cs | 3 +-
.../Search/TestPositiveScoresOnlyCollector.cs | 4 +-
src/Lucene.Net.Tests/Search/TestPrefixFilter.cs | 3 +-
.../Search/TestPrefixInBooleanQuery.cs | 3 +-
src/Lucene.Net.Tests/Search/TestPrefixQuery.cs | 3 +-
src/Lucene.Net.Tests/Search/TestQueryRescorer.cs | 8 +-
.../Search/TestQueryWrapperFilter.cs | 1 +
src/Lucene.Net.Tests/Search/TestRegexpQuery.cs | 8 +-
src/Lucene.Net.Tests/Search/TestRegexpRandom.cs | 1 +
.../Search/TestSameScoresWithThreads.cs | 2 +-
.../Search/TestScoreCachingWrappingScorer.cs | 5 +-
src/Lucene.Net.Tests/Search/TestScorerPerf.cs | 6 +-
src/Lucene.Net.Tests/Search/TestSearchAfter.cs | 1 +
src/Lucene.Net.Tests/Search/TestShardSearching.cs | 2 +-
src/Lucene.Net.Tests/Search/TestSimilarity.cs | 1 +
.../Search/TestSloppyPhraseQuery.cs | 1 +
src/Lucene.Net.Tests/Search/TestSort.cs | 1 +
src/Lucene.Net.Tests/Search/TestSortDocValues.cs | 4 +-
src/Lucene.Net.Tests/Search/TestSortRandom.cs | 1 +
src/Lucene.Net.Tests/Search/TestSortRescorer.cs | 9 +-
src/Lucene.Net.Tests/Search/TestSubScorerFreqs.cs | 22 ++--
src/Lucene.Net.Tests/Search/TestTermRangeFilter.cs | 5 +-
src/Lucene.Net.Tests/Search/TestTermRangeQuery.cs | 1 +
src/Lucene.Net.Tests/Search/TestTermVectors.cs | 1 +
.../Search/TestTopDocsCollector.cs | 4 +-
src/Lucene.Net.Tests/Search/TestTopDocsMerge.cs | 10 +-
.../Search/TestTopFieldCollector.cs | 3 +-
.../Search/TestTopScoreDocCollector.cs | 4 +-
.../Search/TestTotalHitCountCollector.cs | 3 +-
src/Lucene.Net.Tests/Search/TestWildcard.cs | 1 +
src/Lucene.Net.Tests/Search/TestWildcardRandom.cs | 1 +
src/Lucene.Net.Tests/Store/TestBufferedChecksum.cs | 1 +
.../Store/TestBufferedIndexInput.cs | 1 +
.../Store/TestByteArrayDataInput.cs | 1 +
src/Lucene.Net.Tests/Store/TestCopyBytes.cs | 1 +
src/Lucene.Net.Tests/Store/TestDirectory.cs | 1 +
.../Store/TestFileSwitchDirectory.cs | 3 +-
src/Lucene.Net.Tests/Store/TestHugeRamFile.cs | 1 +
src/Lucene.Net.Tests/Store/TestLock.cs | 1 +
src/Lucene.Net.Tests/Store/TestLockFactory.cs | 1 +
src/Lucene.Net.Tests/Store/TestMultiMMap.cs | 1 +
.../Store/TestNRTCachingDirectory.cs | 2 +-
src/Lucene.Net.Tests/Store/TestRAMDirectory.cs | 1 +
src/Lucene.Net.Tests/Support/TestCRC32.cs | 1 +
src/Lucene.Net.Tests/Support/TestOldPatches.cs | 9 +-
src/Lucene.Net.Tests/Support/TestSerialization.cs | 10 +-
src/Lucene.Net.Tests/Support/TestWeakDictionary.cs | 1 +
.../Support/TestWeakDictionaryBehavior.cs | 1 +
104 files changed, 282 insertions(+), 211 deletions(-)
diff --git a/src/Lucene.Net.TestFramework.NUnit/Support/TestFramework/Assert.cs b/src/Lucene.Net.TestFramework.NUnit/Support/TestFramework/Assert.cs
index 40334c8..a3fd36c 100644
--- a/src/Lucene.Net.TestFramework.NUnit/Support/TestFramework/Assert.cs
+++ b/src/Lucene.Net.TestFramework.NUnit/Support/TestFramework/Assert.cs
@@ -713,6 +713,16 @@ namespace Lucene.Net.TestFramework
}
+ public static void LessOrEqual(int arg1, int arg2)
+ {
+ _NUnit.Assert.LessOrEqual(arg1, arg2);
+ }
+
+ public static void Greater(int arg1, int arg2)
+ {
+ _NUnit.Assert.Greater(arg1, arg2);
+ }
+
public static Exception Throws<TException>(Action action)
{
return Throws(typeof(TException), action);
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/StemmerTestBase.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/StemmerTestBase.cs
index 941d01e..3384203 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/StemmerTestBase.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/StemmerTestBase.cs
@@ -1,9 +1,9 @@
using Lucene.Net.Support;
using Lucene.Net.Util;
-using NUnit.Framework;
using System;
using System.Collections.Generic;
using System.IO;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Analysis.Hunspell
{
diff --git a/src/Lucene.Net.Tests/Search/BaseTestRangeFilter.cs b/src/Lucene.Net.Tests/Search/BaseTestRangeFilter.cs
index 61583d5..de81b77 100644
--- a/src/Lucene.Net.Tests/Search/BaseTestRangeFilter.cs
+++ b/src/Lucene.Net.Tests/Search/BaseTestRangeFilter.cs
@@ -3,6 +3,7 @@ using Lucene.Net.Index.Extensions;
using NUnit.Framework;
using System;
using System.Text;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Search
{
diff --git a/src/Lucene.Net.Tests/Search/FuzzyTermOnShortTermsTest.cs b/src/Lucene.Net.Tests/Search/FuzzyTermOnShortTermsTest.cs
index cc2d0e6..e4a98fa 100644
--- a/src/Lucene.Net.Tests/Search/FuzzyTermOnShortTermsTest.cs
+++ b/src/Lucene.Net.Tests/Search/FuzzyTermOnShortTermsTest.cs
@@ -20,6 +20,7 @@ using Lucene.Net.Documents;
using Lucene.Net.Index.Extensions;
using NUnit.Framework;
using System.IO;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Search
{
diff --git a/src/Lucene.Net.Tests/Search/Payloads/TestPayloadNearQuery.cs b/src/Lucene.Net.Tests/Search/Payloads/TestPayloadNearQuery.cs
index f9d5f70..fd2dba9 100644
--- a/src/Lucene.Net.Tests/Search/Payloads/TestPayloadNearQuery.cs
+++ b/src/Lucene.Net.Tests/Search/Payloads/TestPayloadNearQuery.cs
@@ -7,6 +7,7 @@ using NUnit.Framework;
using System;
using System.IO;
using System.Text.RegularExpressions;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Search.Payloads
diff --git a/src/Lucene.Net.Tests/Search/Similarities/TestSimilarity2.cs b/src/Lucene.Net.Tests/Search/Similarities/TestSimilarity2.cs
index 481799b..72e04d7 100644
--- a/src/Lucene.Net.Tests/Search/Similarities/TestSimilarity2.cs
+++ b/src/Lucene.Net.Tests/Search/Similarities/TestSimilarity2.cs
@@ -1,10 +1,11 @@
using System.Collections.Generic;
using Lucene.Net.Documents;
using Lucene.Net.Index;
+using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Search.Similarities
{
- using NUnit.Framework;
using Directory = Lucene.Net.Store.Directory;
/*
diff --git a/src/Lucene.Net.Tests/Search/Similarities/TestSimilarityBase.cs b/src/Lucene.Net.Tests/Search/Similarities/TestSimilarityBase.cs
index cf31b6c..6628342 100644
--- a/src/Lucene.Net.Tests/Search/Similarities/TestSimilarityBase.cs
+++ b/src/Lucene.Net.Tests/Search/Similarities/TestSimilarityBase.cs
@@ -1,10 +1,11 @@
using System;
using System.Collections.Generic;
using Lucene.Net.Documents;
+using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Search.Similarities
{
- using NUnit.Framework;
using BytesRef = Lucene.Net.Util.BytesRef;
/*
diff --git a/src/Lucene.Net.Tests/Search/Spans/TestBasics.cs b/src/Lucene.Net.Tests/Search/Spans/TestBasics.cs
index 7705e5d..9301171 100644
--- a/src/Lucene.Net.Tests/Search/Spans/TestBasics.cs
+++ b/src/Lucene.Net.Tests/Search/Spans/TestBasics.cs
@@ -1,8 +1,13 @@
using J2N.Text;
+using Lucene.Net.Analysis;
using Lucene.Net.Analysis.TokenAttributes;
using Lucene.Net.Documents;
using Lucene.Net.Index.Extensions;
+using Lucene.Net.Util;
+using NUnit.Framework;
using System.Collections.Generic;
+using System.IO;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Search.Spans
{
@@ -23,10 +28,7 @@ namespace Lucene.Net.Search.Spans
* limitations under the License.
*/
- using Lucene.Net.Analysis;
- using Lucene.Net.Util;
- using NUnit.Framework;
- using System.IO;
+
using BytesRef = Lucene.Net.Util.BytesRef;
using Directory = Lucene.Net.Store.Directory;
using Document = Documents.Document;
diff --git a/src/Lucene.Net.Tests/Search/Spans/TestFieldMaskingSpanQuery.cs b/src/Lucene.Net.Tests/Search/Spans/TestFieldMaskingSpanQuery.cs
index b8f52bc..a87890d 100644
--- a/src/Lucene.Net.Tests/Search/Spans/TestFieldMaskingSpanQuery.cs
+++ b/src/Lucene.Net.Tests/Search/Spans/TestFieldMaskingSpanQuery.cs
@@ -3,6 +3,7 @@ using Lucene.Net.Index.Extensions;
using NUnit.Framework;
using System.Collections.Generic;
using JCG = J2N.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Search.Spans
{
diff --git a/src/Lucene.Net.Tests/Search/Spans/TestNearSpansOrdered.cs b/src/Lucene.Net.Tests/Search/Spans/TestNearSpansOrdered.cs
index e0d0f0d..2d65699 100644
--- a/src/Lucene.Net.Tests/Search/Spans/TestNearSpansOrdered.cs
+++ b/src/Lucene.Net.Tests/Search/Spans/TestNearSpansOrdered.cs
@@ -2,6 +2,7 @@ using Lucene.Net.Documents;
using Lucene.Net.Index;
using Lucene.Net.Index.Extensions;
using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Search.Spans
{
diff --git a/src/Lucene.Net.Tests/Search/Spans/TestPayloadSpans.cs b/src/Lucene.Net.Tests/Search/Spans/TestPayloadSpans.cs
index f89a80f..be31ca8 100644
--- a/src/Lucene.Net.Tests/Search/Spans/TestPayloadSpans.cs
+++ b/src/Lucene.Net.Tests/Search/Spans/TestPayloadSpans.cs
@@ -8,6 +8,7 @@ using Lucene.Net.Documents;
using NUnit.Framework;
using System.IO;
using JCG = J2N.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Search.Spans
diff --git a/src/Lucene.Net.Tests/Search/Spans/TestSpanFirstQuery.cs b/src/Lucene.Net.Tests/Search/Spans/TestSpanFirstQuery.cs
index 40e508f..0573ddb 100644
--- a/src/Lucene.Net.Tests/Search/Spans/TestSpanFirstQuery.cs
+++ b/src/Lucene.Net.Tests/Search/Spans/TestSpanFirstQuery.cs
@@ -1,25 +1,25 @@
using Lucene.Net.Documents;
+using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Search.Spans
{
- using NUnit.Framework;
-
/*
- * 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.
+ */
using Analyzer = Lucene.Net.Analysis.Analyzer;
using CharacterRunAutomaton = Lucene.Net.Util.Automaton.CharacterRunAutomaton;
diff --git a/src/Lucene.Net.Tests/Search/Spans/TestSpanMultiTermQueryWrapper.cs b/src/Lucene.Net.Tests/Search/Spans/TestSpanMultiTermQueryWrapper.cs
index b9e6fd2..9a87d66 100644
--- a/src/Lucene.Net.Tests/Search/Spans/TestSpanMultiTermQueryWrapper.cs
+++ b/src/Lucene.Net.Tests/Search/Spans/TestSpanMultiTermQueryWrapper.cs
@@ -1,8 +1,9 @@
using Lucene.Net.Documents;
+using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Search.Spans
{
- using NUnit.Framework;
using Directory = Lucene.Net.Store.Directory;
/*
diff --git a/src/Lucene.Net.Tests/Search/Spans/TestSpans.cs b/src/Lucene.Net.Tests/Search/Spans/TestSpans.cs
index 17fa10e..65d81eb 100644
--- a/src/Lucene.Net.Tests/Search/Spans/TestSpans.cs
+++ b/src/Lucene.Net.Tests/Search/Spans/TestSpans.cs
@@ -3,6 +3,7 @@ using Lucene.Net.Index;
using Lucene.Net.Index.Extensions;
using NUnit.Framework;
using System.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Search.Spans
{
diff --git a/src/Lucene.Net.Tests/Search/Spans/TestSpansAdvanced.cs b/src/Lucene.Net.Tests/Search/Spans/TestSpansAdvanced.cs
index 7b958d0..c652390 100644
--- a/src/Lucene.Net.Tests/Search/Spans/TestSpansAdvanced.cs
+++ b/src/Lucene.Net.Tests/Search/Spans/TestSpansAdvanced.cs
@@ -2,6 +2,7 @@ using Lucene.Net.Documents;
using Lucene.Net.Index.Extensions;
using NUnit.Framework;
using System;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Search.Spans
diff --git a/src/Lucene.Net.Tests/Search/Spans/TestSpansAdvanced2.cs b/src/Lucene.Net.Tests/Search/Spans/TestSpansAdvanced2.cs
index ddf076d..26da105 100644
--- a/src/Lucene.Net.Tests/Search/Spans/TestSpansAdvanced2.cs
+++ b/src/Lucene.Net.Tests/Search/Spans/TestSpansAdvanced2.cs
@@ -1,5 +1,6 @@
using Lucene.Net.Index.Extensions;
using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Search.Spans
{
diff --git a/src/Lucene.Net.Tests/Search/TestAutomatonQuery.cs b/src/Lucene.Net.Tests/Search/TestAutomatonQuery.cs
index d97a7ad..b6a46fd 100644
--- a/src/Lucene.Net.Tests/Search/TestAutomatonQuery.cs
+++ b/src/Lucene.Net.Tests/Search/TestAutomatonQuery.cs
@@ -4,6 +4,7 @@ using Lucene.Net.Documents;
using NUnit.Framework;
using System;
using System.Threading;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Search
diff --git a/src/Lucene.Net.Tests/Search/TestAutomatonQueryUnicode.cs b/src/Lucene.Net.Tests/Search/TestAutomatonQueryUnicode.cs
index c0b86c8..4fbf422 100644
--- a/src/Lucene.Net.Tests/Search/TestAutomatonQueryUnicode.cs
+++ b/src/Lucene.Net.Tests/Search/TestAutomatonQueryUnicode.cs
@@ -1,8 +1,9 @@
using Lucene.Net.Documents;
+using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Search
{
- using NUnit.Framework;
using Automaton = Lucene.Net.Util.Automaton.Automaton;
using Directory = Lucene.Net.Store.Directory;
diff --git a/src/Lucene.Net.Tests/Search/TestBoolean2.cs b/src/Lucene.Net.Tests/Search/TestBoolean2.cs
index 8ea259f..c6bd56e 100644
--- a/src/Lucene.Net.Tests/Search/TestBoolean2.cs
+++ b/src/Lucene.Net.Tests/Search/TestBoolean2.cs
@@ -2,6 +2,7 @@ using Lucene.Net.Documents;
using Lucene.Net.Index.Extensions;
using NUnit.Framework;
using System;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Search
diff --git a/src/Lucene.Net.Tests/Search/TestBooleanMinShouldMatch.cs b/src/Lucene.Net.Tests/Search/TestBooleanMinShouldMatch.cs
index 4387716..1b9df89 100644
--- a/src/Lucene.Net.Tests/Search/TestBooleanMinShouldMatch.cs
+++ b/src/Lucene.Net.Tests/Search/TestBooleanMinShouldMatch.cs
@@ -1,12 +1,12 @@
using System;
using System.Globalization;
using Lucene.Net.Documents;
+using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Search
{
- using Lucene.Net.Randomized.Generators;
- using NUnit.Framework;
using DefaultSimilarity = Lucene.Net.Search.Similarities.DefaultSimilarity;
using Directory = Lucene.Net.Store.Directory;
using Document = Documents.Document;
diff --git a/src/Lucene.Net.Tests/Search/TestBooleanOr.cs b/src/Lucene.Net.Tests/Search/TestBooleanOr.cs
index be7f8a1..05e720f 100644
--- a/src/Lucene.Net.Tests/Search/TestBooleanOr.cs
+++ b/src/Lucene.Net.Tests/Search/TestBooleanOr.cs
@@ -1,6 +1,7 @@
using J2N.Threading.Atomic;
using Lucene.Net.Documents;
using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Search
{
diff --git a/src/Lucene.Net.Tests/Search/TestBooleanQuery.cs b/src/Lucene.Net.Tests/Search/TestBooleanQuery.cs
index aaea68a..5a7dba0 100644
--- a/src/Lucene.Net.Tests/Search/TestBooleanQuery.cs
+++ b/src/Lucene.Net.Tests/Search/TestBooleanQuery.cs
@@ -1,16 +1,15 @@
+using Lucene.Net.Documents;
+using Lucene.Net.Index;
+using Lucene.Net.Util;
+using NUnit.Framework;
using System;
using System.Collections.Generic;
-using Lucene.Net.Documents;
+using System.Threading.Tasks;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Search
{
- using Index;
- using NUnit.Framework;
- using Support;
- using System.Threading.Tasks;
- using Util;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -40,6 +39,7 @@ namespace Lucene.Net.Search
using IndexWriterConfig = Lucene.Net.Index.IndexWriterConfig;
using LuceneTestCase = Lucene.Net.Util.LuceneTestCase;
using MockAnalyzer = Lucene.Net.Analysis.MockAnalyzer;
+ using MultiReader = Lucene.Net.Index.MultiReader;
using RandomIndexWriter = Lucene.Net.Index.RandomIndexWriter;
using SpanQuery = Lucene.Net.Search.Spans.SpanQuery;
using SpanTermQuery = Lucene.Net.Search.Spans.SpanTermQuery;
diff --git a/src/Lucene.Net.Tests/Search/TestBooleanQueryVisitSubscorers.cs b/src/Lucene.Net.Tests/Search/TestBooleanQueryVisitSubscorers.cs
index c5fd27b..0fdc6c4 100644
--- a/src/Lucene.Net.Tests/Search/TestBooleanQueryVisitSubscorers.cs
+++ b/src/Lucene.Net.Tests/Search/TestBooleanQueryVisitSubscorers.cs
@@ -3,6 +3,7 @@ using Lucene.Net.Documents;
using Lucene.Net.Index.Extensions;
using NUnit.Framework;
using JCG = J2N.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Search
{
diff --git a/src/Lucene.Net.Tests/Search/TestBooleanScorer.cs b/src/Lucene.Net.Tests/Search/TestBooleanScorer.cs
index ce7e502..b81886e 100644
--- a/src/Lucene.Net.Tests/Search/TestBooleanScorer.cs
+++ b/src/Lucene.Net.Tests/Search/TestBooleanScorer.cs
@@ -1,17 +1,15 @@
+using Lucene.Net.Documents;
+using NUnit.Framework;
using System;
using System.Collections.Generic;
-using Lucene.Net.Documents;
+using System.Diagnostics;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Search
{
- using Lucene.Net.Support;
- using NUnit.Framework;
- using System.Diagnostics;
using AtomicReaderContext = Lucene.Net.Index.AtomicReaderContext;
- using IBits = Lucene.Net.Util.IBits;
using BooleanWeight = Lucene.Net.Search.BooleanQuery.BooleanWeight;
using Directory = Lucene.Net.Store.Directory;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -31,6 +29,7 @@ namespace Lucene.Net.Search
using Document = Documents.Document;
using Field = Field;
+ using IBits = Lucene.Net.Util.IBits;
using IndexReader = Lucene.Net.Index.IndexReader;
using LuceneTestCase = Lucene.Net.Util.LuceneTestCase;
using RandomIndexWriter = Lucene.Net.Index.RandomIndexWriter;
diff --git a/src/Lucene.Net.Tests/Search/TestCachingCollector.cs b/src/Lucene.Net.Tests/Search/TestCachingCollector.cs
index cdb6e9d..75a46d7 100644
--- a/src/Lucene.Net.Tests/Search/TestCachingCollector.cs
+++ b/src/Lucene.Net.Tests/Search/TestCachingCollector.cs
@@ -1,8 +1,9 @@
+using NUnit.Framework;
+using System;
+using Assert = Lucene.Net.TestFramework.Assert;
+
namespace Lucene.Net.Search
{
- using NUnit.Framework;
- using System;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git a/src/Lucene.Net.Tests/Search/TestCachingWrapperFilter.cs b/src/Lucene.Net.Tests/Search/TestCachingWrapperFilter.cs
index b6ef29a..4aa832a 100644
--- a/src/Lucene.Net.Tests/Search/TestCachingWrapperFilter.cs
+++ b/src/Lucene.Net.Tests/Search/TestCachingWrapperFilter.cs
@@ -2,6 +2,7 @@ using Lucene.Net.Documents;
using Lucene.Net.Index.Extensions;
using NUnit.Framework;
using System;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Search
{
diff --git a/src/Lucene.Net.Tests/Search/TestConjunctions.cs b/src/Lucene.Net.Tests/Search/TestConjunctions.cs
index 7f7d198..5df4e67 100644
--- a/src/Lucene.Net.Tests/Search/TestConjunctions.cs
+++ b/src/Lucene.Net.Tests/Search/TestConjunctions.cs
@@ -1,6 +1,7 @@
using Lucene.Net.Documents;
using Lucene.Net.Index.Extensions;
using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Search
{
diff --git a/src/Lucene.Net.Tests/Search/TestConstantScoreQuery.cs b/src/Lucene.Net.Tests/Search/TestConstantScoreQuery.cs
index 3a83048..8929369 100644
--- a/src/Lucene.Net.Tests/Search/TestConstantScoreQuery.cs
+++ b/src/Lucene.Net.Tests/Search/TestConstantScoreQuery.cs
@@ -1,9 +1,10 @@
-using System.Diagnostics;
using Lucene.Net.Documents;
+using NUnit.Framework;
+using System.Diagnostics;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Search
{
- using NUnit.Framework;
using AtomicReaderContext = Lucene.Net.Index.AtomicReaderContext;
using DefaultSimilarity = Lucene.Net.Search.Similarities.DefaultSimilarity;
using Directory = Lucene.Net.Store.Directory;
diff --git a/src/Lucene.Net.Tests/Search/TestCustomSearcherSort.cs b/src/Lucene.Net.Tests/Search/TestCustomSearcherSort.cs
index 25af02b..a2bee8d 100644
--- a/src/Lucene.Net.Tests/Search/TestCustomSearcherSort.cs
+++ b/src/Lucene.Net.Tests/Search/TestCustomSearcherSort.cs
@@ -1,10 +1,11 @@
+using Lucene.Net.Documents;
using NUnit.Framework;
using System;
using System.Collections.Generic;
using System.Text;
-using Lucene.Net.Documents;
-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.Search
{
diff --git a/src/Lucene.Net.Tests/Search/TestDateFilter.cs b/src/Lucene.Net.Tests/Search/TestDateFilter.cs
index 85786e5..8ec2d27 100644
--- a/src/Lucene.Net.Tests/Search/TestDateFilter.cs
+++ b/src/Lucene.Net.Tests/Search/TestDateFilter.cs
@@ -1,10 +1,11 @@
-using System;
using Lucene.Net.Attributes;
using Lucene.Net.Documents;
+using NUnit.Framework;
+using System;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Search
{
- using NUnit.Framework;
using DateTools = DateTools;
using Directory = Lucene.Net.Store.Directory;
using Document = Documents.Document;
diff --git a/src/Lucene.Net.Tests/Search/TestDisjunctionMaxQuery.cs b/src/Lucene.Net.Tests/Search/TestDisjunctionMaxQuery.cs
index 298d087..818ad15 100644
--- a/src/Lucene.Net.Tests/Search/TestDisjunctionMaxQuery.cs
+++ b/src/Lucene.Net.Tests/Search/TestDisjunctionMaxQuery.cs
@@ -3,6 +3,7 @@ using System.Globalization;
using Lucene.Net.Documents;
using Lucene.Net.Index.Extensions;
using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Search
diff --git a/src/Lucene.Net.Tests/Search/TestDocIdSet.cs b/src/Lucene.Net.Tests/Search/TestDocIdSet.cs
index 101bd59..bd339dd 100644
--- a/src/Lucene.Net.Tests/Search/TestDocIdSet.cs
+++ b/src/Lucene.Net.Tests/Search/TestDocIdSet.cs
@@ -1,16 +1,15 @@
+using Lucene.Net.Documents;
+using Lucene.Net.Support;
+using NUnit.Framework;
using System;
using System.Collections.Generic;
-using Lucene.Net.Documents;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Search
{
- using Lucene.Net.Support;
- using NUnit.Framework;
using AtomicReaderContext = Lucene.Net.Index.AtomicReaderContext;
- using IBits = Lucene.Net.Util.IBits;
using Directory = Lucene.Net.Store.Directory;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -30,6 +29,7 @@ namespace Lucene.Net.Search
using Document = Documents.Document;
using Field = Field;
+ using IBits = Lucene.Net.Util.IBits;
using IndexReader = Lucene.Net.Index.IndexReader;
using LuceneTestCase = Lucene.Net.Util.LuceneTestCase;
using RandomIndexWriter = Lucene.Net.Index.RandomIndexWriter;
diff --git a/src/Lucene.Net.Tests/Search/TestDocTermOrdsRewriteMethod.cs b/src/Lucene.Net.Tests/Search/TestDocTermOrdsRewriteMethod.cs
index 5caba8b..a7d3429 100644
--- a/src/Lucene.Net.Tests/Search/TestDocTermOrdsRewriteMethod.cs
+++ b/src/Lucene.Net.Tests/Search/TestDocTermOrdsRewriteMethod.cs
@@ -4,6 +4,7 @@ using Lucene.Net.Util.Automaton;
using NUnit.Framework;
using System;
using System.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Search
diff --git a/src/Lucene.Net.Tests/Search/TestDocValuesScoring.cs b/src/Lucene.Net.Tests/Search/TestDocValuesScoring.cs
index 763cbec..59ae1f3 100644
--- a/src/Lucene.Net.Tests/Search/TestDocValuesScoring.cs
+++ b/src/Lucene.Net.Tests/Search/TestDocValuesScoring.cs
@@ -1,13 +1,13 @@
using Lucene.Net.Documents;
+using NUnit.Framework;
+using System;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Search
{
- using Lucene.Net.Index;
- using NUnit.Framework;
using AtomicReaderContext = Lucene.Net.Index.AtomicReaderContext;
using BytesRef = Lucene.Net.Util.BytesRef;
using Directory = Lucene.Net.Store.Directory;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -28,14 +28,13 @@ namespace Lucene.Net.Search
using Document = Documents.Document;
using Field = Field;
using FieldInvertState = Lucene.Net.Index.FieldInvertState;
- using SingleDocValuesField = SingleDocValuesField;
using IndexReader = Lucene.Net.Index.IndexReader;
using LuceneTestCase = Lucene.Net.Util.LuceneTestCase;
using PerFieldSimilarityWrapper = Lucene.Net.Search.Similarities.PerFieldSimilarityWrapper;
using RandomIndexWriter = Lucene.Net.Index.RandomIndexWriter;
using Similarity = Lucene.Net.Search.Similarities.Similarity;
+ using SingleDocValuesField = SingleDocValuesField;
using Term = Lucene.Net.Index.Term;
- using System;
/// <summary>
/// Tests the use of indexdocvalues in scoring.
diff --git a/src/Lucene.Net.Tests/Search/TestElevationComparator.cs b/src/Lucene.Net.Tests/Search/TestElevationComparator.cs
index 3296f2c..50e3b5f 100644
--- a/src/Lucene.Net.Tests/Search/TestElevationComparator.cs
+++ b/src/Lucene.Net.Tests/Search/TestElevationComparator.cs
@@ -5,6 +5,7 @@ using Lucene.Net.Store;
using NUnit.Framework;
using System;
using System.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Search
{
diff --git a/src/Lucene.Net.Tests/Search/TestFieldCache.cs b/src/Lucene.Net.Tests/Search/TestFieldCache.cs
index 1666206..20515cf 100644
--- a/src/Lucene.Net.Tests/Search/TestFieldCache.cs
+++ b/src/Lucene.Net.Tests/Search/TestFieldCache.cs
@@ -9,10 +9,11 @@ using System.Diagnostics;
using System.Collections.Generic;
using System.Globalization;
using System.IO;
+using System.Linq;
using System.Text;
using System.Threading;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
-using System.Linq;
namespace Lucene.Net.Search
{
@@ -847,7 +848,7 @@ namespace Lucene.Net.Search
#pragma warning disable 612, 618
Bytes bytes = cache.GetBytes(ar, "bogusbytes", true);
- Assert.AreEqual(0, bytes.Get(0));
+ Assert.AreEqual((byte)0, bytes.Get(0));
Int16s shorts = cache.GetInt16s(ar, "bogusshorts", true);
Assert.AreEqual(0, shorts.Get(0));
@@ -920,7 +921,7 @@ namespace Lucene.Net.Search
#pragma warning disable 612, 618
Bytes bytes = cache.GetBytes(ar, "bogusbytes", true);
- Assert.AreEqual(0, bytes.Get(0));
+ Assert.AreEqual((byte)0, bytes.Get(0));
Int16s shorts = cache.GetInt16s(ar, "bogusshorts", true);
Assert.AreEqual(0, shorts.Get(0));
diff --git a/src/Lucene.Net.Tests/Search/TestFieldCacheRangeFilter.cs b/src/Lucene.Net.Tests/Search/TestFieldCacheRangeFilter.cs
index 3be16ef..af4cd7e 100644
--- a/src/Lucene.Net.Tests/Search/TestFieldCacheRangeFilter.cs
+++ b/src/Lucene.Net.Tests/Search/TestFieldCacheRangeFilter.cs
@@ -3,6 +3,7 @@ using NUnit.Framework;
using System;
using System.Globalization;
using System.IO;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Search
{
diff --git a/src/Lucene.Net.Tests/Search/TestFieldCacheRewriteMethod.cs b/src/Lucene.Net.Tests/Search/TestFieldCacheRewriteMethod.cs
index c9c4f16..8590ebf 100644
--- a/src/Lucene.Net.Tests/Search/TestFieldCacheRewriteMethod.cs
+++ b/src/Lucene.Net.Tests/Search/TestFieldCacheRewriteMethod.cs
@@ -1,11 +1,9 @@
-using Lucene.Net.Attributes;
using Lucene.Net.Util.Automaton;
using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Search
{
- using RegExp = Lucene.Net.Util.Automaton.RegExp;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git a/src/Lucene.Net.Tests/Search/TestFieldCacheTermsFilter.cs b/src/Lucene.Net.Tests/Search/TestFieldCacheTermsFilter.cs
index 709388a..66e2f65 100644
--- a/src/Lucene.Net.Tests/Search/TestFieldCacheTermsFilter.cs
+++ b/src/Lucene.Net.Tests/Search/TestFieldCacheTermsFilter.cs
@@ -1,9 +1,10 @@
-using System.Collections.Generic;
using Lucene.Net.Documents;
+using NUnit.Framework;
+using System.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Search
{
- using NUnit.Framework;
using Directory = Lucene.Net.Store.Directory;
using Document = Documents.Document;
diff --git a/src/Lucene.Net.Tests/Search/TestFieldValueFilter.cs b/src/Lucene.Net.Tests/Search/TestFieldValueFilter.cs
index 5254f95..93779f0 100644
--- a/src/Lucene.Net.Tests/Search/TestFieldValueFilter.cs
+++ b/src/Lucene.Net.Tests/Search/TestFieldValueFilter.cs
@@ -1,9 +1,9 @@
using Lucene.Net.Documents;
+using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Search
{
- using Lucene.Net.Randomized.Generators;
- using NUnit.Framework;
using Directory = Lucene.Net.Store.Directory;
using DirectoryReader = Lucene.Net.Index.DirectoryReader;
using Document = Documents.Document;
diff --git a/src/Lucene.Net.Tests/Search/TestFilteredQuery.cs b/src/Lucene.Net.Tests/Search/TestFilteredQuery.cs
index 82ae64b..c049a55 100644
--- a/src/Lucene.Net.Tests/Search/TestFilteredQuery.cs
+++ b/src/Lucene.Net.Tests/Search/TestFilteredQuery.cs
@@ -5,6 +5,7 @@ using Lucene.Net.Util;
using NUnit.Framework;
using System;
using System.Collections;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Search
{
diff --git a/src/Lucene.Net.Tests/Search/TestFilteredSearch.cs b/src/Lucene.Net.Tests/Search/TestFilteredSearch.cs
index 0fea9ba..eebb04a 100644
--- a/src/Lucene.Net.Tests/Search/TestFilteredSearch.cs
+++ b/src/Lucene.Net.Tests/Search/TestFilteredSearch.cs
@@ -18,6 +18,7 @@ using Lucene.Net.Documents;
using Lucene.Net.Index.Extensions;
using NUnit.Framework;
using System;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Search
{
diff --git a/src/Lucene.Net.Tests/Search/TestFuzzyQuery.cs b/src/Lucene.Net.Tests/Search/TestFuzzyQuery.cs
index ef81666..04eb951 100644
--- a/src/Lucene.Net.Tests/Search/TestFuzzyQuery.cs
+++ b/src/Lucene.Net.Tests/Search/TestFuzzyQuery.cs
@@ -1,11 +1,10 @@
-using System.Collections.Generic;
using Lucene.Net.Documents;
-using Lucene.Net.Util;
+using NUnit.Framework;
+using System.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Search
{
- using Lucene.Net.Support;
- using NUnit.Framework;
using Directory = Lucene.Net.Store.Directory;
using Document = Documents.Document;
using Field = Field;
diff --git a/src/Lucene.Net.Tests/Search/TestLiveFieldValues.cs b/src/Lucene.Net.Tests/Search/TestLiveFieldValues.cs
index 9686e1a..29ba0ca 100644
--- a/src/Lucene.Net.Tests/Search/TestLiveFieldValues.cs
+++ b/src/Lucene.Net.Tests/Search/TestLiveFieldValues.cs
@@ -6,6 +6,7 @@ using System;
using System.Collections.Generic;
using System.Globalization;
using System.Threading;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Search
diff --git a/src/Lucene.Net.Tests/Search/TestMatchAllDocsQuery.cs b/src/Lucene.Net.Tests/Search/TestMatchAllDocsQuery.cs
index 51ee477..86db603 100644
--- a/src/Lucene.Net.Tests/Search/TestMatchAllDocsQuery.cs
+++ b/src/Lucene.Net.Tests/Search/TestMatchAllDocsQuery.cs
@@ -18,6 +18,7 @@
using Lucene.Net.Documents;
using Lucene.Net.Index.Extensions;
using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Search
{
diff --git a/src/Lucene.Net.Tests/Search/TestMinShouldMatch2.cs b/src/Lucene.Net.Tests/Search/TestMinShouldMatch2.cs
index 84e92cd..6db5e1b 100644
--- a/src/Lucene.Net.Tests/Search/TestMinShouldMatch2.cs
+++ b/src/Lucene.Net.Tests/Search/TestMinShouldMatch2.cs
@@ -6,6 +6,7 @@ using Lucene.Net.Util;
using NUnit.Framework;
using System.Collections.Generic;
using System.Diagnostics;
+using Assert = Lucene.Net.TestFramework.Assert;
using JCG = J2N.Collections.Generic;
using J2N.Collections.Generic.Extensions;
diff --git a/src/Lucene.Net.Tests/Search/TestMultiPhraseQuery.cs b/src/Lucene.Net.Tests/Search/TestMultiPhraseQuery.cs
index 567ef03..ca460c7 100644
--- a/src/Lucene.Net.Tests/Search/TestMultiPhraseQuery.cs
+++ b/src/Lucene.Net.Tests/Search/TestMultiPhraseQuery.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using Lucene.Net.Documents;
using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Search
diff --git a/src/Lucene.Net.Tests/Search/TestMultiTermConstantScore.cs b/src/Lucene.Net.Tests/Search/TestMultiTermConstantScore.cs
index 3742e07..deaac96 100644
--- a/src/Lucene.Net.Tests/Search/TestMultiTermConstantScore.cs
+++ b/src/Lucene.Net.Tests/Search/TestMultiTermConstantScore.cs
@@ -2,6 +2,7 @@ using Lucene.Net.Documents;
using Lucene.Net.Index.Extensions;
using NUnit.Framework;
using System;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Search
@@ -50,11 +51,6 @@ namespace Lucene.Net.Search
internal /*static*/ Directory Small;
internal /*static*/ IndexReader Reader;
- public static void AssertEquals(string m, int e, int a)
- {
- Assert.AreEqual(e, a, m);
- }
-
/// <summary>
/// LUCENENET specific
/// Is non-static because NewIndexWriterConfig is no longer static.
@@ -167,7 +163,7 @@ namespace Lucene.Net.Search
result = search.Search(Csrq("data", "1", "6", T, T), null, 1000).ScoreDocs;
int numHits = result.Length;
- AssertEquals("wrong number of results", 6, numHits);
+ assertEquals("wrong number of results", 6, numHits);
float score = result[0].Score;
for (int i = 1; i < numHits; i++)
{
@@ -176,7 +172,7 @@ namespace Lucene.Net.Search
result = search.Search(Csrq("data", "1", "6", T, T, MultiTermQuery.CONSTANT_SCORE_BOOLEAN_QUERY_REWRITE), null, 1000).ScoreDocs;
numHits = result.Length;
- AssertEquals("wrong number of results", 6, numHits);
+ assertEquals("wrong number of results", 6, numHits);
for (int i = 0; i < numHits; i++)
{
Assert.AreEqual(score, result[i].Score, SCORE_COMP_THRESH, "score for " + i + " was not the same");
@@ -184,7 +180,7 @@ namespace Lucene.Net.Search
result = search.Search(Csrq("data", "1", "6", T, T, MultiTermQuery.CONSTANT_SCORE_AUTO_REWRITE_DEFAULT), null, 1000).ScoreDocs;
numHits = result.Length;
- AssertEquals("wrong number of results", 6, numHits);
+ assertEquals("wrong number of results", 6, numHits);
for (int i = 0; i < numHits; i++)
{
Assert.AreEqual(score, result[i].Score, SCORE_COMP_THRESH, "score for " + i + " was not the same");
@@ -207,7 +203,7 @@ namespace Lucene.Net.Search
bq.Add(Csrq("data", "#", "#", T, T), Occur.SHOULD); // hits no docs
result = search.Search(bq, null, 1000).ScoreDocs;
int numHits = result.Length;
- AssertEquals("wrong number of results", 1, numHits);
+ assertEquals("wrong number of results", 1, numHits);
float score = result[0].Score;
for (int i = 1; i < numHits; i++)
{
@@ -219,7 +215,7 @@ namespace Lucene.Net.Search
bq.Add(Csrq("data", "#", "#", T, T, MultiTermQuery.CONSTANT_SCORE_BOOLEAN_QUERY_REWRITE), Occur.SHOULD); // hits no docs
result = search.Search(bq, null, 1000).ScoreDocs;
numHits = result.Length;
- AssertEquals("wrong number of results", 1, numHits);
+ assertEquals("wrong number of results", 1, numHits);
for (int i = 0; i < numHits; i++)
{
Assert.AreEqual(score, result[i].Score, SCORE_COMP_THRESH, "score for " + i + " was not the same");
@@ -230,7 +226,7 @@ namespace Lucene.Net.Search
bq.Add(Csrq("data", "#", "#", T, T, MultiTermQuery.CONSTANT_SCORE_AUTO_REWRITE_DEFAULT), Occur.SHOULD); // hits no docs
result = search.Search(bq, null, 1000).ScoreDocs;
numHits = result.Length;
- AssertEquals("wrong number of results", 1, numHits);
+ assertEquals("wrong number of results", 1, numHits);
for (int i = 0; i < numHits; i++)
{
Assert.AreEqual(score, result[i].Score, SCORE_COMP_THRESH, "score for " + i + " was not the same");
@@ -351,10 +347,10 @@ namespace Lucene.Net.Search
ScoreDoc[] actual = search.Search(q, null, 1000).ScoreDocs;
- AssertEquals("wrong numebr of hits", numHits, actual.Length);
+ assertEquals("wrong numebr of hits", numHits, actual.Length);
for (int i = 0; i < numHits; i++)
{
- AssertEquals("mismatch in docid for hit#" + i, expected[i].Doc, actual[i].Doc);
+ assertEquals("mismatch in docid for hit#" + i, expected[i].Doc, actual[i].Doc);
}
}
@@ -379,117 +375,117 @@ namespace Lucene.Net.Search
int numDocs = reader.NumDocs;
- AssertEquals("num of docs", numDocs, 1 + MaxId - MinId);
+ assertEquals("num of docs", numDocs, 1 + MaxId - MinId);
ScoreDoc[] result;
// test id, bounded on both ends
result = search.Search(Csrq("id", minIP, maxIP, T, T), null, numDocs).ScoreDocs;
- AssertEquals("find all", numDocs, result.Length);
+ assertEquals("find all", numDocs, result.Length);
result = search.Search(Csrq("id", minIP, maxIP, T, T, MultiTermQuery.CONSTANT_SCORE_AUTO_REWRITE_DEFAULT), null, numDocs).ScoreDocs;
- AssertEquals("find all", numDocs, result.Length);
+ assertEquals("find all", numDocs, result.Length);
result = search.Search(Csrq("id", minIP, maxIP, T, F), null, numDocs).ScoreDocs;
- AssertEquals("all but last", numDocs - 1, result.Length);
+ assertEquals("all but last", numDocs - 1, result.Length);
result = search.Search(Csrq("id", minIP, maxIP, T, F, MultiTermQuery.CONSTANT_SCORE_AUTO_REWRITE_DEFAULT), null, numDocs).ScoreDocs;
- AssertEquals("all but last", numDocs - 1, result.Length);
+ assertEquals("all but last", numDocs - 1, result.Length);
result = search.Search(Csrq("id", minIP, maxIP, F, T), null, numDocs).ScoreDocs;
- AssertEquals("all but first", numDocs - 1, result.Length);
+ assertEquals("all but first", numDocs - 1, result.Length);
result = search.Search(Csrq("id", minIP, maxIP, F, T, MultiTermQuery.CONSTANT_SCORE_AUTO_REWRITE_DEFAULT), null, numDocs).ScoreDocs;
- AssertEquals("all but first", numDocs - 1, result.Length);
+ assertEquals("all but first", numDocs - 1, result.Length);
result = search.Search(Csrq("id", minIP, maxIP, F, F), null, numDocs).ScoreDocs;
- AssertEquals("all but ends", numDocs - 2, result.Length);
+ assertEquals("all but ends", numDocs - 2, result.Length);
result = search.Search(Csrq("id", minIP, maxIP, F, F, MultiTermQuery.CONSTANT_SCORE_AUTO_REWRITE_DEFAULT), null, numDocs).ScoreDocs;
- AssertEquals("all but ends", numDocs - 2, result.Length);
+ assertEquals("all but ends", numDocs - 2, result.Length);
result = search.Search(Csrq("id", medIP, maxIP, T, T), null, numDocs).ScoreDocs;
- AssertEquals("med and up", 1 + MaxId - medId, result.Length);
+ assertEquals("med and up", 1 + MaxId - medId, result.Length);
result = search.Search(Csrq("id", medIP, maxIP, T, T, MultiTermQuery.CONSTANT_SCORE_AUTO_REWRITE_DEFAULT), null, numDocs).ScoreDocs;
- AssertEquals("med and up", 1 + MaxId - medId, result.Length);
+ assertEquals("med and up", 1 + MaxId - medId, result.Length);
result = search.Search(Csrq("id", minIP, medIP, T, T), null, numDocs).ScoreDocs;
- AssertEquals("up to med", 1 + medId - MinId, result.Length);
+ assertEquals("up to med", 1 + medId - MinId, result.Length);
result = search.Search(Csrq("id", minIP, medIP, T, T, MultiTermQuery.CONSTANT_SCORE_AUTO_REWRITE_DEFAULT), null, numDocs).ScoreDocs;
- AssertEquals("up to med", 1 + medId - MinId, result.Length);
+ assertEquals("up to med", 1 + medId - MinId, result.Length);
// unbounded id
result = search.Search(Csrq("id", minIP, null, T, F), null, numDocs).ScoreDocs;
- AssertEquals("min and up", numDocs, result.Length);
+ assertEquals("min and up", numDocs, result.Length);
result = search.Search(Csrq("id", null, maxIP, F, T), null, numDocs).ScoreDocs;
- AssertEquals("max and down", numDocs, result.Length);
+ assertEquals("max and down", numDocs, result.Length);
result = search.Search(Csrq("id", minIP, null, F, F), null, numDocs).ScoreDocs;
- AssertEquals("not min, but up", numDocs - 1, result.Length);
+ assertEquals("not min, but up", numDocs - 1, result.Length);
result = search.Search(Csrq("id", null, maxIP, F, F), null, numDocs).ScoreDocs;
- AssertEquals("not max, but down", numDocs - 1, result.Length);
+ assertEquals("not max, but down", numDocs - 1, result.Length);
result = search.Search(Csrq("id", medIP, maxIP, T, F), null, numDocs).ScoreDocs;
- AssertEquals("med and up, not max", MaxId - medId, result.Length);
+ assertEquals("med and up, not max", MaxId - medId, result.Length);
result = search.Search(Csrq("id", minIP, medIP, F, T), null, numDocs).ScoreDocs;
- AssertEquals("not min, up to med", medId - MinId, result.Length);
+ assertEquals("not min, up to med", medId - MinId, result.Length);
// very small sets
result = search.Search(Csrq("id", minIP, minIP, F, F), null, numDocs).ScoreDocs;
- AssertEquals("min,min,F,F", 0, result.Length);
+ assertEquals("min,min,F,F", 0, result.Length);
result = search.Search(Csrq("id", minIP, minIP, F, F, MultiTermQuery.CONSTANT_SCORE_AUTO_REWRITE_DEFAULT), null, numDocs).ScoreDocs;
- AssertEquals("min,min,F,F", 0, result.Length);
+ assertEquals("min,min,F,F", 0, result.Length);
result = search.Search(Csrq("id", medIP, medIP, F, F), null, numDocs).ScoreDocs;
- AssertEquals("med,med,F,F", 0, result.Length);
+ assertEquals("med,med,F,F", 0, result.Length);
result = search.Search(Csrq("id", medIP, medIP, F, F, MultiTermQuery.CONSTANT_SCORE_AUTO_REWRITE_DEFAULT), null, numDocs).ScoreDocs;
- AssertEquals("med,med,F,F", 0, result.Length);
+ assertEquals("med,med,F,F", 0, result.Length);
result = search.Search(Csrq("id", maxIP, maxIP, F, F), null, numDocs).ScoreDocs;
- AssertEquals("max,max,F,F", 0, result.Length);
+ assertEquals("max,max,F,F", 0, result.Length);
result = search.Search(Csrq("id", maxIP, maxIP, F, F, MultiTermQuery.CONSTANT_SCORE_AUTO_REWRITE_DEFAULT), null, numDocs).ScoreDocs;
- AssertEquals("max,max,F,F", 0, result.Length);
+ assertEquals("max,max,F,F", 0, result.Length);
result = search.Search(Csrq("id", minIP, minIP, T, T), null, numDocs).ScoreDocs;
- AssertEquals("min,min,T,T", 1, result.Length);
+ assertEquals("min,min,T,T", 1, result.Length);
result = search.Search(Csrq("id", minIP, minIP, T, T, MultiTermQuery.CONSTANT_SCORE_AUTO_REWRITE_DEFAULT), null, numDocs).ScoreDocs;
- AssertEquals("min,min,T,T", 1, result.Length);
+ assertEquals("min,min,T,T", 1, result.Length);
result = search.Search(Csrq("id", null, minIP, F, T), null, numDocs).ScoreDocs;
- AssertEquals("nul,min,F,T", 1, result.Length);
+ assertEquals("nul,min,F,T", 1, result.Length);
result = search.Search(Csrq("id", null, minIP, F, T, MultiTermQuery.CONSTANT_SCORE_AUTO_REWRITE_DEFAULT), null, numDocs).ScoreDocs;
- AssertEquals("nul,min,F,T", 1, result.Length);
+ assertEquals("nul,min,F,T", 1, result.Length);
result = search.Search(Csrq("id", maxIP, maxIP, T, T), null, numDocs).ScoreDocs;
- AssertEquals("max,max,T,T", 1, result.Length);
+ assertEquals("max,max,T,T", 1, result.Length);
result = search.Search(Csrq("id", maxIP, maxIP, T, T, MultiTermQuery.CONSTANT_SCORE_AUTO_REWRITE_DEFAULT), null, numDocs).ScoreDocs;
- AssertEquals("max,max,T,T", 1, result.Length);
+ assertEquals("max,max,T,T", 1, result.Length);
result = search.Search(Csrq("id", maxIP, null, T, F), null, numDocs).ScoreDocs;
- AssertEquals("max,nul,T,T", 1, result.Length);
+ assertEquals("max,nul,T,T", 1, result.Length);
result = search.Search(Csrq("id", maxIP, null, T, F, MultiTermQuery.CONSTANT_SCORE_AUTO_REWRITE_DEFAULT), null, numDocs).ScoreDocs;
- AssertEquals("max,nul,T,T", 1, result.Length);
+ assertEquals("max,nul,T,T", 1, result.Length);
result = search.Search(Csrq("id", medIP, medIP, T, T), null, numDocs).ScoreDocs;
- AssertEquals("med,med,T,T", 1, result.Length);
+ assertEquals("med,med,T,T", 1, result.Length);
result = search.Search(Csrq("id", medIP, medIP, T, T, MultiTermQuery.CONSTANT_SCORE_AUTO_REWRITE_DEFAULT), null, numDocs).ScoreDocs;
- AssertEquals("med,med,T,T", 1, result.Length);
+ assertEquals("med,med,T,T", 1, result.Length);
}
[Test]
@@ -505,54 +501,54 @@ namespace Lucene.Net.Search
int numDocs = reader.NumDocs;
- AssertEquals("num of docs", numDocs, 1 + MaxId - MinId);
+ assertEquals("num of docs", numDocs, 1 + MaxId - MinId);
ScoreDoc[] result;
// test extremes, bounded on both ends
result = search.Search(Csrq("rand", minRP, maxRP, T, T), null, numDocs).ScoreDocs;
- AssertEquals("find all", numDocs, result.Length);
+ assertEquals("find all", numDocs, result.Length);
result = search.Search(Csrq("rand", minRP, maxRP, T, F), null, numDocs).ScoreDocs;
- AssertEquals("all but biggest", numDocs - 1, result.Length);
+ assertEquals("all but biggest", numDocs - 1, result.Length);
result = search.Search(Csrq("rand", minRP, maxRP, F, T), null, numDocs).ScoreDocs;
- AssertEquals("all but smallest", numDocs - 1, result.Length);
+ assertEquals("all but smallest", numDocs - 1, result.Length);
result = search.Search(Csrq("rand", minRP, maxRP, F, F), null, numDocs).ScoreDocs;
- AssertEquals("all but extremes", numDocs - 2, result.Length);
+ assertEquals("all but extremes", numDocs - 2, result.Length);
// unbounded
result = search.Search(Csrq("rand", minRP, null, T, F), null, numDocs).ScoreDocs;
- AssertEquals("smallest and up", numDocs, result.Length);
+ assertEquals("smallest and up", numDocs, result.Length);
result = search.Search(Csrq("rand", null, maxRP, F, T), null, numDocs).ScoreDocs;
- AssertEquals("biggest and down", numDocs, result.Length);
+ assertEquals("biggest and down", numDocs, result.Length);
result = search.Search(Csrq("rand", minRP, null, F, F), null, numDocs).ScoreDocs;
- AssertEquals("not smallest, but up", numDocs - 1, result.Length);
+ assertEquals("not smallest, but up", numDocs - 1, result.Length);
result = search.Search(Csrq("rand", null, maxRP, F, F), null, numDocs).ScoreDocs;
- AssertEquals("not biggest, but down", numDocs - 1, result.Length);
+ assertEquals("not biggest, but down", numDocs - 1, result.Length);
// very small sets
result = search.Search(Csrq("rand", minRP, minRP, F, F), null, numDocs).ScoreDocs;
- AssertEquals("min,min,F,F", 0, result.Length);
+ assertEquals("min,min,F,F", 0, result.Length);
result = search.Search(Csrq("rand", maxRP, maxRP, F, F), null, numDocs).ScoreDocs;
- AssertEquals("max,max,F,F", 0, result.Length);
+ assertEquals("max,max,F,F", 0, result.Length);
result = search.Search(Csrq("rand", minRP, minRP, T, T), null, numDocs).ScoreDocs;
- AssertEquals("min,min,T,T", 1, result.Length);
+ assertEquals("min,min,T,T", 1, result.Length);
result = search.Search(Csrq("rand", null, minRP, F, T), null, numDocs).ScoreDocs;
- AssertEquals("nul,min,F,T", 1, result.Length);
+ assertEquals("nul,min,F,T", 1, result.Length);
result = search.Search(Csrq("rand", maxRP, maxRP, T, T), null, numDocs).ScoreDocs;
- AssertEquals("max,max,T,T", 1, result.Length);
+ assertEquals("max,max,T,T", 1, result.Length);
result = search.Search(Csrq("rand", maxRP, null, T, F), null, numDocs).ScoreDocs;
- AssertEquals("max,nul,T,T", 1, result.Length);
+ assertEquals("max,nul,T,T", 1, result.Length);
}
}
}
\ No newline at end of file
diff --git a/src/Lucene.Net.Tests/Search/TestMultiTermQueryRewrites.cs b/src/Lucene.Net.Tests/Search/TestMultiTermQueryRewrites.cs
index a53b1ce..4ca6a68 100644
--- a/src/Lucene.Net.Tests/Search/TestMultiTermQueryRewrites.cs
+++ b/src/Lucene.Net.Tests/Search/TestMultiTermQueryRewrites.cs
@@ -1,13 +1,13 @@
+using Lucene.Net.Documents;
+using NUnit.Framework;
using System;
using System.Diagnostics;
-using Lucene.Net.Documents;
+using System.Runtime.CompilerServices;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Search
{
- using NUnit.Framework;
- using System.Runtime.CompilerServices;
- using Util;
using AttributeSource = Lucene.Net.Util.AttributeSource;
using BytesRef = Lucene.Net.Util.BytesRef;
using Directory = Lucene.Net.Store.Directory;
diff --git a/src/Lucene.Net.Tests/Search/TestMultiValuedNumericRangeQuery.cs b/src/Lucene.Net.Tests/Search/TestMultiValuedNumericRangeQuery.cs
index bd1d849..8cc786f 100644
--- a/src/Lucene.Net.Tests/Search/TestMultiValuedNumericRangeQuery.cs
+++ b/src/Lucene.Net.Tests/Search/TestMultiValuedNumericRangeQuery.cs
@@ -1,6 +1,7 @@
using Lucene.Net.Documents;
using Lucene.Net.Index.Extensions;
using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Search
{
diff --git a/src/Lucene.Net.Tests/Search/TestNGramPhraseQuery.cs b/src/Lucene.Net.Tests/Search/TestNGramPhraseQuery.cs
index 01275e8..0df327f 100644
--- a/src/Lucene.Net.Tests/Search/TestNGramPhraseQuery.cs
+++ b/src/Lucene.Net.Tests/Search/TestNGramPhraseQuery.cs
@@ -1,6 +1,8 @@
+using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
+
namespace Lucene.Net.Search
{
- using NUnit.Framework;
using Directory = Lucene.Net.Store.Directory;
/*
diff --git a/src/Lucene.Net.Tests/Search/TestNot.cs b/src/Lucene.Net.Tests/Search/TestNot.cs
index f6a2328..5557433 100644
--- a/src/Lucene.Net.Tests/Search/TestNot.cs
+++ b/src/Lucene.Net.Tests/Search/TestNot.cs
@@ -1,8 +1,9 @@
using Lucene.Net.Documents;
+using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Search
{
- using NUnit.Framework;
using Directory = Lucene.Net.Store.Directory;
using Document = Documents.Document;
diff --git a/src/Lucene.Net.Tests/Search/TestNumericRangeQuery32.cs b/src/Lucene.Net.Tests/Search/TestNumericRangeQuery32.cs
index 4140353..da686d7 100644
--- a/src/Lucene.Net.Tests/Search/TestNumericRangeQuery32.cs
+++ b/src/Lucene.Net.Tests/Search/TestNumericRangeQuery32.cs
@@ -3,6 +3,7 @@ using Lucene.Net.Index.Extensions;
using NUnit.Framework;
using System;
using System.Diagnostics;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Search
diff --git a/src/Lucene.Net.Tests/Search/TestNumericRangeQuery64.cs b/src/Lucene.Net.Tests/Search/TestNumericRangeQuery64.cs
index c1482e8..750e287 100644
--- a/src/Lucene.Net.Tests/Search/TestNumericRangeQuery64.cs
+++ b/src/Lucene.Net.Tests/Search/TestNumericRangeQuery64.cs
@@ -3,6 +3,7 @@ using Lucene.Net.Index.Extensions;
using NUnit.Framework;
using System;
using System.Diagnostics;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Search
diff --git a/src/Lucene.Net.Tests/Search/TestPhrasePrefixQuery.cs b/src/Lucene.Net.Tests/Search/TestPhrasePrefixQuery.cs
index 83cfdc1..cd52431 100644
--- a/src/Lucene.Net.Tests/Search/TestPhrasePrefixQuery.cs
+++ b/src/Lucene.Net.Tests/Search/TestPhrasePrefixQuery.cs
@@ -2,10 +2,11 @@ using System;
using System.Collections.Generic;
using System.Linq;
using Lucene.Net.Documents;
+using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Search
{
- using NUnit.Framework;
using BytesRef = Lucene.Net.Util.BytesRef;
using Directory = Lucene.Net.Store.Directory;
using Document = Documents.Document;
diff --git a/src/Lucene.Net.Tests/Search/TestPhraseQuery.cs b/src/Lucene.Net.Tests/Search/TestPhraseQuery.cs
index fe8f091..cba997b 100644
--- a/src/Lucene.Net.Tests/Search/TestPhraseQuery.cs
+++ b/src/Lucene.Net.Tests/Search/TestPhraseQuery.cs
@@ -9,6 +9,7 @@ using System;
using System.Collections.Generic;
using System.IO;
using System.Text;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Search
{
diff --git a/src/Lucene.Net.Tests/Search/TestPositionIncrement.cs b/src/Lucene.Net.Tests/Search/TestPositionIncrement.cs
index ce05331..c1c7c43 100644
--- a/src/Lucene.Net.Tests/Search/TestPositionIncrement.cs
+++ b/src/Lucene.Net.Tests/Search/TestPositionIncrement.cs
@@ -1,8 +1,7 @@
using Lucene.Net.Analysis.TokenAttributes;
+using Lucene.Net.Documents;
using System;
-using System.Collections.Generic;
using System.Text;
-using Lucene.Net.Documents;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Search
diff --git a/src/Lucene.Net.Tests/Search/TestPositiveScoresOnlyCollector.cs b/src/Lucene.Net.Tests/Search/TestPositiveScoresOnlyCollector.cs
index bb5a51e..0366104 100644
--- a/src/Lucene.Net.Tests/Search/TestPositiveScoresOnlyCollector.cs
+++ b/src/Lucene.Net.Tests/Search/TestPositiveScoresOnlyCollector.cs
@@ -1,6 +1,8 @@
+using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
+
namespace Lucene.Net.Search
{
- using NUnit.Framework;
using Directory = Lucene.Net.Store.Directory;
/*
diff --git a/src/Lucene.Net.Tests/Search/TestPrefixFilter.cs b/src/Lucene.Net.Tests/Search/TestPrefixFilter.cs
index 31b2db2..aaabcaa 100644
--- a/src/Lucene.Net.Tests/Search/TestPrefixFilter.cs
+++ b/src/Lucene.Net.Tests/Search/TestPrefixFilter.cs
@@ -1,8 +1,9 @@
using Lucene.Net.Documents;
+using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Search
{
- using NUnit.Framework;
using Directory = Lucene.Net.Store.Directory;
using Document = Documents.Document;
diff --git a/src/Lucene.Net.Tests/Search/TestPrefixInBooleanQuery.cs b/src/Lucene.Net.Tests/Search/TestPrefixInBooleanQuery.cs
index 299878b..cad223a 100644
--- a/src/Lucene.Net.Tests/Search/TestPrefixInBooleanQuery.cs
+++ b/src/Lucene.Net.Tests/Search/TestPrefixInBooleanQuery.cs
@@ -1,8 +1,9 @@
using Lucene.Net.Documents;
+using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Search
{
- using NUnit.Framework;
using Directory = Lucene.Net.Store.Directory;
/*
diff --git a/src/Lucene.Net.Tests/Search/TestPrefixQuery.cs b/src/Lucene.Net.Tests/Search/TestPrefixQuery.cs
index 9b5ecb6..7e26569 100644
--- a/src/Lucene.Net.Tests/Search/TestPrefixQuery.cs
+++ b/src/Lucene.Net.Tests/Search/TestPrefixQuery.cs
@@ -1,8 +1,9 @@
using Lucene.Net.Documents;
+using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Search
{
- using NUnit.Framework;
using Directory = Lucene.Net.Store.Directory;
using Document = Documents.Document;
diff --git a/src/Lucene.Net.Tests/Search/TestQueryRescorer.cs b/src/Lucene.Net.Tests/Search/TestQueryRescorer.cs
index 02a41fa..5818a41 100644
--- a/src/Lucene.Net.Tests/Search/TestQueryRescorer.cs
+++ b/src/Lucene.Net.Tests/Search/TestQueryRescorer.cs
@@ -1,13 +1,13 @@
using Lucene.Net.Documents;
+using Lucene.Net.Support;
+using NUnit.Framework;
using System;
+using System.Collections.Generic;
using System.Text;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Search
{
- using Lucene.Net.Support;
- using NUnit.Framework;
- using System.Collections.Generic;
- using System.IO;
using AtomicReaderContext = Lucene.Net.Index.AtomicReaderContext;
using DefaultSimilarity = Lucene.Net.Search.Similarities.DefaultSimilarity;
using Directory = Lucene.Net.Store.Directory;
diff --git a/src/Lucene.Net.Tests/Search/TestQueryWrapperFilter.cs b/src/Lucene.Net.Tests/Search/TestQueryWrapperFilter.cs
index 38d9f65..3e79d19 100644
--- a/src/Lucene.Net.Tests/Search/TestQueryWrapperFilter.cs
+++ b/src/Lucene.Net.Tests/Search/TestQueryWrapperFilter.cs
@@ -2,6 +2,7 @@ using System.Collections.Generic;
using Lucene.Net.Documents;
using Lucene.Net.Index.Extensions;
using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
using JCG = J2N.Collections.Generic;
namespace Lucene.Net.Search
diff --git a/src/Lucene.Net.Tests/Search/TestRegexpQuery.cs b/src/Lucene.Net.Tests/Search/TestRegexpQuery.cs
index b6ff47a..6cac647 100644
--- a/src/Lucene.Net.Tests/Search/TestRegexpQuery.cs
+++ b/src/Lucene.Net.Tests/Search/TestRegexpQuery.cs
@@ -1,17 +1,15 @@
-using Lucene.Net.Util.Automaton;
using Lucene.Net.Documents;
-using Lucene.Net.Support;
+using Lucene.Net.Util.Automaton;
using NUnit.Framework;
using System;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Search
{
using Automaton = Lucene.Net.Util.Automaton.Automaton;
- using IAutomatonProvider = Lucene.Net.Util.Automaton.IAutomatonProvider;
using BasicAutomata = Lucene.Net.Util.Automaton.BasicAutomata;
using BasicOperations = Lucene.Net.Util.Automaton.BasicOperations;
using Directory = Lucene.Net.Store.Directory;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -31,10 +29,10 @@ namespace Lucene.Net.Search
using Document = Documents.Document;
using Field = Field;
+ using IAutomatonProvider = Lucene.Net.Util.Automaton.IAutomatonProvider;
using IndexReader = Lucene.Net.Index.IndexReader;
using LuceneTestCase = Lucene.Net.Util.LuceneTestCase;
using RandomIndexWriter = Lucene.Net.Index.RandomIndexWriter;
- using RegExp = Lucene.Net.Util.Automaton.RegExp;
using Term = Lucene.Net.Index.Term;
/// <summary>
diff --git a/src/Lucene.Net.Tests/Search/TestRegexpRandom.cs b/src/Lucene.Net.Tests/Search/TestRegexpRandom.cs
index a9cc994..451e56b 100644
--- a/src/Lucene.Net.Tests/Search/TestRegexpRandom.cs
+++ b/src/Lucene.Net.Tests/Search/TestRegexpRandom.cs
@@ -2,6 +2,7 @@ using Lucene.Net.Documents;
using Lucene.Net.Index.Extensions;
using NUnit.Framework;
using System.Text;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Search
{
diff --git a/src/Lucene.Net.Tests/Search/TestSameScoresWithThreads.cs b/src/Lucene.Net.Tests/Search/TestSameScoresWithThreads.cs
index 7b2d295..f5fb7de 100644
--- a/src/Lucene.Net.Tests/Search/TestSameScoresWithThreads.cs
+++ b/src/Lucene.Net.Tests/Search/TestSameScoresWithThreads.cs
@@ -1,10 +1,10 @@
using J2N.Collections.Generic.Extensions;
using J2N.Threading;
-using Lucene.Net.Support;
using NUnit.Framework;
using System;
using System.Collections.Generic;
using System.Threading;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Search
{
diff --git a/src/Lucene.Net.Tests/Search/TestScoreCachingWrappingScorer.cs b/src/Lucene.Net.Tests/Search/TestScoreCachingWrappingScorer.cs
index 5512723..39ba796 100644
--- a/src/Lucene.Net.Tests/Search/TestScoreCachingWrappingScorer.cs
+++ b/src/Lucene.Net.Tests/Search/TestScoreCachingWrappingScorer.cs
@@ -1,7 +1,8 @@
+using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
+
namespace Lucene.Net.Search
{
- using NUnit.Framework;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git a/src/Lucene.Net.Tests/Search/TestScorerPerf.cs b/src/Lucene.Net.Tests/Search/TestScorerPerf.cs
index 347fc86..86361c2 100644
--- a/src/Lucene.Net.Tests/Search/TestScorerPerf.cs
+++ b/src/Lucene.Net.Tests/Search/TestScorerPerf.cs
@@ -1,21 +1,21 @@
-using Lucene.Net.Attributes;
using Lucene.Net.Documents;
using Lucene.Net.Index.Extensions;
using Lucene.Net.Support;
+using NUnit.Framework;
using System;
using System.Collections;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Search
{
- using NUnit.Framework;
using AtomicReaderContext = Lucene.Net.Index.AtomicReaderContext;
- using IBits = Lucene.Net.Util.IBits;
using Directory = Lucene.Net.Store.Directory;
using DirectoryReader = Lucene.Net.Index.DirectoryReader;
using DocIdBitSet = Lucene.Net.Util.DocIdBitSet;
using Document = Documents.Document;
using Field = Field;
+ using IBits = Lucene.Net.Util.IBits;
using IndexReader = Lucene.Net.Index.IndexReader;
using IndexWriter = Lucene.Net.Index.IndexWriter;
using LuceneTestCase = Lucene.Net.Util.LuceneTestCase;
diff --git a/src/Lucene.Net.Tests/Search/TestSearchAfter.cs b/src/Lucene.Net.Tests/Search/TestSearchAfter.cs
index 630c173..1a0a953 100644
--- a/src/Lucene.Net.Tests/Search/TestSearchAfter.cs
+++ b/src/Lucene.Net.Tests/Search/TestSearchAfter.cs
@@ -7,6 +7,7 @@ using Lucene.Net.Randomized.Generators;
using Lucene.Net.Support;
using Lucene.Net.Util;
using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Search
diff --git a/src/Lucene.Net.Tests/Search/TestShardSearching.cs b/src/Lucene.Net.Tests/Search/TestShardSearching.cs
index df881d2..f89d9c3 100644
--- a/src/Lucene.Net.Tests/Search/TestShardSearching.cs
+++ b/src/Lucene.Net.Tests/Search/TestShardSearching.cs
@@ -1,9 +1,9 @@
using J2N.Collections.Generic.Extensions;
-using Lucene.Net.Randomized.Generators;
using Lucene.Net.Support;
using NUnit.Framework;
using System;
using System.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Search
diff --git a/src/Lucene.Net.Tests/Search/TestSimilarity.cs b/src/Lucene.Net.Tests/Search/TestSimilarity.cs
index 8f79484..33ee7c4 100644
--- a/src/Lucene.Net.Tests/Search/TestSimilarity.cs
+++ b/src/Lucene.Net.Tests/Search/TestSimilarity.cs
@@ -1,6 +1,7 @@
using Lucene.Net.Documents;
using Lucene.Net.Index.Extensions;
using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Search
{
diff --git a/src/Lucene.Net.Tests/Search/TestSloppyPhraseQuery.cs b/src/Lucene.Net.Tests/Search/TestSloppyPhraseQuery.cs
index e9ffbc8..4159f08 100644
--- a/src/Lucene.Net.Tests/Search/TestSloppyPhraseQuery.cs
+++ b/src/Lucene.Net.Tests/Search/TestSloppyPhraseQuery.cs
@@ -3,6 +3,7 @@ using Lucene.Net.Documents;
using NUnit.Framework;
using System;
using System.Text.RegularExpressions;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Search
{
diff --git a/src/Lucene.Net.Tests/Search/TestSort.cs b/src/Lucene.Net.Tests/Search/TestSort.cs
index a47b7bd..11d53f1 100644
--- a/src/Lucene.Net.Tests/Search/TestSort.cs
+++ b/src/Lucene.Net.Tests/Search/TestSort.cs
@@ -7,6 +7,7 @@ using System;
using System.Collections.Generic;
using System.IO;
using System.Text;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Search
{
diff --git a/src/Lucene.Net.Tests/Search/TestSortDocValues.cs b/src/Lucene.Net.Tests/Search/TestSortDocValues.cs
index b8b5e62..da69e3e 100644
--- a/src/Lucene.Net.Tests/Search/TestSortDocValues.cs
+++ b/src/Lucene.Net.Tests/Search/TestSortDocValues.cs
@@ -1,10 +1,10 @@
using Lucene.Net.Attributes;
using Lucene.Net.Documents;
+using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Search
{
- using NUnit.Framework;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git a/src/Lucene.Net.Tests/Search/TestSortRandom.cs b/src/Lucene.Net.Tests/Search/TestSortRandom.cs
index 56314a9..26b526f 100644
--- a/src/Lucene.Net.Tests/Search/TestSortRandom.cs
+++ b/src/Lucene.Net.Tests/Search/TestSortRandom.cs
@@ -5,6 +5,7 @@ using System;
using System.Collections.Generic;
using System.Linq;
using JCG = J2N.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Search
diff --git a/src/Lucene.Net.Tests/Search/TestSortRescorer.cs b/src/Lucene.Net.Tests/Search/TestSortRescorer.cs
index 2e5532c..f75ee70 100644
--- a/src/Lucene.Net.Tests/Search/TestSortRescorer.cs
+++ b/src/Lucene.Net.Tests/Search/TestSortRescorer.cs
@@ -1,13 +1,12 @@
+using Lucene.Net.Documents;
+using NUnit.Framework;
using System;
+using System.Collections.Generic;
using System.Text;
-using Lucene.Net.Documents;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Search
{
- using Lucene.Net.Randomized.Generators;
- using NUnit.Framework;
- using System.Collections.Generic;
- using System.IO;
using Directory = Lucene.Net.Store.Directory;
using DirectoryReader = Lucene.Net.Index.DirectoryReader;
diff --git a/src/Lucene.Net.Tests/Search/TestSubScorerFreqs.cs b/src/Lucene.Net.Tests/Search/TestSubScorerFreqs.cs
index c921684..760eb76 100644
--- a/src/Lucene.Net.Tests/Search/TestSubScorerFreqs.cs
+++ b/src/Lucene.Net.Tests/Search/TestSubScorerFreqs.cs
@@ -2,10 +2,10 @@ using Lucene.Net.Documents;
using Lucene.Net.Index;
using Lucene.Net.Index.Extensions;
using Lucene.Net.Store;
-using Lucene.Net.Support;
using Lucene.Net.Util;
using NUnit.Framework;
using System.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
using JCG = J2N.Collections.Generic;
namespace Lucene.Net.Search
@@ -151,11 +151,11 @@ namespace Lucene.Net.Search
{
IDictionary<Query, float?> doc0 = c.DocCounts[i];
Assert.AreEqual(1, doc0.Count);
- Assert.AreEqual(4.0F, doc0[q], FLOAT_TOLERANCE);
+ Assert.AreEqual(4.0F, doc0[q].GetValueOrDefault(), FLOAT_TOLERANCE);
IDictionary<Query, float?> doc1 = c.DocCounts[++i];
Assert.AreEqual(1, doc1.Count);
- Assert.AreEqual(1.0F, doc1[q], FLOAT_TOLERANCE);
+ Assert.AreEqual(1.0F, doc1[q].GetValueOrDefault(), FLOAT_TOLERANCE);
}
}
@@ -191,20 +191,20 @@ namespace Lucene.Net.Search
{
IDictionary<Query, float?> doc0 = c.DocCounts[i];
Assert.AreEqual(includeOptional ? 5 : 4, doc0.Count);
- Assert.AreEqual(1.0F, doc0[aQuery], FLOAT_TOLERANCE);
- Assert.AreEqual(4.0F, doc0[dQuery], FLOAT_TOLERANCE);
+ Assert.AreEqual(1.0F, doc0[aQuery].GetValueOrDefault(), FLOAT_TOLERANCE);
+ Assert.AreEqual(4.0F, doc0[dQuery].GetValueOrDefault(), FLOAT_TOLERANCE);
if (includeOptional)
{
- Assert.AreEqual(3.0F, doc0[cQuery], FLOAT_TOLERANCE);
+ Assert.AreEqual(3.0F, doc0[cQuery].GetValueOrDefault(), FLOAT_TOLERANCE);
}
IDictionary<Query, float?> doc1 = c.DocCounts[++i];
Assert.AreEqual(includeOptional ? 5 : 4, doc1.Count);
- Assert.AreEqual(1.0F, doc1[aQuery], FLOAT_TOLERANCE);
- Assert.AreEqual(1.0F, doc1[dQuery], FLOAT_TOLERANCE);
+ Assert.AreEqual(1.0F, doc1[aQuery].GetValueOrDefault(), FLOAT_TOLERANCE);
+ Assert.AreEqual(1.0F, doc1[dQuery].GetValueOrDefault(), FLOAT_TOLERANCE);
if (includeOptional)
{
- Assert.AreEqual(1.0F, doc1[cQuery], FLOAT_TOLERANCE);
+ Assert.AreEqual(1.0F, doc1[cQuery].GetValueOrDefault(), FLOAT_TOLERANCE);
}
}
}
@@ -224,11 +224,11 @@ namespace Lucene.Net.Search
{
IDictionary<Query, float?> doc0 = c.DocCounts[i];
Assert.AreEqual(1, doc0.Count);
- Assert.AreEqual(2.0F, doc0[q], FLOAT_TOLERANCE);
+ Assert.AreEqual(2.0F, doc0[q].GetValueOrDefault(), FLOAT_TOLERANCE);
IDictionary<Query, float?> doc1 = c.DocCounts[++i];
Assert.AreEqual(1, doc1.Count);
- Assert.AreEqual(1.0F, doc1[q], FLOAT_TOLERANCE);
+ Assert.AreEqual(1.0F, doc1[q].GetValueOrDefault(), FLOAT_TOLERANCE);
}
}
}
diff --git a/src/Lucene.Net.Tests/Search/TestTermRangeFilter.cs b/src/Lucene.Net.Tests/Search/TestTermRangeFilter.cs
index bb1c4d0..c44d7e0 100644
--- a/src/Lucene.Net.Tests/Search/TestTermRangeFilter.cs
+++ b/src/Lucene.Net.Tests/Search/TestTermRangeFilter.cs
@@ -1,7 +1,8 @@
+using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
+
namespace Lucene.Net.Search
{
- using NUnit.Framework;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git a/src/Lucene.Net.Tests/Search/TestTermRangeQuery.cs b/src/Lucene.Net.Tests/Search/TestTermRangeQuery.cs
index 107acbf..0a7573d 100644
--- a/src/Lucene.Net.Tests/Search/TestTermRangeQuery.cs
+++ b/src/Lucene.Net.Tests/Search/TestTermRangeQuery.cs
@@ -4,6 +4,7 @@ using Lucene.Net.Documents;
using Lucene.Net.Index.Extensions;
using NUnit.Framework;
using System.IO;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Search
{
diff --git a/src/Lucene.Net.Tests/Search/TestTermVectors.cs b/src/Lucene.Net.Tests/Search/TestTermVectors.cs
index 30e0fa1..39864fb 100644
--- a/src/Lucene.Net.Tests/Search/TestTermVectors.cs
+++ b/src/Lucene.Net.Tests/Search/TestTermVectors.cs
@@ -1,6 +1,7 @@
using Lucene.Net.Documents;
using Lucene.Net.Index.Extensions;
using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Search
{
diff --git a/src/Lucene.Net.Tests/Search/TestTopDocsCollector.cs b/src/Lucene.Net.Tests/Search/TestTopDocsCollector.cs
index fd2fad0..e05d523 100644
--- a/src/Lucene.Net.Tests/Search/TestTopDocsCollector.cs
+++ b/src/Lucene.Net.Tests/Search/TestTopDocsCollector.cs
@@ -1,6 +1,8 @@
+using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
+
namespace Lucene.Net.Search
{
- using NUnit.Framework;
using AtomicReaderContext = Lucene.Net.Index.AtomicReaderContext;
using Directory = Lucene.Net.Store.Directory;
diff --git a/src/Lucene.Net.Tests/Search/TestTopDocsMerge.cs b/src/Lucene.Net.Tests/Search/TestTopDocsMerge.cs
index e39a948..fb83394 100644
--- a/src/Lucene.Net.Tests/Search/TestTopDocsMerge.cs
+++ b/src/Lucene.Net.Tests/Search/TestTopDocsMerge.cs
@@ -1,18 +1,16 @@
+using Lucene.Net.Documents;
+using NUnit.Framework;
using System;
using System.Collections.Generic;
using System.Text;
-using Lucene.Net.Documents;
-using Lucene.Net.Util;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Search
{
- using Lucene.Net.Randomized.Generators;
- using NUnit.Framework;
using AtomicReaderContext = Lucene.Net.Index.AtomicReaderContext;
using CompositeReaderContext = Lucene.Net.Index.CompositeReaderContext;
using Directory = Lucene.Net.Store.Directory;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -32,13 +30,13 @@ namespace Lucene.Net.Search
using Document = Documents.Document;
using Field = Field;
- using SingleField = SingleField;
using IndexReader = Lucene.Net.Index.IndexReader;
using IndexReaderContext = Lucene.Net.Index.IndexReaderContext;
using Int32Field = Int32Field;
using LuceneTestCase = Lucene.Net.Util.LuceneTestCase;
using RandomIndexWriter = Lucene.Net.Index.RandomIndexWriter;
using ReaderUtil = Lucene.Net.Index.ReaderUtil;
+ using SingleField = SingleField;
using Term = Lucene.Net.Index.Term;
using TestUtil = Lucene.Net.Util.TestUtil;
diff --git a/src/Lucene.Net.Tests/Search/TestTopFieldCollector.cs b/src/Lucene.Net.Tests/Search/TestTopFieldCollector.cs
index 85fe125..93bf452 100644
--- a/src/Lucene.Net.Tests/Search/TestTopFieldCollector.cs
+++ b/src/Lucene.Net.Tests/Search/TestTopFieldCollector.cs
@@ -1,8 +1,9 @@
using System;
+using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Search
{
- using NUnit.Framework;
using Directory = Lucene.Net.Store.Directory;
/*
diff --git a/src/Lucene.Net.Tests/Search/TestTopScoreDocCollector.cs b/src/Lucene.Net.Tests/Search/TestTopScoreDocCollector.cs
index 620611b..7718e0c 100644
--- a/src/Lucene.Net.Tests/Search/TestTopScoreDocCollector.cs
+++ b/src/Lucene.Net.Tests/Search/TestTopScoreDocCollector.cs
@@ -1,6 +1,8 @@
+using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
+
namespace Lucene.Net.Search
{
- using NUnit.Framework;
using Directory = Lucene.Net.Store.Directory;
/*
diff --git a/src/Lucene.Net.Tests/Search/TestTotalHitCountCollector.cs b/src/Lucene.Net.Tests/Search/TestTotalHitCountCollector.cs
index 8b76a38..f621e11 100644
--- a/src/Lucene.Net.Tests/Search/TestTotalHitCountCollector.cs
+++ b/src/Lucene.Net.Tests/Search/TestTotalHitCountCollector.cs
@@ -1,8 +1,9 @@
using Lucene.Net.Documents;
+using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Search
{
- using NUnit.Framework;
using Directory = Lucene.Net.Store.Directory;
/*
diff --git a/src/Lucene.Net.Tests/Search/TestWildcard.cs b/src/Lucene.Net.Tests/Search/TestWildcard.cs
index b5ed723..359068a 100644
--- a/src/Lucene.Net.Tests/Search/TestWildcard.cs
+++ b/src/Lucene.Net.Tests/Search/TestWildcard.cs
@@ -1,6 +1,7 @@
using Lucene.Net.Documents;
using Lucene.Net.Index.Extensions;
using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Search
diff --git a/src/Lucene.Net.Tests/Search/TestWildcardRandom.cs b/src/Lucene.Net.Tests/Search/TestWildcardRandom.cs
index 4080e15..a7c91cb 100644
--- a/src/Lucene.Net.Tests/Search/TestWildcardRandom.cs
+++ b/src/Lucene.Net.Tests/Search/TestWildcardRandom.cs
@@ -3,6 +3,7 @@ using Lucene.Net.Index.Extensions;
using NUnit.Framework;
using System;
using System.Text;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Search
diff --git a/src/Lucene.Net.Tests/Store/TestBufferedChecksum.cs b/src/Lucene.Net.Tests/Store/TestBufferedChecksum.cs
index 54c2dc6..2dbd1e3 100644
--- a/src/Lucene.Net.Tests/Store/TestBufferedChecksum.cs
+++ b/src/Lucene.Net.Tests/Store/TestBufferedChecksum.cs
@@ -1,5 +1,6 @@
using Lucene.Net.Support;
using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Store
{
diff --git a/src/Lucene.Net.Tests/Store/TestBufferedIndexInput.cs b/src/Lucene.Net.Tests/Store/TestBufferedIndexInput.cs
index decee7f..a1cf7a4 100644
--- a/src/Lucene.Net.Tests/Store/TestBufferedIndexInput.cs
+++ b/src/Lucene.Net.Tests/Store/TestBufferedIndexInput.cs
@@ -4,6 +4,7 @@ using NUnit.Framework;
using System;
using System.Collections.Generic;
using System.IO;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Store
{
diff --git a/src/Lucene.Net.Tests/Store/TestByteArrayDataInput.cs b/src/Lucene.Net.Tests/Store/TestByteArrayDataInput.cs
index a581828..6ca0c68 100644
--- a/src/Lucene.Net.Tests/Store/TestByteArrayDataInput.cs
+++ b/src/Lucene.Net.Tests/Store/TestByteArrayDataInput.cs
@@ -1,4 +1,5 @@
using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Store
{
diff --git a/src/Lucene.Net.Tests/Store/TestCopyBytes.cs b/src/Lucene.Net.Tests/Store/TestCopyBytes.cs
index c538c50..24f1e66 100644
--- a/src/Lucene.Net.Tests/Store/TestCopyBytes.cs
+++ b/src/Lucene.Net.Tests/Store/TestCopyBytes.cs
@@ -3,6 +3,7 @@ using Lucene.Net.Attributes;
using NUnit.Framework;
using System;
using System.IO;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Store
diff --git a/src/Lucene.Net.Tests/Store/TestDirectory.cs b/src/Lucene.Net.Tests/Store/TestDirectory.cs
index 3127296..c0cc24c 100644
--- a/src/Lucene.Net.Tests/Store/TestDirectory.cs
+++ b/src/Lucene.Net.Tests/Store/TestDirectory.cs
@@ -7,6 +7,7 @@ using NUnit.Framework;
using System;
using System.IO;
using System.Threading;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Store
diff --git a/src/Lucene.Net.Tests/Store/TestFileSwitchDirectory.cs b/src/Lucene.Net.Tests/Store/TestFileSwitchDirectory.cs
index fd7a458..11cbcb9 100644
--- a/src/Lucene.Net.Tests/Store/TestFileSwitchDirectory.cs
+++ b/src/Lucene.Net.Tests/Store/TestFileSwitchDirectory.cs
@@ -1,9 +1,9 @@
using Lucene.Net.Index.Extensions;
-using Lucene.Net.Support;
using NUnit.Framework;
using System;
using System.Collections.Generic;
using System.IO;
+using Assert = Lucene.Net.TestFramework.Assert;
using JCG = J2N.Collections.Generic;
namespace Lucene.Net.Store
@@ -35,7 +35,6 @@ namespace Lucene.Net.Store
using MockAnalyzer = Lucene.Net.Analysis.MockAnalyzer;
using TestIndexWriterReader = Lucene.Net.Index.TestIndexWriterReader;
- using TestUtil = Lucene.Net.Util.TestUtil;
[TestFixture]
public class TestFileSwitchDirectory : LuceneTestCase
diff --git a/src/Lucene.Net.Tests/Store/TestHugeRamFile.cs b/src/Lucene.Net.Tests/Store/TestHugeRamFile.cs
index 002a473..881a8d3 100644
--- a/src/Lucene.Net.Tests/Store/TestHugeRamFile.cs
+++ b/src/Lucene.Net.Tests/Store/TestHugeRamFile.cs
@@ -2,6 +2,7 @@ using Lucene.Net.Attributes;
using NUnit.Framework;
using System;
using System.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Store
{
diff --git a/src/Lucene.Net.Tests/Store/TestLock.cs b/src/Lucene.Net.Tests/Store/TestLock.cs
index 2941dbd..7bb47dc 100644
--- a/src/Lucene.Net.Tests/Store/TestLock.cs
+++ b/src/Lucene.Net.Tests/Store/TestLock.cs
@@ -1,5 +1,6 @@
using NUnit.Framework;
using System.IO;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Store
{
diff --git a/src/Lucene.Net.Tests/Store/TestLockFactory.cs b/src/Lucene.Net.Tests/Store/TestLockFactory.cs
index 6b01ab9..8d819be 100644
--- a/src/Lucene.Net.Tests/Store/TestLockFactory.cs
+++ b/src/Lucene.Net.Tests/Store/TestLockFactory.cs
@@ -7,6 +7,7 @@ using System;
using System.Collections.Generic;
using System.IO;
using System.Threading;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Store
diff --git a/src/Lucene.Net.Tests/Store/TestMultiMMap.cs b/src/Lucene.Net.Tests/Store/TestMultiMMap.cs
index 153f017..a8bf773 100644
--- a/src/Lucene.Net.Tests/Store/TestMultiMMap.cs
+++ b/src/Lucene.Net.Tests/Store/TestMultiMMap.cs
@@ -5,6 +5,7 @@ using NUnit.Framework;
using System;
using System.IO;
using System.Text;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Store
{
diff --git a/src/Lucene.Net.Tests/Store/TestNRTCachingDirectory.cs b/src/Lucene.Net.Tests/Store/TestNRTCachingDirectory.cs
index b72fc69..7272dbe 100644
--- a/src/Lucene.Net.Tests/Store/TestNRTCachingDirectory.cs
+++ b/src/Lucene.Net.Tests/Store/TestNRTCachingDirectory.cs
@@ -1,8 +1,8 @@
-using Lucene.Net.Support;
using NUnit.Framework;
using System;
using System.Collections.Generic;
using System.IO;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Store
diff --git a/src/Lucene.Net.Tests/Store/TestRAMDirectory.cs b/src/Lucene.Net.Tests/Store/TestRAMDirectory.cs
index 16ddd64..ab1d7fc 100644
--- a/src/Lucene.Net.Tests/Store/TestRAMDirectory.cs
+++ b/src/Lucene.Net.Tests/Store/TestRAMDirectory.cs
@@ -4,6 +4,7 @@ using Lucene.Net.Index.Extensions;
using NUnit.Framework;
using System;
using System.IO;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Store
{
diff --git a/src/Lucene.Net.Tests/Support/TestCRC32.cs b/src/Lucene.Net.Tests/Support/TestCRC32.cs
index ce75bbb..b0e3526 100644
--- a/src/Lucene.Net.Tests/Support/TestCRC32.cs
+++ b/src/Lucene.Net.Tests/Support/TestCRC32.cs
@@ -1,6 +1,7 @@
using Lucene.Net.Attributes;
using NUnit.Framework;
using System;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Support
{
diff --git a/src/Lucene.Net.Tests/Support/TestOldPatches.cs b/src/Lucene.Net.Tests/Support/TestOldPatches.cs
index bc781cd..9b7bac0 100644
--- a/src/Lucene.Net.Tests/Support/TestOldPatches.cs
+++ b/src/Lucene.Net.Tests/Support/TestOldPatches.cs
@@ -19,17 +19,14 @@
*
*/
-using System;
-using System.IO;
using Lucene.Net.Analysis;
-using Lucene.Net.Documents;
using Lucene.Net.Index;
using Lucene.Net.Search;
-using Lucene.Net.Store;
+using Lucene.Net.Util;
using NUnit.Framework;
+using System.IO;
+using Assert = Lucene.Net.TestFramework.Assert;
using Version = Lucene.Net.Util.LuceneVersion;
-using Lucene.Net.Codecs;
-using Lucene.Net.Util;
#pragma warning disable 612, 618
namespace Lucene.Net.Support
diff --git a/src/Lucene.Net.Tests/Support/TestSerialization.cs b/src/Lucene.Net.Tests/Support/TestSerialization.cs
index 1086947..c6434df 100644
--- a/src/Lucene.Net.Tests/Support/TestSerialization.cs
+++ b/src/Lucene.Net.Tests/Support/TestSerialization.cs
@@ -20,14 +20,12 @@
*
*/
-using System;
-using System.Linq;
-using System.Reflection;
-using Lucene.Net.Search;
-using NUnit.Framework;
+using Lucene.Net.Attributes;
using Lucene.Net.Index;
+using Lucene.Net.Search;
using Lucene.Net.Util;
-using Lucene.Net.Attributes;
+using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
#pragma warning disable 612, 618
namespace Lucene.Net.Support
diff --git a/src/Lucene.Net.Tests/Support/TestWeakDictionary.cs b/src/Lucene.Net.Tests/Support/TestWeakDictionary.cs
index 5643601..9af83f6 100644
--- a/src/Lucene.Net.Tests/Support/TestWeakDictionary.cs
+++ b/src/Lucene.Net.Tests/Support/TestWeakDictionary.cs
@@ -4,6 +4,7 @@ using NUnit.Framework;
using System;
using System.Collections;
using System.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Support
{
diff --git a/src/Lucene.Net.Tests/Support/TestWeakDictionaryBehavior.cs b/src/Lucene.Net.Tests/Support/TestWeakDictionaryBehavior.cs
index a127d51..5a7b247 100644
--- a/src/Lucene.Net.Tests/Support/TestWeakDictionaryBehavior.cs
+++ b/src/Lucene.Net.Tests/Support/TestWeakDictionaryBehavior.cs
@@ -3,6 +3,7 @@ using Lucene.Net.Attributes;
using NUnit.Framework;
using System;
using System.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Support
{
[lucenenet] 11/26: SWEEP: Lucene.Net.Util: Added using for Assert
class to ensure our strongly-typed overloads are being called to reduce
boxing. (addresses #295, #261)
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 666c9bbd0c9a555f2735a7d52640b29f0552a4e7
Author: Shad Storhaug <sh...@shadstorhaug.com>
AuthorDate: Tue Jun 23 20:59:08 2020 +0700
SWEEP: Lucene.Net.Util: Added using for Assert class to ensure our strongly-typed overloads are being called to reduce boxing. (addresses #295, #261)
---
src/Lucene.Net.Tests/Util/BaseSortTestCase.cs | 1 +
src/Lucene.Net.Tests/Util/TestArrayUtil.cs | 2 +-
src/Lucene.Net.Tests/Util/TestAttributeSource.cs | 6 +++---
src/Lucene.Net.Tests/Util/TestBroadWord.cs | 1 -
src/Lucene.Net.Tests/Util/TestByteBlockPool.cs | 1 -
src/Lucene.Net.Tests/Util/TestBytesRef.cs | 1 +
src/Lucene.Net.Tests/Util/TestBytesRefArray.cs | 4 ++--
src/Lucene.Net.Tests/Util/TestBytesRefHash.cs | 1 +
src/Lucene.Net.Tests/Util/TestCharsRef.cs | 2 +-
src/Lucene.Net.Tests/Util/TestCollectionUtil.cs | 16 +++++++---------
src/Lucene.Net.Tests/Util/TestFieldCacheSanityChecker.cs | 1 +
src/Lucene.Net.Tests/Util/TestFilterIterator.cs | 4 ++--
src/Lucene.Net.Tests/Util/TestFixedBitSet.cs | 8 +++-----
.../Util/TestIndexableBinaryStringTools.cs | 1 +
src/Lucene.Net.Tests/Util/TestIntsRef.cs | 1 +
src/Lucene.Net.Tests/Util/TestLongBitSet.cs | 2 +-
src/Lucene.Net.Tests/Util/TestMathUtil.cs | 1 +
src/Lucene.Net.Tests/Util/TestMergedIterator.cs | 1 +
src/Lucene.Net.Tests/Util/TestPForDeltaDocIdSet.cs | 1 +
src/Lucene.Net.Tests/Util/TestPriorityQueue.cs | 1 +
src/Lucene.Net.Tests/Util/TestQueryBuilder.cs | 1 +
.../Util/TestRecyclingByteBlockAllocator.cs | 1 +
.../Util/TestRecyclingIntBlockAllocator.cs | 1 +
src/Lucene.Net.Tests/Util/TestRollingBuffer.cs | 1 +
src/Lucene.Net.Tests/Util/TestSentinelIntSet.cs | 1 +
src/Lucene.Net.Tests/Util/TestSetOnce.cs | 1 +
src/Lucene.Net.Tests/Util/TestSloppyMath.cs | 1 +
src/Lucene.Net.Tests/Util/TestSmallFloat.cs | 1 +
src/Lucene.Net.Tests/Util/TestStringHelper.cs | 1 +
src/Lucene.Net.Tests/Util/TestUnicodeUtil.cs | 1 +
src/Lucene.Net.Tests/Util/TestVersion.cs | 1 +
src/Lucene.Net.Tests/Util/TestVirtualMethod.cs | 1 +
32 files changed, 42 insertions(+), 26 deletions(-)
diff --git a/src/Lucene.Net.Tests/Util/BaseSortTestCase.cs b/src/Lucene.Net.Tests/Util/BaseSortTestCase.cs
index 6b51f11..3a5cc46 100644
--- a/src/Lucene.Net.Tests/Util/BaseSortTestCase.cs
+++ b/src/Lucene.Net.Tests/Util/BaseSortTestCase.cs
@@ -3,6 +3,7 @@ using System.Linq;
using Lucene.Net.Support;
using NUnit.Framework;
using System;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Util
{
diff --git a/src/Lucene.Net.Tests/Util/TestArrayUtil.cs b/src/Lucene.Net.Tests/Util/TestArrayUtil.cs
index 6e7e9cd..fbac806 100644
--- a/src/Lucene.Net.Tests/Util/TestArrayUtil.cs
+++ b/src/Lucene.Net.Tests/Util/TestArrayUtil.cs
@@ -1,7 +1,7 @@
-using Lucene.Net.Randomized.Generators;
using Lucene.Net.Support;
using NUnit.Framework;
using System;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Util
diff --git a/src/Lucene.Net.Tests/Util/TestAttributeSource.cs b/src/Lucene.Net.Tests/Util/TestAttributeSource.cs
index 71aeb7d..5088985 100644
--- a/src/Lucene.Net.Tests/Util/TestAttributeSource.cs
+++ b/src/Lucene.Net.Tests/Util/TestAttributeSource.cs
@@ -1,12 +1,12 @@
+using Lucene.Net.Analysis.TokenAttributes;
using NUnit.Framework;
using System;
-using System.Collections;
using System.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
+using FlagsAttribute = Lucene.Net.Analysis.TokenAttributes.FlagsAttribute;
namespace Lucene.Net.Util
{
- using Lucene.Net.Analysis.TokenAttributes;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git a/src/Lucene.Net.Tests/Util/TestBroadWord.cs b/src/Lucene.Net.Tests/Util/TestBroadWord.cs
index b1ed9a2..28cda94 100644
--- a/src/Lucene.Net.Tests/Util/TestBroadWord.cs
+++ b/src/Lucene.Net.Tests/Util/TestBroadWord.cs
@@ -1,6 +1,5 @@
using J2N.Numerics;
using Lucene.Net.Attributes;
-using Lucene.Net.Support;
using NUnit.Framework;
using Assert = Lucene.Net.TestFramework.Assert;
diff --git a/src/Lucene.Net.Tests/Util/TestByteBlockPool.cs b/src/Lucene.Net.Tests/Util/TestByteBlockPool.cs
index b5e30e9..ce1b1df 100644
--- a/src/Lucene.Net.Tests/Util/TestByteBlockPool.cs
+++ b/src/Lucene.Net.Tests/Util/TestByteBlockPool.cs
@@ -1,4 +1,3 @@
-using Lucene.Net.Randomized.Generators;
using NUnit.Framework;
using System.Collections.Generic;
using Assert = Lucene.Net.TestFramework.Assert;
diff --git a/src/Lucene.Net.Tests/Util/TestBytesRef.cs b/src/Lucene.Net.Tests/Util/TestBytesRef.cs
index 21ab6f4..93b9ba3 100644
--- a/src/Lucene.Net.Tests/Util/TestBytesRef.cs
+++ b/src/Lucene.Net.Tests/Util/TestBytesRef.cs
@@ -1,6 +1,7 @@
using J2N.Text;
using Lucene.Net.Attributes;
using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Util
{
diff --git a/src/Lucene.Net.Tests/Util/TestBytesRefArray.cs b/src/Lucene.Net.Tests/Util/TestBytesRefArray.cs
index e267b6e..3dedead 100644
--- a/src/Lucene.Net.Tests/Util/TestBytesRefArray.cs
+++ b/src/Lucene.Net.Tests/Util/TestBytesRefArray.cs
@@ -1,7 +1,7 @@
-using Lucene.Net.Randomized.Generators;
-using NUnit.Framework;
+using NUnit.Framework;
using System;
using System.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Util
{
diff --git a/src/Lucene.Net.Tests/Util/TestBytesRefHash.cs b/src/Lucene.Net.Tests/Util/TestBytesRefHash.cs
index eda3b9e..f9ae531 100644
--- a/src/Lucene.Net.Tests/Util/TestBytesRefHash.cs
+++ b/src/Lucene.Net.Tests/Util/TestBytesRefHash.cs
@@ -4,6 +4,7 @@ using System;
using System.Collections;
using System.Collections.Generic;
using JCG = J2N.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Util
{
diff --git a/src/Lucene.Net.Tests/Util/TestCharsRef.cs b/src/Lucene.Net.Tests/Util/TestCharsRef.cs
index 5e1ed36..a815a9d 100644
--- a/src/Lucene.Net.Tests/Util/TestCharsRef.cs
+++ b/src/Lucene.Net.Tests/Util/TestCharsRef.cs
@@ -1,9 +1,9 @@
using J2N.Text;
using Lucene.Net.Attributes;
-//using Lucene.Net.Support;
using NUnit.Framework;
using System;
using System.Text;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Util
{
diff --git a/src/Lucene.Net.Tests/Util/TestCollectionUtil.cs b/src/Lucene.Net.Tests/Util/TestCollectionUtil.cs
index a707fd5..b19a4a2 100644
--- a/src/Lucene.Net.Tests/Util/TestCollectionUtil.cs
+++ b/src/Lucene.Net.Tests/Util/TestCollectionUtil.cs
@@ -1,8 +1,6 @@
-using Lucene.Net.Attributes;
using Lucene.Net.Support;
using NUnit.Framework;
using System;
-using System.Collections;
using System.Collections.Generic;
namespace Lucene.Net.Util
@@ -46,21 +44,21 @@ namespace Lucene.Net.Util
IList<int> list1 = CreateRandomList(2000), list2 = new List<int>(list1);
CollectionUtil.IntroSort(list1);
list2.Sort();
- Assert.AreEqual(list2, list1);
+ assertEquals(list2, list1);
list1 = CreateRandomList(2000);
list2 = new List<int>(list1);
CollectionUtil.IntroSort(list1, Collections.ReverseOrder<int>());
list2.Sort(Collections.ReverseOrder<int>());
- Assert.AreEqual(list2, list1);
+ assertEquals(list2, list1);
// reverse back, so we can test that completely backwards sorted array (worst case) is working:
CollectionUtil.IntroSort(list1);
list2.Sort();
- Assert.AreEqual(list2, list1);
+ assertEquals(list2, list1);
}
}
- [Test, LongRunningTest]
+ [Test]
public virtual void TestTimSort()
{
for (int i = 0, c = AtLeast(500); i < c; i++)
@@ -68,17 +66,17 @@ namespace Lucene.Net.Util
IList<int> list1 = CreateRandomList(2000), list2 = new List<int>(list1);
CollectionUtil.TimSort(list1);
list2.Sort();
- Assert.AreEqual(list2, list1);
+ assertEquals(list2, list1);
list1 = CreateRandomList(2000);
list2 = new List<int>(list1);
CollectionUtil.TimSort(list1, Collections.ReverseOrder<int>());
list2.Sort(Collections.ReverseOrder<int>());
- Assert.AreEqual(list2, list1);
+ assertEquals(list2, list1);
// reverse back, so we can test that completely backwards sorted array (worst case) is working:
CollectionUtil.TimSort(list1);
list2.Sort();
- Assert.AreEqual(list2, list1);
+ assertEquals(list2, list1);
}
}
diff --git a/src/Lucene.Net.Tests/Util/TestFieldCacheSanityChecker.cs b/src/Lucene.Net.Tests/Util/TestFieldCacheSanityChecker.cs
index 0222663..58d1743 100644
--- a/src/Lucene.Net.Tests/Util/TestFieldCacheSanityChecker.cs
+++ b/src/Lucene.Net.Tests/Util/TestFieldCacheSanityChecker.cs
@@ -4,6 +4,7 @@ using NUnit.Framework;
using System;
using System.Globalization;
using System.IO;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Util
diff --git a/src/Lucene.Net.Tests/Util/TestFilterIterator.cs b/src/Lucene.Net.Tests/Util/TestFilterIterator.cs
index a302793..c0eaa34 100644
--- a/src/Lucene.Net.Tests/Util/TestFilterIterator.cs
+++ b/src/Lucene.Net.Tests/Util/TestFilterIterator.cs
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-using Lucene.Net.Support;
using NUnit.Framework;
using System;
using System.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
using JCG = J2N.Collections.Generic;
namespace Lucene.Net.Util
@@ -26,7 +26,7 @@ namespace Lucene.Net.Util
[TestFixture]
public class TestFilterIterator : LuceneTestCase
{
- private static readonly ISet<string> set = new JCG.SortedSet<string> { "a", "b", "c" };
+ private static readonly ISet<string> set = new JCG.SortedSet<string>(StringComparer.Ordinal) { "a", "b", "c" };
private static void AssertNoMore<T1>(IEnumerator<T1> it)
{
diff --git a/src/Lucene.Net.Tests/Util/TestFixedBitSet.cs b/src/Lucene.Net.Tests/Util/TestFixedBitSet.cs
index 278058d..8ffcc72 100644
--- a/src/Lucene.Net.Tests/Util/TestFixedBitSet.cs
+++ b/src/Lucene.Net.Tests/Util/TestFixedBitSet.cs
@@ -1,9 +1,10 @@
-using System;
using Lucene.Net.Attributes;
-using Lucene.Net.Randomized.Generators;
using Lucene.Net.Support;
using NUnit.Framework;
+using System;
using System.Collections;
+using System.Linq;
+using Assert = Lucene.Net.TestFramework.Assert;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -22,9 +23,6 @@ using System.Collections;
* limitations under the License.
*/
-using System.Linq;
-using Assert = Lucene.Net.TestFramework.Assert;
-
namespace Lucene.Net.Util
{
using DocIdSetIterator = Lucene.Net.Search.DocIdSetIterator;
diff --git a/src/Lucene.Net.Tests/Util/TestIndexableBinaryStringTools.cs b/src/Lucene.Net.Tests/Util/TestIndexableBinaryStringTools.cs
index e8d19c7..2831585 100644
--- a/src/Lucene.Net.Tests/Util/TestIndexableBinaryStringTools.cs
+++ b/src/Lucene.Net.Tests/Util/TestIndexableBinaryStringTools.cs
@@ -2,6 +2,7 @@ using NUnit.Framework;
using System;
using System.Globalization;
using System.Text;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Util
{
diff --git a/src/Lucene.Net.Tests/Util/TestIntsRef.cs b/src/Lucene.Net.Tests/Util/TestIntsRef.cs
index 053a9b4..6e79c59 100644
--- a/src/Lucene.Net.Tests/Util/TestIntsRef.cs
+++ b/src/Lucene.Net.Tests/Util/TestIntsRef.cs
@@ -1,4 +1,5 @@
using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Util
{
diff --git a/src/Lucene.Net.Tests/Util/TestLongBitSet.cs b/src/Lucene.Net.Tests/Util/TestLongBitSet.cs
index dd146c6..c148b47 100644
--- a/src/Lucene.Net.Tests/Util/TestLongBitSet.cs
+++ b/src/Lucene.Net.Tests/Util/TestLongBitSet.cs
@@ -17,10 +17,10 @@
using System;
using Lucene.Net.Attributes;
-using Lucene.Net.Randomized.Generators;
using Lucene.Net.Support;
using NUnit.Framework;
using System.Collections;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Util
{
diff --git a/src/Lucene.Net.Tests/Util/TestMathUtil.cs b/src/Lucene.Net.Tests/Util/TestMathUtil.cs
index 2f439b9..15a1e29 100644
--- a/src/Lucene.Net.Tests/Util/TestMathUtil.cs
+++ b/src/Lucene.Net.Tests/Util/TestMathUtil.cs
@@ -3,6 +3,7 @@ using Lucene.Net.Support;
using NUnit.Framework;
using System;
using System.Linq;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Util
{
diff --git a/src/Lucene.Net.Tests/Util/TestMergedIterator.cs b/src/Lucene.Net.Tests/Util/TestMergedIterator.cs
index 2ef8413..810e086 100644
--- a/src/Lucene.Net.Tests/Util/TestMergedIterator.cs
+++ b/src/Lucene.Net.Tests/Util/TestMergedIterator.cs
@@ -2,6 +2,7 @@ using NUnit.Framework;
using System;
using System.Collections;
using System.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Util
{
diff --git a/src/Lucene.Net.Tests/Util/TestPForDeltaDocIdSet.cs b/src/Lucene.Net.Tests/Util/TestPForDeltaDocIdSet.cs
index 6b02ea0..5fa5db8 100644
--- a/src/Lucene.Net.Tests/Util/TestPForDeltaDocIdSet.cs
+++ b/src/Lucene.Net.Tests/Util/TestPForDeltaDocIdSet.cs
@@ -1,6 +1,7 @@
using Lucene.Net.Support;
using NUnit.Framework;
using System.Collections;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Util
{
diff --git a/src/Lucene.Net.Tests/Util/TestPriorityQueue.cs b/src/Lucene.Net.Tests/Util/TestPriorityQueue.cs
index 7a5c69c..461a15f 100644
--- a/src/Lucene.Net.Tests/Util/TestPriorityQueue.cs
+++ b/src/Lucene.Net.Tests/Util/TestPriorityQueue.cs
@@ -2,6 +2,7 @@ using Lucene.Net.Attributes;
using NUnit.Framework;
using System;
using System.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Util
diff --git a/src/Lucene.Net.Tests/Util/TestQueryBuilder.cs b/src/Lucene.Net.Tests/Util/TestQueryBuilder.cs
index d014af1..6a35164 100644
--- a/src/Lucene.Net.Tests/Util/TestQueryBuilder.cs
+++ b/src/Lucene.Net.Tests/Util/TestQueryBuilder.cs
@@ -3,6 +3,7 @@ using Lucene.Net.Analysis.TokenAttributes;
using NUnit.Framework;
using System;
using System.IO;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Util
{
diff --git a/src/Lucene.Net.Tests/Util/TestRecyclingByteBlockAllocator.cs b/src/Lucene.Net.Tests/Util/TestRecyclingByteBlockAllocator.cs
index 2e58497..ea4c360 100644
--- a/src/Lucene.Net.Tests/Util/TestRecyclingByteBlockAllocator.cs
+++ b/src/Lucene.Net.Tests/Util/TestRecyclingByteBlockAllocator.cs
@@ -2,6 +2,7 @@ using NUnit.Framework;
using System;
using System.Collections.Generic;
using System.Linq;
+using Assert = Lucene.Net.TestFramework.Assert;
using JCG = J2N.Collections.Generic;
namespace Lucene.Net.Util
diff --git a/src/Lucene.Net.Tests/Util/TestRecyclingIntBlockAllocator.cs b/src/Lucene.Net.Tests/Util/TestRecyclingIntBlockAllocator.cs
index 6ee5bd5..f1c5b12 100644
--- a/src/Lucene.Net.Tests/Util/TestRecyclingIntBlockAllocator.cs
+++ b/src/Lucene.Net.Tests/Util/TestRecyclingIntBlockAllocator.cs
@@ -2,6 +2,7 @@ using NUnit.Framework;
using System;
using System.Collections.Generic;
using System.Linq;
+using Assert = Lucene.Net.TestFramework.Assert;
using JCG = J2N.Collections.Generic;
namespace Lucene.Net.Util
diff --git a/src/Lucene.Net.Tests/Util/TestRollingBuffer.cs b/src/Lucene.Net.Tests/Util/TestRollingBuffer.cs
index 05d7ebb..9e7bc74 100644
--- a/src/Lucene.Net.Tests/Util/TestRollingBuffer.cs
+++ b/src/Lucene.Net.Tests/Util/TestRollingBuffer.cs
@@ -1,5 +1,6 @@
using NUnit.Framework;
using System;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Util
diff --git a/src/Lucene.Net.Tests/Util/TestSentinelIntSet.cs b/src/Lucene.Net.Tests/Util/TestSentinelIntSet.cs
index 6ec5f97..215d65c 100644
--- a/src/Lucene.Net.Tests/Util/TestSentinelIntSet.cs
+++ b/src/Lucene.Net.Tests/Util/TestSentinelIntSet.cs
@@ -1,5 +1,6 @@
using NUnit.Framework;
using System.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
using JCG = J2N.Collections.Generic;
namespace Lucene.Net.Util
diff --git a/src/Lucene.Net.Tests/Util/TestSetOnce.cs b/src/Lucene.Net.Tests/Util/TestSetOnce.cs
index 9de0200..b5b8213 100644
--- a/src/Lucene.Net.Tests/Util/TestSetOnce.cs
+++ b/src/Lucene.Net.Tests/Util/TestSetOnce.cs
@@ -3,6 +3,7 @@ using NUnit.Framework;
using System;
using System.Globalization;
using System.Threading;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Util
{
diff --git a/src/Lucene.Net.Tests/Util/TestSloppyMath.cs b/src/Lucene.Net.Tests/Util/TestSloppyMath.cs
index 86f7108..ad14929 100644
--- a/src/Lucene.Net.Tests/Util/TestSloppyMath.cs
+++ b/src/Lucene.Net.Tests/Util/TestSloppyMath.cs
@@ -1,6 +1,7 @@
using Lucene.Net.Randomized.Generators;
using NUnit.Framework;
using System;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Util
{
diff --git a/src/Lucene.Net.Tests/Util/TestSmallFloat.cs b/src/Lucene.Net.Tests/Util/TestSmallFloat.cs
index 519fd91..8958453 100644
--- a/src/Lucene.Net.Tests/Util/TestSmallFloat.cs
+++ b/src/Lucene.Net.Tests/Util/TestSmallFloat.cs
@@ -1,5 +1,6 @@
using Lucene.Net.Support;
using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Util
{
diff --git a/src/Lucene.Net.Tests/Util/TestStringHelper.cs b/src/Lucene.Net.Tests/Util/TestStringHelper.cs
index 3d76817..396d3e4 100644
--- a/src/Lucene.Net.Tests/Util/TestStringHelper.cs
+++ b/src/Lucene.Net.Tests/Util/TestStringHelper.cs
@@ -1,4 +1,5 @@
using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Util
{
diff --git a/src/Lucene.Net.Tests/Util/TestUnicodeUtil.cs b/src/Lucene.Net.Tests/Util/TestUnicodeUtil.cs
index 849f60d..3475c66 100644
--- a/src/Lucene.Net.Tests/Util/TestUnicodeUtil.cs
+++ b/src/Lucene.Net.Tests/Util/TestUnicodeUtil.cs
@@ -1,6 +1,7 @@
using J2N;
using NUnit.Framework;
using System;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Util
diff --git a/src/Lucene.Net.Tests/Util/TestVersion.cs b/src/Lucene.Net.Tests/Util/TestVersion.cs
index bff6757..e5978f2 100644
--- a/src/Lucene.Net.Tests/Util/TestVersion.cs
+++ b/src/Lucene.Net.Tests/Util/TestVersion.cs
@@ -19,6 +19,7 @@ using NUnit.Framework;
using System;
using System.Linq;
using System.Reflection;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Util
{
diff --git a/src/Lucene.Net.Tests/Util/TestVirtualMethod.cs b/src/Lucene.Net.Tests/Util/TestVirtualMethod.cs
index 81c8325..8087667 100644
--- a/src/Lucene.Net.Tests/Util/TestVirtualMethod.cs
+++ b/src/Lucene.Net.Tests/Util/TestVirtualMethod.cs
@@ -1,5 +1,6 @@
using NUnit.Framework;
using System;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Util
{
[lucenenet] 24/26: run-tests-on-os.yml: Upgraded to .NET Core SDK
3.1.301
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 df649a3356223f7df776f52b918cc39c0c5e2c58
Author: Shad Storhaug <sh...@shadstorhaug.com>
AuthorDate: Wed Jun 24 20:46:50 2020 +0700
run-tests-on-os.yml: Upgraded to .NET Core SDK 3.1.301
---
azure-pipelines.yml | 4 ++--
build/azure-templates/run-tests-on-os.yml | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 5712013..8c71e9d 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -91,9 +91,9 @@ stages:
displayName: 'Setup Default Variable Values'
- task: UseDotNet@2
- displayName: 'Use .NET Core sdk 3.1.100'
+ displayName: 'Use .NET Core sdk 3.1.301'
inputs:
- version: 3.1.100
+ version: 3.1.301
- powershell: |
Import-Module "$(BuildDirectory)/psake.psm1"
diff --git a/build/azure-templates/run-tests-on-os.yml b/build/azure-templates/run-tests-on-os.yml
index 8000748..f46698e 100644
--- a/build/azure-templates/run-tests-on-os.yml
+++ b/build/azure-templates/run-tests-on-os.yml
@@ -53,9 +53,9 @@ steps:
displayName: 'Validate Template Parameters'
- task: UseDotNet@2
- displayName: 'Use .NET Core sdk 3.1.100'
+ displayName: 'Use .NET Core sdk 3.1.301'
inputs:
- version: 3.1.100
+ version: 3.1.301
condition: and(succeeded(), contains('${{ parameters.framework }}', 'netcoreapp3.'))
- task: DownloadBuildArtifacts@0
[lucenenet] 18/26: Lucene.Net.Tests.ICU: Switched to using the
Assert class from the test framework instead of NUnit (#295, #261).
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 aca9e479e32e25b6490d0b50f308ee7f2ad750b2
Author: Shad Storhaug <sh...@shadstorhaug.com>
AuthorDate: Wed Jun 24 11:57:02 2020 +0700
Lucene.Net.Tests.ICU: Switched to using the Assert class from the test framework instead of NUnit (#295, #261).
---
src/dotnet/Lucene.Net.Tests.ICU/Support/TestJDKBreakIterator.cs | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/dotnet/Lucene.Net.Tests.ICU/Support/TestJDKBreakIterator.cs b/src/dotnet/Lucene.Net.Tests.ICU/Support/TestJDKBreakIterator.cs
index aea820d..7279c35 100644
--- a/src/dotnet/Lucene.Net.Tests.ICU/Support/TestJDKBreakIterator.cs
+++ b/src/dotnet/Lucene.Net.Tests.ICU/Support/TestJDKBreakIterator.cs
@@ -3,6 +3,7 @@ using Lucene.Net.Attributes;
using Lucene.Net.Support;
using NUnit.Framework;
using System;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Tests.ICU.Support
{
[lucenenet] 16/26: Lucene.Net.Tests.Index: Switched to using the
Assert class in the test framework instead of NUnit (#295, #261)
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 fd48c40ac458d6cab6fdc1cacb1ba29c3cf80299
Author: Shad Storhaug <sh...@shadstorhaug.com>
AuthorDate: Wed Jun 24 08:59:51 2020 +0700
Lucene.Net.Tests.Index: Switched to using the Assert class in the test framework instead of NUnit (#295, #261)
---
src/Lucene.Net.Tests/Index/Test2BBinaryDocValues.cs | 1 +
src/Lucene.Net.Tests/Index/Test2BDocs.cs | 1 +
src/Lucene.Net.Tests/Index/Test2BNumericDocValues.cs | 1 +
src/Lucene.Net.Tests/Index/Test2BSortedDocValues.cs | 1 +
src/Lucene.Net.Tests/Index/Test4GBStoredFields.cs | 1 +
src/Lucene.Net.Tests/Index/TestAddIndexes.cs | 1 +
src/Lucene.Net.Tests/Index/TestAllFilesHaveCodecHeader.cs | 1 +
src/Lucene.Net.Tests/Index/TestAtomicUpdate.cs | 1 +
src/Lucene.Net.Tests/Index/TestBackwardsCompatibility.cs | 2 +-
src/Lucene.Net.Tests/Index/TestBackwardsCompatibility3x.cs | 2 +-
src/Lucene.Net.Tests/Index/TestBagOfPositions.cs | 2 +-
src/Lucene.Net.Tests/Index/TestBagOfPostings.cs | 8 ++++----
src/Lucene.Net.Tests/Index/TestBinaryDocValuesUpdates.cs | 2 +-
src/Lucene.Net.Tests/Index/TestBinaryTerms.cs | 1 +
src/Lucene.Net.Tests/Index/TestByteSlices.cs | 1 +
src/Lucene.Net.Tests/Index/TestCheckIndex.cs | 1 +
src/Lucene.Net.Tests/Index/TestCodecs.cs | 1 +
src/Lucene.Net.Tests/Index/TestCompoundFile.cs | 5 +++--
src/Lucene.Net.Tests/Index/TestConcurrentMergeScheduler.cs | 1 +
src/Lucene.Net.Tests/Index/TestConsistentFieldNumbers.cs | 1 +
src/Lucene.Net.Tests/Index/TestCrash.cs | 1 +
src/Lucene.Net.Tests/Index/TestCrashCausesCorruptIndex.cs | 1 +
src/Lucene.Net.Tests/Index/TestCustomNorms.cs | 1 +
src/Lucene.Net.Tests/Index/TestDeletionPolicy.cs | 3 ++-
src/Lucene.Net.Tests/Index/TestDirectoryReader.cs | 1 +
src/Lucene.Net.Tests/Index/TestDirectoryReaderReopen.cs | 1 +
src/Lucene.Net.Tests/Index/TestDoc.cs | 1 +
src/Lucene.Net.Tests/Index/TestDocCount.cs | 5 +++--
src/Lucene.Net.Tests/Index/TestDocTermOrds.cs | 1 +
src/Lucene.Net.Tests/Index/TestDocValuesIndexing.cs | 1 +
src/Lucene.Net.Tests/Index/TestDocValuesWithThreads.cs | 1 +
src/Lucene.Net.Tests/Index/TestDocsAndPositions.cs | 1 +
src/Lucene.Net.Tests/Index/TestDocumentWriter.cs | 10 ++++++----
.../Index/TestDocumentsWriterDeleteQueue.cs | 4 +---
src/Lucene.Net.Tests/Index/TestFieldInfos.cs | 5 +++--
src/Lucene.Net.Tests/Index/TestFieldsReader.cs | 1 +
src/Lucene.Net.Tests/Index/TestFilterAtomicReader.cs | 8 ++++----
src/Lucene.Net.Tests/Index/TestFlex.cs | 1 +
src/Lucene.Net.Tests/Index/TestFlushByRamOrCountsPolicy.cs | 1 +
src/Lucene.Net.Tests/Index/TestIndexCommit.cs | 4 ++--
src/Lucene.Net.Tests/Index/TestIndexInput.cs | 6 +++---
src/Lucene.Net.Tests/Index/TestIndexReaderClose.cs | 1 +
src/Lucene.Net.Tests/Index/TestIndexWriter.cs | 9 ++++-----
src/Lucene.Net.Tests/Index/TestIndexWriterCommit.cs | 1 +
src/Lucene.Net.Tests/Index/TestIndexWriterConfig.cs | 1 +
src/Lucene.Net.Tests/Index/TestIndexWriterDelete.cs | 6 ++----
src/Lucene.Net.Tests/Index/TestIndexWriterExceptions.cs | 4 +---
src/Lucene.Net.Tests/Index/TestIndexWriterForceMerge.cs | 1 +
src/Lucene.Net.Tests/Index/TestIndexWriterMergePolicy.cs | 1 +
src/Lucene.Net.Tests/Index/TestIndexWriterMerging.cs | 1 +
src/Lucene.Net.Tests/Index/TestIndexWriterOnDiskFull.cs | 1 +
src/Lucene.Net.Tests/Index/TestIndexWriterReader.cs | 5 +----
src/Lucene.Net.Tests/Index/TestIndexWriterUnicode.cs | 2 +-
src/Lucene.Net.Tests/Index/TestIndexWriterWithThreads.cs | 2 +-
src/Lucene.Net.Tests/Index/TestIndexableField.cs | 1 +
src/Lucene.Net.Tests/Index/TestIntBlockPool.cs | 7 +++----
src/Lucene.Net.Tests/Index/TestIsCurrent.cs | 8 ++++----
src/Lucene.Net.Tests/Index/TestLazyProxSkipping.cs | 1 +
src/Lucene.Net.Tests/Index/TestLongPostings.cs | 1 +
src/Lucene.Net.Tests/Index/TestMaxTermFrequency.cs | 1 +
src/Lucene.Net.Tests/Index/TestMixedCodecs.cs | 1 +
src/Lucene.Net.Tests/Index/TestMixedDocValuesUpdates.cs | 2 +-
src/Lucene.Net.Tests/Index/TestMultiDocValues.cs | 6 +++---
src/Lucene.Net.Tests/Index/TestMultiFields.cs | 1 +
src/Lucene.Net.Tests/Index/TestMultiLevelSkipList.cs | 1 +
src/Lucene.Net.Tests/Index/TestNRTThreads.cs | 2 +-
src/Lucene.Net.Tests/Index/TestNoDeletionPolicy.cs | 1 +
src/Lucene.Net.Tests/Index/TestNorms.cs | 1 +
src/Lucene.Net.Tests/Index/TestNumericDocValuesUpdates.cs | 2 +-
src/Lucene.Net.Tests/Index/TestOmitNorms.cs | 1 +
src/Lucene.Net.Tests/Index/TestOmitPositions.cs | 1 +
src/Lucene.Net.Tests/Index/TestOmitTf.cs | 1 +
src/Lucene.Net.Tests/Index/TestParallelAtomicReader.cs | 8 ++++----
src/Lucene.Net.Tests/Index/TestParallelCompositeReader.cs | 1 +
src/Lucene.Net.Tests/Index/TestParallelReaderEmptyIndex.cs | 1 +
src/Lucene.Net.Tests/Index/TestParallelTermEnum.cs | 3 ++-
src/Lucene.Net.Tests/Index/TestPayloads.cs | 1 +
src/Lucene.Net.Tests/Index/TestPayloadsOnVectors.cs | 1 +
src/Lucene.Net.Tests/Index/TestPerSegmentDeletes.cs | 1 +
.../Index/TestPersistentSnapshotDeletionPolicy.cs | 12 ++++++------
src/Lucene.Net.Tests/Index/TestPostingsOffsets.cs | 1 +
src/Lucene.Net.Tests/Index/TestPrefixCodedTerms.cs | 1 +
src/Lucene.Net.Tests/Index/TestRollback.cs | 1 +
src/Lucene.Net.Tests/Index/TestRollingUpdates.cs | 1 +
src/Lucene.Net.Tests/Index/TestSegmentMerger.cs | 1 +
src/Lucene.Net.Tests/Index/TestSegmentReader.cs | 1 +
src/Lucene.Net.Tests/Index/TestSegmentTermDocs.cs | 1 +
src/Lucene.Net.Tests/Index/TestSegmentTermEnum.cs | 1 +
src/Lucene.Net.Tests/Index/TestSizeBoundedForceMerge.cs | 1 +
src/Lucene.Net.Tests/Index/TestSnapshotDeletionPolicy.cs | 1 +
src/Lucene.Net.Tests/Index/TestStressAdvance.cs | 14 +++++++-------
src/Lucene.Net.Tests/Index/TestStressIndexing2.cs | 1 +
src/Lucene.Net.Tests/Index/TestSumDocFreq.cs | 1 +
src/Lucene.Net.Tests/Index/TestTerm.cs | 5 +++--
src/Lucene.Net.Tests/Index/TestTermVectorsReader.cs | 1 +
src/Lucene.Net.Tests/Index/TestTermVectorsWriter.cs | 1 +
src/Lucene.Net.Tests/Index/TestTermsEnum.cs | 1 +
src/Lucene.Net.Tests/Index/TestTermsEnum2.cs | 2 +-
src/Lucene.Net.Tests/Index/TestThreadedForceMerge.cs | 1 +
src/Lucene.Net.Tests/Index/TestTieredMergePolicy.cs | 1 +
src/Lucene.Net.Tests/Index/TestTransactionRollback.cs | 8 ++++----
src/Lucene.Net.Tests/Index/TestTryDelete.cs | 1 +
102 files changed, 154 insertions(+), 88 deletions(-)
diff --git a/src/Lucene.Net.Tests/Index/Test2BBinaryDocValues.cs b/src/Lucene.Net.Tests/Index/Test2BBinaryDocValues.cs
index 73e5e67..e7e40cb 100644
--- a/src/Lucene.Net.Tests/Index/Test2BBinaryDocValues.cs
+++ b/src/Lucene.Net.Tests/Index/Test2BBinaryDocValues.cs
@@ -3,6 +3,7 @@ using Lucene.Net.Index.Extensions;
using Lucene.Net.Store;
using NUnit.Framework;
using System;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/Test2BDocs.cs b/src/Lucene.Net.Tests/Index/Test2BDocs.cs
index a1d3c4e..a50fcbd 100644
--- a/src/Lucene.Net.Tests/Index/Test2BDocs.cs
+++ b/src/Lucene.Net.Tests/Index/Test2BDocs.cs
@@ -1,5 +1,6 @@
using Lucene.Net.Support;
using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Index
{
diff --git a/src/Lucene.Net.Tests/Index/Test2BNumericDocValues.cs b/src/Lucene.Net.Tests/Index/Test2BNumericDocValues.cs
index 63787e7..9eab695 100644
--- a/src/Lucene.Net.Tests/Index/Test2BNumericDocValues.cs
+++ b/src/Lucene.Net.Tests/Index/Test2BNumericDocValues.cs
@@ -3,6 +3,7 @@ using Lucene.Net.Index.Extensions;
using Lucene.Net.Store;
using NUnit.Framework;
using System;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/Test2BSortedDocValues.cs b/src/Lucene.Net.Tests/Index/Test2BSortedDocValues.cs
index 79978f3..eddc306 100644
--- a/src/Lucene.Net.Tests/Index/Test2BSortedDocValues.cs
+++ b/src/Lucene.Net.Tests/Index/Test2BSortedDocValues.cs
@@ -3,6 +3,7 @@ using Lucene.Net.Index.Extensions;
using Lucene.Net.Store;
using NUnit.Framework;
using System;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/Test4GBStoredFields.cs b/src/Lucene.Net.Tests/Index/Test4GBStoredFields.cs
index 3c99a3f..74c0390 100644
--- a/src/Lucene.Net.Tests/Index/Test4GBStoredFields.cs
+++ b/src/Lucene.Net.Tests/Index/Test4GBStoredFields.cs
@@ -4,6 +4,7 @@ using Lucene.Net.Index.Extensions;
using Lucene.Net.Randomized.Generators;
using Lucene.Net.Store;
using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestAddIndexes.cs b/src/Lucene.Net.Tests/Index/TestAddIndexes.cs
index ac00ff1..43ab1d4 100644
--- a/src/Lucene.Net.Tests/Index/TestAddIndexes.cs
+++ b/src/Lucene.Net.Tests/Index/TestAddIndexes.cs
@@ -9,6 +9,7 @@ using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Threading;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestAllFilesHaveCodecHeader.cs b/src/Lucene.Net.Tests/Index/TestAllFilesHaveCodecHeader.cs
index 4051b8b..88519b8 100644
--- a/src/Lucene.Net.Tests/Index/TestAllFilesHaveCodecHeader.cs
+++ b/src/Lucene.Net.Tests/Index/TestAllFilesHaveCodecHeader.cs
@@ -2,6 +2,7 @@ using Lucene.Net.Documents;
using Lucene.Net.Index.Extensions;
using NUnit.Framework;
using System;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Index
{
diff --git a/src/Lucene.Net.Tests/Index/TestAtomicUpdate.cs b/src/Lucene.Net.Tests/Index/TestAtomicUpdate.cs
index 150ec05..7917758 100644
--- a/src/Lucene.Net.Tests/Index/TestAtomicUpdate.cs
+++ b/src/Lucene.Net.Tests/Index/TestAtomicUpdate.cs
@@ -6,6 +6,7 @@ using Lucene.Net.Util;
using NUnit.Framework;
using System;
using System.Threading;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestBackwardsCompatibility.cs b/src/Lucene.Net.Tests/Index/TestBackwardsCompatibility.cs
index 1e7f83f..0771b57 100644
--- a/src/Lucene.Net.Tests/Index/TestBackwardsCompatibility.cs
+++ b/src/Lucene.Net.Tests/Index/TestBackwardsCompatibility.cs
@@ -1,7 +1,6 @@
using J2N;
using Lucene.Net.Attributes;
using Lucene.Net.Index.Extensions;
-using Lucene.Net.Support;
using NUnit.Framework;
using System;
using System.Collections.Generic;
@@ -9,6 +8,7 @@ using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Text;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestBackwardsCompatibility3x.cs b/src/Lucene.Net.Tests/Index/TestBackwardsCompatibility3x.cs
index 013fdee..31c1526 100644
--- a/src/Lucene.Net.Tests/Index/TestBackwardsCompatibility3x.cs
+++ b/src/Lucene.Net.Tests/Index/TestBackwardsCompatibility3x.cs
@@ -1,12 +1,12 @@
using J2N;
using Lucene.Net.Index.Extensions;
-using Lucene.Net.Support;
using NUnit.Framework;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Text;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestBagOfPositions.cs b/src/Lucene.Net.Tests/Index/TestBagOfPositions.cs
index f152c98..572b577 100644
--- a/src/Lucene.Net.Tests/Index/TestBagOfPositions.cs
+++ b/src/Lucene.Net.Tests/Index/TestBagOfPositions.cs
@@ -1,7 +1,6 @@
using J2N.Collections.Generic.Extensions;
using J2N.Threading;
using Lucene.Net.Documents;
-using Lucene.Net.Support;
using NUnit.Framework;
using System;
using System.Collections.Concurrent;
@@ -9,6 +8,7 @@ using System.Collections.Generic;
using System.Globalization;
using System.Text;
using System.Threading;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestBagOfPostings.cs b/src/Lucene.Net.Tests/Index/TestBagOfPostings.cs
index c9d82cf..9a2ba29 100644
--- a/src/Lucene.Net.Tests/Index/TestBagOfPostings.cs
+++ b/src/Lucene.Net.Tests/Index/TestBagOfPostings.cs
@@ -1,16 +1,16 @@
+using J2N.Collections.Generic.Extensions;
using J2N.Threading;
using Lucene.Net.Documents;
-using Lucene.Net.Support;
using NUnit.Framework;
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
+using System.Globalization;
using System.Text;
using System.Threading;
-using JCG = J2N.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
-using J2N.Collections.Generic.Extensions;
-using System.Globalization;
+using JCG = J2N.Collections.Generic;
namespace Lucene.Net.Index
{
diff --git a/src/Lucene.Net.Tests/Index/TestBinaryDocValuesUpdates.cs b/src/Lucene.Net.Tests/Index/TestBinaryDocValuesUpdates.cs
index 9d76073..d266f9e 100644
--- a/src/Lucene.Net.Tests/Index/TestBinaryDocValuesUpdates.cs
+++ b/src/Lucene.Net.Tests/Index/TestBinaryDocValuesUpdates.cs
@@ -16,9 +16,9 @@ using System;
using System.Collections.Generic;
using System.IO;
using System.Threading;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
using JCG = J2N.Collections.Generic;
-using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Index
{
diff --git a/src/Lucene.Net.Tests/Index/TestBinaryTerms.cs b/src/Lucene.Net.Tests/Index/TestBinaryTerms.cs
index e456ac7..45af4b0 100644
--- a/src/Lucene.Net.Tests/Index/TestBinaryTerms.cs
+++ b/src/Lucene.Net.Tests/Index/TestBinaryTerms.cs
@@ -1,5 +1,6 @@
using Lucene.Net.Documents;
using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Index
{
diff --git a/src/Lucene.Net.Tests/Index/TestByteSlices.cs b/src/Lucene.Net.Tests/Index/TestByteSlices.cs
index 5a8fc3e..38a4add 100644
--- a/src/Lucene.Net.Tests/Index/TestByteSlices.cs
+++ b/src/Lucene.Net.Tests/Index/TestByteSlices.cs
@@ -2,6 +2,7 @@ using Lucene.Net.Attributes;
using Lucene.Net.Randomized.Generators;
using NUnit.Framework;
using System;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestCheckIndex.cs b/src/Lucene.Net.Tests/Index/TestCheckIndex.cs
index 04b7a90..e3fb5bb 100644
--- a/src/Lucene.Net.Tests/Index/TestCheckIndex.cs
+++ b/src/Lucene.Net.Tests/Index/TestCheckIndex.cs
@@ -5,6 +5,7 @@ using NUnit.Framework;
using System.Collections.Generic;
using System.IO;
using System.Text;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestCodecs.cs b/src/Lucene.Net.Tests/Index/TestCodecs.cs
index 46571db..1c17770 100644
--- a/src/Lucene.Net.Tests/Index/TestCodecs.cs
+++ b/src/Lucene.Net.Tests/Index/TestCodecs.cs
@@ -10,6 +10,7 @@ using System.Collections.Generic;
using System.Diagnostics;
using System.Threading;
using JCG = J2N.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestCompoundFile.cs b/src/Lucene.Net.Tests/Index/TestCompoundFile.cs
index 6a24123..ad71c5a 100644
--- a/src/Lucene.Net.Tests/Index/TestCompoundFile.cs
+++ b/src/Lucene.Net.Tests/Index/TestCompoundFile.cs
@@ -1,11 +1,12 @@
using Lucene.Net.Documents;
using Lucene.Net.Store;
+using NUnit.Framework;
using System;
+using System.IO;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Index
{
- using NUnit.Framework;
- using System.IO;
using CompoundFileDirectory = Lucene.Net.Store.CompoundFileDirectory;
using Directory = Lucene.Net.Store.Directory;
diff --git a/src/Lucene.Net.Tests/Index/TestConcurrentMergeScheduler.cs b/src/Lucene.Net.Tests/Index/TestConcurrentMergeScheduler.cs
index be9454f..03c8796 100644
--- a/src/Lucene.Net.Tests/Index/TestConcurrentMergeScheduler.cs
+++ b/src/Lucene.Net.Tests/Index/TestConcurrentMergeScheduler.cs
@@ -9,6 +9,7 @@ using NUnit.Framework;
using System;
using System.IO;
using System.Threading;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestConsistentFieldNumbers.cs b/src/Lucene.Net.Tests/Index/TestConsistentFieldNumbers.cs
index b36f260..8056ea0 100644
--- a/src/Lucene.Net.Tests/Index/TestConsistentFieldNumbers.cs
+++ b/src/Lucene.Net.Tests/Index/TestConsistentFieldNumbers.cs
@@ -3,6 +3,7 @@ using Lucene.Net.Documents;
using Lucene.Net.Index.Extensions;
using Lucene.Net.Support;
using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Index
{
diff --git a/src/Lucene.Net.Tests/Index/TestCrash.cs b/src/Lucene.Net.Tests/Index/TestCrash.cs
index 2976a80..043d09a 100644
--- a/src/Lucene.Net.Tests/Index/TestCrash.cs
+++ b/src/Lucene.Net.Tests/Index/TestCrash.cs
@@ -2,6 +2,7 @@ using Lucene.Net.Documents;
using Lucene.Net.Index.Extensions;
using NUnit.Framework;
using System;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestCrashCausesCorruptIndex.cs b/src/Lucene.Net.Tests/Index/TestCrashCausesCorruptIndex.cs
index 978f086..7139a25 100644
--- a/src/Lucene.Net.Tests/Index/TestCrashCausesCorruptIndex.cs
+++ b/src/Lucene.Net.Tests/Index/TestCrashCausesCorruptIndex.cs
@@ -2,6 +2,7 @@ using Lucene.Net.Documents;
using NUnit.Framework;
using System;
using System.IO;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestCustomNorms.cs b/src/Lucene.Net.Tests/Index/TestCustomNorms.cs
index 9199e7f..777a17a 100644
--- a/src/Lucene.Net.Tests/Index/TestCustomNorms.cs
+++ b/src/Lucene.Net.Tests/Index/TestCustomNorms.cs
@@ -3,6 +3,7 @@ using Lucene.Net.Index.Extensions;
using NUnit.Framework;
using System;
using System.Globalization;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Index
{
diff --git a/src/Lucene.Net.Tests/Index/TestDeletionPolicy.cs b/src/Lucene.Net.Tests/Index/TestDeletionPolicy.cs
index a6e3aca..4fbb3b8 100644
--- a/src/Lucene.Net.Tests/Index/TestDeletionPolicy.cs
+++ b/src/Lucene.Net.Tests/Index/TestDeletionPolicy.cs
@@ -1,3 +1,4 @@
+using Lucene.Net.Attributes;
using Lucene.Net.Documents;
using Lucene.Net.Index.Extensions;
using NUnit.Framework;
@@ -6,6 +7,7 @@ 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;
namespace Lucene.Net.Index
@@ -38,7 +40,6 @@ namespace Lucene.Net.Index
using ScoreDoc = Lucene.Net.Search.ScoreDoc;
using TermQuery = Lucene.Net.Search.TermQuery;
using TestUtil = Lucene.Net.Util.TestUtil;
- using Attributes;
/*
Verify we can read the pre-2.1 file format, do searches
diff --git a/src/Lucene.Net.Tests/Index/TestDirectoryReader.cs b/src/Lucene.Net.Tests/Index/TestDirectoryReader.cs
index be74c4d..3b30a16 100644
--- a/src/Lucene.Net.Tests/Index/TestDirectoryReader.cs
+++ b/src/Lucene.Net.Tests/Index/TestDirectoryReader.cs
@@ -8,6 +8,7 @@ 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;
namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestDirectoryReaderReopen.cs b/src/Lucene.Net.Tests/Index/TestDirectoryReaderReopen.cs
index df1542b..b7e5363 100644
--- a/src/Lucene.Net.Tests/Index/TestDirectoryReaderReopen.cs
+++ b/src/Lucene.Net.Tests/Index/TestDirectoryReaderReopen.cs
@@ -8,6 +8,7 @@ using System.Collections.Generic;
using System.Text;
using System.Threading;
using JCG = J2N.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestDoc.cs b/src/Lucene.Net.Tests/Index/TestDoc.cs
index a596e44..da6bf90 100644
--- a/src/Lucene.Net.Tests/Index/TestDoc.cs
+++ b/src/Lucene.Net.Tests/Index/TestDoc.cs
@@ -6,6 +6,7 @@ using System;
using System.Collections.Generic;
using System.IO;
using JCG = J2N.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestDocCount.cs b/src/Lucene.Net.Tests/Index/TestDocCount.cs
index 51a311c..c631735 100644
--- a/src/Lucene.Net.Tests/Index/TestDocCount.cs
+++ b/src/Lucene.Net.Tests/Index/TestDocCount.cs
@@ -1,9 +1,10 @@
-using System.Collections.Generic;
using Lucene.Net.Documents;
+using NUnit.Framework;
+using System.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Index
{
- using NUnit.Framework;
using Directory = Lucene.Net.Store.Directory;
using DocIdSetIterator = Lucene.Net.Search.DocIdSetIterator;
diff --git a/src/Lucene.Net.Tests/Index/TestDocTermOrds.cs b/src/Lucene.Net.Tests/Index/TestDocTermOrds.cs
index 504c4df..ab88b49 100644
--- a/src/Lucene.Net.Tests/Index/TestDocTermOrds.cs
+++ b/src/Lucene.Net.Tests/Index/TestDocTermOrds.cs
@@ -6,6 +6,7 @@ using System;
using System.Collections.Generic;
using System.Linq;
using JCG = J2N.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestDocValuesIndexing.cs b/src/Lucene.Net.Tests/Index/TestDocValuesIndexing.cs
index 4f504bd..bec0807 100644
--- a/src/Lucene.Net.Tests/Index/TestDocValuesIndexing.cs
+++ b/src/Lucene.Net.Tests/Index/TestDocValuesIndexing.cs
@@ -6,6 +6,7 @@ using Lucene.Net.Search;
using NUnit.Framework;
using System;
using System.Threading;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Index
{
diff --git a/src/Lucene.Net.Tests/Index/TestDocValuesWithThreads.cs b/src/Lucene.Net.Tests/Index/TestDocValuesWithThreads.cs
index d9ab4ad..69301e6 100644
--- a/src/Lucene.Net.Tests/Index/TestDocValuesWithThreads.cs
+++ b/src/Lucene.Net.Tests/Index/TestDocValuesWithThreads.cs
@@ -8,6 +8,7 @@ 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;
namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestDocsAndPositions.cs b/src/Lucene.Net.Tests/Index/TestDocsAndPositions.cs
index 4fc0108..afbf8ab 100644
--- a/src/Lucene.Net.Tests/Index/TestDocsAndPositions.cs
+++ b/src/Lucene.Net.Tests/Index/TestDocsAndPositions.cs
@@ -4,6 +4,7 @@ using NUnit.Framework;
using System;
using System.Collections.Generic;
using System.Text;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Index
{
diff --git a/src/Lucene.Net.Tests/Index/TestDocumentWriter.cs b/src/Lucene.Net.Tests/Index/TestDocumentWriter.cs
index 14ca6b7..49ec4da 100644
--- a/src/Lucene.Net.Tests/Index/TestDocumentWriter.cs
+++ b/src/Lucene.Net.Tests/Index/TestDocumentWriter.cs
@@ -1,5 +1,10 @@
+using Lucene.Net.Analysis;
using Lucene.Net.Analysis.TokenAttributes;
using Lucene.Net.Documents;
+using NUnit.Framework;
+using System;
+using System.IO;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Index
{
@@ -20,10 +25,7 @@ namespace Lucene.Net.Index
* limitations under the License.
*/
- using Lucene.Net.Analysis;
- using NUnit.Framework;
- using System;
- using System.IO;
+
using AttributeSource = Lucene.Net.Util.AttributeSource;
using BytesRef = Lucene.Net.Util.BytesRef;
using Directory = Lucene.Net.Store.Directory;
diff --git a/src/Lucene.Net.Tests/Index/TestDocumentsWriterDeleteQueue.cs b/src/Lucene.Net.Tests/Index/TestDocumentsWriterDeleteQueue.cs
index c9de8d9..3c7287c 100644
--- a/src/Lucene.Net.Tests/Index/TestDocumentsWriterDeleteQueue.cs
+++ b/src/Lucene.Net.Tests/Index/TestDocumentsWriterDeleteQueue.cs
@@ -4,16 +4,15 @@ using Lucene.Net.Search;
using Lucene.Net.Support.Threading;
using NUnit.Framework;
using System;
-using System.Collections;
using System.Collections.Generic;
using System.Reflection;
using System.Threading;
+using Assert = Lucene.Net.TestFramework.Assert;
using JCG = J2N.Collections.Generic;
namespace Lucene.Net.Index
{
using BytesRef = Lucene.Net.Util.BytesRef;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with this
@@ -34,7 +33,6 @@ namespace Lucene.Net.Index
using DeleteSlice = Lucene.Net.Index.DocumentsWriterDeleteQueue.DeleteSlice;
using LuceneTestCase = Lucene.Net.Util.LuceneTestCase;
using TermQuery = Lucene.Net.Search.TermQuery;
- using Assert = Lucene.Net.TestFramework.Assert;
/// <summary>
/// Unit test for <seealso cref="DocumentsWriterDeleteQueue"/>
diff --git a/src/Lucene.Net.Tests/Index/TestFieldInfos.cs b/src/Lucene.Net.Tests/Index/TestFieldInfos.cs
index 7b0d3da..5388479 100644
--- a/src/Lucene.Net.Tests/Index/TestFieldInfos.cs
+++ b/src/Lucene.Net.Tests/Index/TestFieldInfos.cs
@@ -1,7 +1,8 @@
+using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
+
namespace Lucene.Net.Index
{
- using NUnit.Framework;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git a/src/Lucene.Net.Tests/Index/TestFieldsReader.cs b/src/Lucene.Net.Tests/Index/TestFieldsReader.cs
index 87877c6..4347a04 100644
--- a/src/Lucene.Net.Tests/Index/TestFieldsReader.cs
+++ b/src/Lucene.Net.Tests/Index/TestFieldsReader.cs
@@ -4,6 +4,7 @@ using Lucene.Net.Documents;
using Lucene.Net.Index.Extensions;
using NUnit.Framework;
using System.IO;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Index
{
diff --git a/src/Lucene.Net.Tests/Index/TestFilterAtomicReader.cs b/src/Lucene.Net.Tests/Index/TestFilterAtomicReader.cs
index 11b8e09..8726726 100644
--- a/src/Lucene.Net.Tests/Index/TestFilterAtomicReader.cs
+++ b/src/Lucene.Net.Tests/Index/TestFilterAtomicReader.cs
@@ -1,20 +1,20 @@
+using Lucene.Net.Documents;
+using NUnit.Framework;
using System;
using System.Linq;
using System.Reflection;
-using Lucene.Net.Documents;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Index
{
- using NUnit.Framework;
using BaseDirectoryWrapper = Lucene.Net.Store.BaseDirectoryWrapper;
- using IBits = Lucene.Net.Util.IBits;
using BytesRef = Lucene.Net.Util.BytesRef;
using Directory = Lucene.Net.Store.Directory;
using DocIdSetIterator = Lucene.Net.Search.DocIdSetIterator;
using Document = Documents.Document;
using Field = Field;
+ using IBits = Lucene.Net.Util.IBits;
using LuceneTestCase = Lucene.Net.Util.LuceneTestCase;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git a/src/Lucene.Net.Tests/Index/TestFlex.cs b/src/Lucene.Net.Tests/Index/TestFlex.cs
index 874eece..4e2d77b 100644
--- a/src/Lucene.Net.Tests/Index/TestFlex.cs
+++ b/src/Lucene.Net.Tests/Index/TestFlex.cs
@@ -4,6 +4,7 @@ using Lucene.Net.Index.Extensions;
using Lucene.Net.Store;
using Lucene.Net.Util;
using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Index
{
diff --git a/src/Lucene.Net.Tests/Index/TestFlushByRamOrCountsPolicy.cs b/src/Lucene.Net.Tests/Index/TestFlushByRamOrCountsPolicy.cs
index bfb6bd9..dd4880a 100644
--- a/src/Lucene.Net.Tests/Index/TestFlushByRamOrCountsPolicy.cs
+++ b/src/Lucene.Net.Tests/Index/TestFlushByRamOrCountsPolicy.cs
@@ -5,6 +5,7 @@ using Lucene.Net.Store;
using NUnit.Framework;
using System;
using System.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestIndexCommit.cs b/src/Lucene.Net.Tests/Index/TestIndexCommit.cs
index 2cf47cb..009fbda 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexCommit.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexCommit.cs
@@ -1,9 +1,9 @@
using System.Collections.Generic;
+using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Index
{
- using NUnit.Framework;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git a/src/Lucene.Net.Tests/Index/TestIndexInput.cs b/src/Lucene.Net.Tests/Index/TestIndexInput.cs
index b794560..f88628f 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexInput.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexInput.cs
@@ -1,10 +1,10 @@
+using NUnit.Framework;
using System;
+using System.IO;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Index
{
- using NUnit.Framework;
- using System.IO;
- using System.Reflection;
using ByteArrayDataInput = Lucene.Net.Store.ByteArrayDataInput;
using ByteArrayDataOutput = Lucene.Net.Store.ByteArrayDataOutput;
using DataInput = Lucene.Net.Store.DataInput;
diff --git a/src/Lucene.Net.Tests/Index/TestIndexReaderClose.cs b/src/Lucene.Net.Tests/Index/TestIndexReaderClose.cs
index 1538e2e..63f0de9 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexReaderClose.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexReaderClose.cs
@@ -2,6 +2,7 @@ using J2N.Threading.Atomic;
using NUnit.Framework;
using System;
using System.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Index
{
diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriter.cs b/src/Lucene.Net.Tests/Index/TestIndexWriter.cs
index f112acf..1101ce2 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexWriter.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexWriter.cs
@@ -14,12 +14,12 @@ using NUnit.Framework;
using System;
using System.Collections.Generic;
using System.Diagnostics;
-using System.Globalization;
using System.IO;
using System.Text;
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.Index
{
@@ -40,7 +40,8 @@ namespace Lucene.Net.Index
* limitations under the License.
*/
-
+
+ using Assert = Lucene.Net.TestFramework.Assert;
using Automaton = Lucene.Net.Util.Automaton.Automaton;
using BaseDirectoryWrapper = Lucene.Net.Store.BaseDirectoryWrapper;
using BasicAutomata = Lucene.Net.Util.Automaton.BasicAutomata;
@@ -48,7 +49,6 @@ namespace Lucene.Net.Index
using BinaryDocValuesField = BinaryDocValuesField;
using BytesRef = Lucene.Net.Util.BytesRef;
using CharacterRunAutomaton = Lucene.Net.Util.Automaton.CharacterRunAutomaton;
- using CharTermAttribute = Lucene.Net.Analysis.TokenAttributes.CharTermAttribute;
using Constants = Lucene.Net.Util.Constants;
using Directory = Lucene.Net.Store.Directory;
using DocIdSetIterator = Lucene.Net.Search.DocIdSetIterator;
@@ -81,7 +81,6 @@ namespace Lucene.Net.Index
using TermQuery = Lucene.Net.Search.TermQuery;
using TestUtil = Lucene.Net.Util.TestUtil;
using TextField = TextField;
- using Assert = Lucene.Net.TestFramework.Assert;
[TestFixture]
public class TestIndexWriter : LuceneTestCase
diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterCommit.cs b/src/Lucene.Net.Tests/Index/TestIndexWriterCommit.cs
index df20d4d..fc9d5ec 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexWriterCommit.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexWriterCommit.cs
@@ -7,6 +7,7 @@ using NUnit.Framework;
using System;
using System.Collections.Generic;
using System.IO;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterConfig.cs b/src/Lucene.Net.Tests/Index/TestIndexWriterConfig.cs
index 7d5c9d3..a958769 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexWriterConfig.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexWriterConfig.cs
@@ -5,6 +5,7 @@ using NUnit.Framework;
using System;
using System.Collections.Generic;
using System.Reflection;
+using Assert = Lucene.Net.TestFramework.Assert;
using JCG = J2N.Collections.Generic;
namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterDelete.cs b/src/Lucene.Net.Tests/Index/TestIndexWriterDelete.cs
index 70fa5e5..935eac8 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexWriterDelete.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexWriterDelete.cs
@@ -6,16 +6,15 @@ using Lucene.Net.Attributes;
using Lucene.Net.Documents;
using Lucene.Net.Index.Extensions;
using Lucene.Net.Store;
-using Lucene.Net.Support;
using Lucene.Net.Support.IO;
using Lucene.Net.Util;
using NUnit.Framework;
using System;
using System.Collections.Generic;
-using System.Diagnostics;
using System.IO;
using System.Text;
using System.Threading;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Index
@@ -38,12 +37,12 @@ namespace Lucene.Net.Index
*/
using Analyzer = Lucene.Net.Analysis.Analyzer;
+ using Assert = Lucene.Net.TestFramework.Assert;
using Directory = Lucene.Net.Store.Directory;
using Document = Documents.Document;
using Field = Field;
using FieldType = FieldType;
using IndexSearcher = Lucene.Net.Search.IndexSearcher;
- using IOUtils = Lucene.Net.Util.IOUtils;
using LuceneTestCase = Lucene.Net.Util.LuceneTestCase;
using MockAnalyzer = Lucene.Net.Analysis.MockAnalyzer;
using MockDirectoryWrapper = Lucene.Net.Store.MockDirectoryWrapper;
@@ -54,7 +53,6 @@ namespace Lucene.Net.Index
using StringField = StringField;
using TermQuery = Lucene.Net.Search.TermQuery;
using TestUtil = Lucene.Net.Util.TestUtil;
- using Assert = Lucene.Net.TestFramework.Assert;
[TestFixture]
public class TestIndexWriterDelete : LuceneTestCase
diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterExceptions.cs b/src/Lucene.Net.Tests/Index/TestIndexWriterExceptions.cs
index 80404a8..0e904d0 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexWriterExceptions.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexWriterExceptions.cs
@@ -1,7 +1,6 @@
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;
@@ -10,9 +9,9 @@ using Lucene.Net.Util;
using NUnit.Framework;
using System;
using System.Collections.Generic;
-using System.Diagnostics;
using System.IO;
using System.Threading;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Index
@@ -65,7 +64,6 @@ namespace Lucene.Net.Index
using Token = Lucene.Net.Analysis.Token;
using TokenFilter = Lucene.Net.Analysis.TokenFilter;
using TokenStream = Lucene.Net.Analysis.TokenStream;
- using Assert = Lucene.Net.TestFramework.Assert;
[TestFixture]
public class TestIndexWriterExceptions : LuceneTestCase
diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterForceMerge.cs b/src/Lucene.Net.Tests/Index/TestIndexWriterForceMerge.cs
index 0763274..6d8d02f 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexWriterForceMerge.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexWriterForceMerge.cs
@@ -2,6 +2,7 @@ using Lucene.Net.Documents;
using Lucene.Net.Index.Extensions;
using NUnit.Framework;
using System;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterMergePolicy.cs b/src/Lucene.Net.Tests/Index/TestIndexWriterMergePolicy.cs
index 995b1c1..47f0930 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexWriterMergePolicy.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexWriterMergePolicy.cs
@@ -2,6 +2,7 @@ using Lucene.Net.Documents;
using Lucene.Net.Index.Extensions;
using NUnit.Framework;
using System;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Index
{
diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterMerging.cs b/src/Lucene.Net.Tests/Index/TestIndexWriterMerging.cs
index 29816ce..5a6992e 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexWriterMerging.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexWriterMerging.cs
@@ -7,6 +7,7 @@ using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Threading;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterOnDiskFull.cs b/src/Lucene.Net.Tests/Index/TestIndexWriterOnDiskFull.cs
index 3e7ac16..bdd6d93 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexWriterOnDiskFull.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexWriterOnDiskFull.cs
@@ -6,6 +6,7 @@ using Lucene.Net.Util;
using NUnit.Framework;
using System;
using System.IO;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterReader.cs b/src/Lucene.Net.Tests/Index/TestIndexWriterReader.cs
index d8b5216..d2c4f32 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexWriterReader.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexWriterReader.cs
@@ -4,13 +4,12 @@ using Lucene.Net.Attributes;
using Lucene.Net.Documents;
using Lucene.Net.Index.Extensions;
using Lucene.Net.Store;
-using Lucene.Net.Support;
using Lucene.Net.Util;
using NUnit.Framework;
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
-using JCG = J2N.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Index
@@ -42,7 +41,6 @@ namespace Lucene.Net.Index
using IndexSearcher = Lucene.Net.Search.IndexSearcher;
using InfoStream = Lucene.Net.Util.InfoStream;
using LuceneTestCase = Lucene.Net.Util.LuceneTestCase;
-
using MockAnalyzer = Lucene.Net.Analysis.MockAnalyzer;
using MockDirectoryWrapper = Lucene.Net.Store.MockDirectoryWrapper;
using Query = Lucene.Net.Search.Query;
@@ -51,7 +49,6 @@ namespace Lucene.Net.Index
using TestUtil = Lucene.Net.Util.TestUtil;
using TextField = TextField;
using TopDocs = Lucene.Net.Search.TopDocs;
- using Assert = Lucene.Net.TestFramework.Assert;
[TestFixture]
public class TestIndexWriterReader : LuceneTestCase
diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterUnicode.cs b/src/Lucene.Net.Tests/Index/TestIndexWriterUnicode.cs
index 317e16a..5868044 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexWriterUnicode.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexWriterUnicode.cs
@@ -6,6 +6,7 @@ using NUnit.Framework;
using System;
using System.Collections.Generic;
using System.Text;
+using Assert = Lucene.Net.TestFramework.Assert;
using JCG = J2N.Collections.Generic;
namespace Lucene.Net.Index
@@ -36,7 +37,6 @@ namespace Lucene.Net.Index
using MockAnalyzer = Lucene.Net.Analysis.MockAnalyzer;
using UnicodeUtil = Lucene.Net.Util.UnicodeUtil;
- using Assert = Lucene.Net.TestFramework.Assert;
[TestFixture]
public class TestIndexWriterUnicode : LuceneTestCase
diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterWithThreads.cs b/src/Lucene.Net.Tests/Index/TestIndexWriterWithThreads.cs
index 2b62206..bbeb236 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexWriterWithThreads.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexWriterWithThreads.cs
@@ -9,6 +9,7 @@ using NUnit.Framework;
using System;
using System.IO;
using System.Threading;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Index
@@ -26,7 +27,6 @@ namespace Lucene.Net.Index
using LineFileDocs = Lucene.Net.Util.LineFileDocs;
using LockObtainFailedException = Lucene.Net.Store.LockObtainFailedException;
using LuceneTestCase = Lucene.Net.Util.LuceneTestCase;
- using Assert = Lucene.Net.TestFramework.Assert;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/src/Lucene.Net.Tests/Index/TestIndexableField.cs b/src/Lucene.Net.Tests/Index/TestIndexableField.cs
index ea00518..2cfec00 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexableField.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexableField.cs
@@ -4,6 +4,7 @@ using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestIntBlockPool.cs b/src/Lucene.Net.Tests/Index/TestIntBlockPool.cs
index ac9d0de..40219c7 100644
--- a/src/Lucene.Net.Tests/Index/TestIntBlockPool.cs
+++ b/src/Lucene.Net.Tests/Index/TestIntBlockPool.cs
@@ -1,11 +1,10 @@
+using Lucene.Net.Attributes;
+using NUnit.Framework;
using System.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Index
{
- using Lucene.Net.Attributes;
- using Lucene.Net.Randomized.Generators;
- using NUnit.Framework;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git a/src/Lucene.Net.Tests/Index/TestIsCurrent.cs b/src/Lucene.Net.Tests/Index/TestIsCurrent.cs
index 0520c60..9fc5d77 100644
--- a/src/Lucene.Net.Tests/Index/TestIsCurrent.cs
+++ b/src/Lucene.Net.Tests/Index/TestIsCurrent.cs
@@ -1,11 +1,11 @@
using Lucene.Net.Documents;
+using Lucene.Net.Store;
+using Lucene.Net.Util;
+using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Index
{
- using Lucene.Net.Store;
- using Lucene.Net.Util;
- using NUnit.Framework;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git a/src/Lucene.Net.Tests/Index/TestLazyProxSkipping.cs b/src/Lucene.Net.Tests/Index/TestLazyProxSkipping.cs
index f449b39..c7f579f 100644
--- a/src/Lucene.Net.Tests/Index/TestLazyProxSkipping.cs
+++ b/src/Lucene.Net.Tests/Index/TestLazyProxSkipping.cs
@@ -3,6 +3,7 @@ using Lucene.Net.Index.Extensions;
using NUnit.Framework;
using System;
using System.IO;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Index
{
diff --git a/src/Lucene.Net.Tests/Index/TestLongPostings.cs b/src/Lucene.Net.Tests/Index/TestLongPostings.cs
index df04d2c..9c2388a 100644
--- a/src/Lucene.Net.Tests/Index/TestLongPostings.cs
+++ b/src/Lucene.Net.Tests/Index/TestLongPostings.cs
@@ -5,6 +5,7 @@ using NUnit.Framework;
using System;
using System.Diagnostics;
using System.IO;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestMaxTermFrequency.cs b/src/Lucene.Net.Tests/Index/TestMaxTermFrequency.cs
index 69a6072..31d519c 100644
--- a/src/Lucene.Net.Tests/Index/TestMaxTermFrequency.cs
+++ b/src/Lucene.Net.Tests/Index/TestMaxTermFrequency.cs
@@ -6,6 +6,7 @@ using NUnit.Framework;
using System;
using System.Collections.Generic;
using System.Linq;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Index
{
diff --git a/src/Lucene.Net.Tests/Index/TestMixedCodecs.cs b/src/Lucene.Net.Tests/Index/TestMixedCodecs.cs
index 759cbe7..60fa880 100644
--- a/src/Lucene.Net.Tests/Index/TestMixedCodecs.cs
+++ b/src/Lucene.Net.Tests/Index/TestMixedCodecs.cs
@@ -4,6 +4,7 @@ using NUnit.Framework;
using System;
using System.Collections.Generic;
using JCG = J2N.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestMixedDocValuesUpdates.cs b/src/Lucene.Net.Tests/Index/TestMixedDocValuesUpdates.cs
index 100ce2d..0e54f77 100644
--- a/src/Lucene.Net.Tests/Index/TestMixedDocValuesUpdates.cs
+++ b/src/Lucene.Net.Tests/Index/TestMixedDocValuesUpdates.cs
@@ -10,6 +10,7 @@ using System;
using System.Collections.Generic;
using System.IO;
using System.Threading;
+using Assert = Lucene.Net.TestFramework.Assert;
using JCG = J2N.Collections.Generic;
namespace Lucene.Net.Index
@@ -26,7 +27,6 @@ namespace Lucene.Net.Index
using Store = Field.Store;
using StringField = StringField;
using TestUtil = Lucene.Net.Util.TestUtil;
- using Assert = Lucene.Net.TestFramework.Assert;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/src/Lucene.Net.Tests/Index/TestMultiDocValues.cs b/src/Lucene.Net.Tests/Index/TestMultiDocValues.cs
index dc51c11..12ddef5 100644
--- a/src/Lucene.Net.Tests/Index/TestMultiDocValues.cs
+++ b/src/Lucene.Net.Tests/Index/TestMultiDocValues.cs
@@ -1,11 +1,11 @@
using Lucene.Net.Documents;
using Lucene.Net.Index.Extensions;
+using NUnit.Framework;
using System.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Index
{
- using NUnit.Framework;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -24,11 +24,11 @@ namespace Lucene.Net.Index
*/
using BinaryDocValuesField = BinaryDocValuesField;
- using IBits = Lucene.Net.Util.IBits;
using BytesRef = Lucene.Net.Util.BytesRef;
using Directory = Lucene.Net.Store.Directory;
using Document = Documents.Document;
using Field = Field;
+ using IBits = Lucene.Net.Util.IBits;
using LuceneTestCase = Lucene.Net.Util.LuceneTestCase;
using NumericDocValuesField = NumericDocValuesField;
using SortedDocValuesField = SortedDocValuesField;
diff --git a/src/Lucene.Net.Tests/Index/TestMultiFields.cs b/src/Lucene.Net.Tests/Index/TestMultiFields.cs
index 24fa07a..3486a8f 100644
--- a/src/Lucene.Net.Tests/Index/TestMultiFields.cs
+++ b/src/Lucene.Net.Tests/Index/TestMultiFields.cs
@@ -7,6 +7,7 @@ using NUnit.Framework;
using System;
using System.Collections.Generic;
using JCG = J2N.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestMultiLevelSkipList.cs b/src/Lucene.Net.Tests/Index/TestMultiLevelSkipList.cs
index 592f2f0..77878ab 100644
--- a/src/Lucene.Net.Tests/Index/TestMultiLevelSkipList.cs
+++ b/src/Lucene.Net.Tests/Index/TestMultiLevelSkipList.cs
@@ -6,6 +6,7 @@ using Lucene.Net.Index.Extensions;
using NUnit.Framework;
using System;
using System.IO;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Index
{
diff --git a/src/Lucene.Net.Tests/Index/TestNRTThreads.cs b/src/Lucene.Net.Tests/Index/TestNRTThreads.cs
index 841f5bc..f9503e3 100644
--- a/src/Lucene.Net.Tests/Index/TestNRTThreads.cs
+++ b/src/Lucene.Net.Tests/Index/TestNRTThreads.cs
@@ -1,9 +1,9 @@
-using Lucene.Net.Randomized.Generators;
using NUnit.Framework;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Threading.Tasks;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestNoDeletionPolicy.cs b/src/Lucene.Net.Tests/Index/TestNoDeletionPolicy.cs
index 968a6c6..704ca5c 100644
--- a/src/Lucene.Net.Tests/Index/TestNoDeletionPolicy.cs
+++ b/src/Lucene.Net.Tests/Index/TestNoDeletionPolicy.cs
@@ -3,6 +3,7 @@ using Lucene.Net.Index.Extensions;
using Lucene.Net.Support;
using NUnit.Framework;
using System.Reflection;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Index
{
diff --git a/src/Lucene.Net.Tests/Index/TestNorms.cs b/src/Lucene.Net.Tests/Index/TestNorms.cs
index c376580..9bdba52 100644
--- a/src/Lucene.Net.Tests/Index/TestNorms.cs
+++ b/src/Lucene.Net.Tests/Index/TestNorms.cs
@@ -2,6 +2,7 @@ using System;
using Lucene.Net.Documents;
using Lucene.Net.Index.Extensions;
using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Index
{
diff --git a/src/Lucene.Net.Tests/Index/TestNumericDocValuesUpdates.cs b/src/Lucene.Net.Tests/Index/TestNumericDocValuesUpdates.cs
index 2efbfb4..f628e5c 100644
--- a/src/Lucene.Net.Tests/Index/TestNumericDocValuesUpdates.cs
+++ b/src/Lucene.Net.Tests/Index/TestNumericDocValuesUpdates.cs
@@ -11,6 +11,7 @@ using System;
using System.Collections.Generic;
using System.IO;
using System.Threading;
+using Assert = Lucene.Net.TestFramework.Assert;
using JCG = J2N.Collections.Generic;
namespace Lucene.Net.Index
@@ -39,7 +40,6 @@ namespace Lucene.Net.Index
using Store = Field.Store;
using StringField = StringField;
using TestUtil = Lucene.Net.Util.TestUtil;
- using Assert = Lucene.Net.TestFramework.Assert;
/*
diff --git a/src/Lucene.Net.Tests/Index/TestOmitNorms.cs b/src/Lucene.Net.Tests/Index/TestOmitNorms.cs
index 5c045a7..5e408a8 100644
--- a/src/Lucene.Net.Tests/Index/TestOmitNorms.cs
+++ b/src/Lucene.Net.Tests/Index/TestOmitNorms.cs
@@ -2,6 +2,7 @@ using Lucene.Net.Documents;
using Lucene.Net.Index.Extensions;
using NUnit.Framework;
using System;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Index
{
diff --git a/src/Lucene.Net.Tests/Index/TestOmitPositions.cs b/src/Lucene.Net.Tests/Index/TestOmitPositions.cs
index a63d471..5f3c396 100644
--- a/src/Lucene.Net.Tests/Index/TestOmitPositions.cs
+++ b/src/Lucene.Net.Tests/Index/TestOmitPositions.cs
@@ -2,6 +2,7 @@ using Lucene.Net.Documents;
using Lucene.Net.Index.Extensions;
using NUnit.Framework;
using System;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Index
{
diff --git a/src/Lucene.Net.Tests/Index/TestOmitTf.cs b/src/Lucene.Net.Tests/Index/TestOmitTf.cs
index d64f315..19e3fd3 100644
--- a/src/Lucene.Net.Tests/Index/TestOmitTf.cs
+++ b/src/Lucene.Net.Tests/Index/TestOmitTf.cs
@@ -3,6 +3,7 @@ using Lucene.Net.Index.Extensions;
using NUnit.Framework;
using System;
using System.Text;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Index
{
diff --git a/src/Lucene.Net.Tests/Index/TestParallelAtomicReader.cs b/src/Lucene.Net.Tests/Index/TestParallelAtomicReader.cs
index 9bf5c52..39a07c9 100644
--- a/src/Lucene.Net.Tests/Index/TestParallelAtomicReader.cs
+++ b/src/Lucene.Net.Tests/Index/TestParallelAtomicReader.cs
@@ -1,11 +1,11 @@
-using System;
using Lucene.Net.Documents;
+using Lucene.Net.Search;
+using NUnit.Framework;
+using System;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Index
{
- using Lucene.Net.Randomized.Generators;
- using Lucene.Net.Search;
- using NUnit.Framework;
using Directory = Lucene.Net.Store.Directory;
using Document = Documents.Document;
using Field = Field;
diff --git a/src/Lucene.Net.Tests/Index/TestParallelCompositeReader.cs b/src/Lucene.Net.Tests/Index/TestParallelCompositeReader.cs
index 066b331..2a43cf7 100644
--- a/src/Lucene.Net.Tests/Index/TestParallelCompositeReader.cs
+++ b/src/Lucene.Net.Tests/Index/TestParallelCompositeReader.cs
@@ -3,6 +3,7 @@ using Lucene.Net.Index.Extensions;
using Lucene.Net.Search;
using NUnit.Framework;
using System;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Index
{
diff --git a/src/Lucene.Net.Tests/Index/TestParallelReaderEmptyIndex.cs b/src/Lucene.Net.Tests/Index/TestParallelReaderEmptyIndex.cs
index 7e9ad21..e2458de 100644
--- a/src/Lucene.Net.Tests/Index/TestParallelReaderEmptyIndex.cs
+++ b/src/Lucene.Net.Tests/Index/TestParallelReaderEmptyIndex.cs
@@ -1,6 +1,7 @@
using Lucene.Net.Documents;
using Lucene.Net.Index.Extensions;
using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestParallelTermEnum.cs b/src/Lucene.Net.Tests/Index/TestParallelTermEnum.cs
index 409d930..7c46993 100644
--- a/src/Lucene.Net.Tests/Index/TestParallelTermEnum.cs
+++ b/src/Lucene.Net.Tests/Index/TestParallelTermEnum.cs
@@ -1,9 +1,10 @@
using System.Collections.Generic;
using Lucene.Net.Documents;
+using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Index
{
- using NUnit.Framework;
using IBits = Lucene.Net.Util.IBits;
using BytesRef = Lucene.Net.Util.BytesRef;
using Directory = Lucene.Net.Store.Directory;
diff --git a/src/Lucene.Net.Tests/Index/TestPayloads.cs b/src/Lucene.Net.Tests/Index/TestPayloads.cs
index 0fd2251..3c589c3 100644
--- a/src/Lucene.Net.Tests/Index/TestPayloads.cs
+++ b/src/Lucene.Net.Tests/Index/TestPayloads.cs
@@ -11,6 +11,7 @@ using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Text;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestPayloadsOnVectors.cs b/src/Lucene.Net.Tests/Index/TestPayloadsOnVectors.cs
index 74c2ef5..ee33818 100644
--- a/src/Lucene.Net.Tests/Index/TestPayloadsOnVectors.cs
+++ b/src/Lucene.Net.Tests/Index/TestPayloadsOnVectors.cs
@@ -4,6 +4,7 @@ using Lucene.Net.Index.Extensions;
using NUnit.Framework;
using System.Diagnostics;
using System.IO;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Index
{
diff --git a/src/Lucene.Net.Tests/Index/TestPerSegmentDeletes.cs b/src/Lucene.Net.Tests/Index/TestPerSegmentDeletes.cs
index c2f1993..a9ee2f2 100644
--- a/src/Lucene.Net.Tests/Index/TestPerSegmentDeletes.cs
+++ b/src/Lucene.Net.Tests/Index/TestPerSegmentDeletes.cs
@@ -3,6 +3,7 @@ using Lucene.Net.Support;
using NUnit.Framework;
using System;
using System.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestPersistentSnapshotDeletionPolicy.cs b/src/Lucene.Net.Tests/Index/TestPersistentSnapshotDeletionPolicy.cs
index 744fb96..622573c 100644
--- a/src/Lucene.Net.Tests/Index/TestPersistentSnapshotDeletionPolicy.cs
+++ b/src/Lucene.Net.Tests/Index/TestPersistentSnapshotDeletionPolicy.cs
@@ -1,12 +1,12 @@
-using System.Diagnostics;
+using Lucene.Net.Store;
+using Lucene.Net.Util;
+using NUnit.Framework;
+using System;
+using System.IO;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Index
{
- using Lucene.Net.Store;
- using NUnit.Framework;
- using System;
- using System.IO;
- using Util;
using Directory = Lucene.Net.Store.Directory;
/*
diff --git a/src/Lucene.Net.Tests/Index/TestPostingsOffsets.cs b/src/Lucene.Net.Tests/Index/TestPostingsOffsets.cs
index 982eed2..44b2aad 100644
--- a/src/Lucene.Net.Tests/Index/TestPostingsOffsets.cs
+++ b/src/Lucene.Net.Tests/Index/TestPostingsOffsets.cs
@@ -6,6 +6,7 @@ using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Index
{
diff --git a/src/Lucene.Net.Tests/Index/TestPrefixCodedTerms.cs b/src/Lucene.Net.Tests/Index/TestPrefixCodedTerms.cs
index 84a65d0..e3cd8be 100644
--- a/src/Lucene.Net.Tests/Index/TestPrefixCodedTerms.cs
+++ b/src/Lucene.Net.Tests/Index/TestPrefixCodedTerms.cs
@@ -1,6 +1,7 @@
using Lucene.Net.Util;
using NUnit.Framework;
using System.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
using JCG = J2N.Collections.Generic;
namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestRollback.cs b/src/Lucene.Net.Tests/Index/TestRollback.cs
index ce3dcb7..c175173 100644
--- a/src/Lucene.Net.Tests/Index/TestRollback.cs
+++ b/src/Lucene.Net.Tests/Index/TestRollback.cs
@@ -2,6 +2,7 @@ using Lucene.Net.Documents;
using Lucene.Net.Index.Extensions;
using NUnit.Framework;
using System;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Index
{
diff --git a/src/Lucene.Net.Tests/Index/TestRollingUpdates.cs b/src/Lucene.Net.Tests/Index/TestRollingUpdates.cs
index aeaf635..8601428 100644
--- a/src/Lucene.Net.Tests/Index/TestRollingUpdates.cs
+++ b/src/Lucene.Net.Tests/Index/TestRollingUpdates.cs
@@ -6,6 +6,7 @@ using Lucene.Net.Store;
using Lucene.Net.Util;
using NUnit.Framework;
using System;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestSegmentMerger.cs b/src/Lucene.Net.Tests/Index/TestSegmentMerger.cs
index af97f97..dfefb27 100644
--- a/src/Lucene.Net.Tests/Index/TestSegmentMerger.cs
+++ b/src/Lucene.Net.Tests/Index/TestSegmentMerger.cs
@@ -1,6 +1,7 @@
using NUnit.Framework;
using System;
using System.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Index
{
diff --git a/src/Lucene.Net.Tests/Index/TestSegmentReader.cs b/src/Lucene.Net.Tests/Index/TestSegmentReader.cs
index 902f1aa..91044a0 100644
--- a/src/Lucene.Net.Tests/Index/TestSegmentReader.cs
+++ b/src/Lucene.Net.Tests/Index/TestSegmentReader.cs
@@ -1,6 +1,7 @@
using NUnit.Framework;
using System;
using System.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
using JCG = J2N.Collections.Generic;
namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestSegmentTermDocs.cs b/src/Lucene.Net.Tests/Index/TestSegmentTermDocs.cs
index e05f2e3..38a2196 100644
--- a/src/Lucene.Net.Tests/Index/TestSegmentTermDocs.cs
+++ b/src/Lucene.Net.Tests/Index/TestSegmentTermDocs.cs
@@ -1,6 +1,7 @@
using Lucene.Net.Documents;
using Lucene.Net.Index.Extensions;
using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Index
{
diff --git a/src/Lucene.Net.Tests/Index/TestSegmentTermEnum.cs b/src/Lucene.Net.Tests/Index/TestSegmentTermEnum.cs
index 2dead04..4a3178b 100644
--- a/src/Lucene.Net.Tests/Index/TestSegmentTermEnum.cs
+++ b/src/Lucene.Net.Tests/Index/TestSegmentTermEnum.cs
@@ -1,6 +1,7 @@
using Lucene.Net.Documents;
using Lucene.Net.Index.Extensions;
using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Index
{
diff --git a/src/Lucene.Net.Tests/Index/TestSizeBoundedForceMerge.cs b/src/Lucene.Net.Tests/Index/TestSizeBoundedForceMerge.cs
index 6ed82d7..dfc0ee4 100644
--- a/src/Lucene.Net.Tests/Index/TestSizeBoundedForceMerge.cs
+++ b/src/Lucene.Net.Tests/Index/TestSizeBoundedForceMerge.cs
@@ -1,6 +1,7 @@
using Lucene.Net.Documents;
using Lucene.Net.Index.Extensions;
using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Index
{
diff --git a/src/Lucene.Net.Tests/Index/TestSnapshotDeletionPolicy.cs b/src/Lucene.Net.Tests/Index/TestSnapshotDeletionPolicy.cs
index a2490f3..b6aa061 100644
--- a/src/Lucene.Net.Tests/Index/TestSnapshotDeletionPolicy.cs
+++ b/src/Lucene.Net.Tests/Index/TestSnapshotDeletionPolicy.cs
@@ -5,6 +5,7 @@ using NUnit.Framework;
using System;
using System.Collections.Generic;
using System.Threading;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestStressAdvance.cs b/src/Lucene.Net.Tests/Index/TestStressAdvance.cs
index 974978e..9a82a96 100644
--- a/src/Lucene.Net.Tests/Index/TestStressAdvance.cs
+++ b/src/Lucene.Net.Tests/Index/TestStressAdvance.cs
@@ -1,14 +1,15 @@
+using Lucene.Net.Documents;
+using Lucene.Net.Store;
+using Lucene.Net.Util;
+using NUnit.Framework;
using System;
using System.Collections.Generic;
-using Lucene.Net.Documents;
-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.Index
{
-
- using Lucene.Net.Store;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -26,8 +27,7 @@ namespace Lucene.Net.Index
* limitations under the License.
*/
- using Lucene.Net.Util;
- using NUnit.Framework;
+
using DocIdSetIterator = Lucene.Net.Search.DocIdSetIterator;
[TestFixture]
diff --git a/src/Lucene.Net.Tests/Index/TestStressIndexing2.cs b/src/Lucene.Net.Tests/Index/TestStressIndexing2.cs
index 8adb04a..d0ede86 100644
--- a/src/Lucene.Net.Tests/Index/TestStressIndexing2.cs
+++ b/src/Lucene.Net.Tests/Index/TestStressIndexing2.cs
@@ -11,6 +11,7 @@ using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Threading;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestSumDocFreq.cs b/src/Lucene.Net.Tests/Index/TestSumDocFreq.cs
index d92299f..e6c00b3 100644
--- a/src/Lucene.Net.Tests/Index/TestSumDocFreq.cs
+++ b/src/Lucene.Net.Tests/Index/TestSumDocFreq.cs
@@ -1,6 +1,7 @@
using System;
using Lucene.Net.Documents;
using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestTerm.cs b/src/Lucene.Net.Tests/Index/TestTerm.cs
index 308dbba..a9e616c 100644
--- a/src/Lucene.Net.Tests/Index/TestTerm.cs
+++ b/src/Lucene.Net.Tests/Index/TestTerm.cs
@@ -1,7 +1,8 @@
+using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
+
namespace Lucene.Net.Index
{
- using NUnit.Framework;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git a/src/Lucene.Net.Tests/Index/TestTermVectorsReader.cs b/src/Lucene.Net.Tests/Index/TestTermVectorsReader.cs
index df3948f..d085311 100644
--- a/src/Lucene.Net.Tests/Index/TestTermVectorsReader.cs
+++ b/src/Lucene.Net.Tests/Index/TestTermVectorsReader.cs
@@ -5,6 +5,7 @@ using Lucene.Net.Index.Extensions;
using NUnit.Framework;
using System;
using System.IO;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Index
{
diff --git a/src/Lucene.Net.Tests/Index/TestTermVectorsWriter.cs b/src/Lucene.Net.Tests/Index/TestTermVectorsWriter.cs
index 8599eb9..2f13df2 100644
--- a/src/Lucene.Net.Tests/Index/TestTermVectorsWriter.cs
+++ b/src/Lucene.Net.Tests/Index/TestTermVectorsWriter.cs
@@ -2,6 +2,7 @@ using Lucene.Net.Documents;
using Lucene.Net.Index.Extensions;
using NUnit.Framework;
using System.IO;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Index
{
diff --git a/src/Lucene.Net.Tests/Index/TestTermsEnum.cs b/src/Lucene.Net.Tests/Index/TestTermsEnum.cs
index 47f9a6f..32e48e0 100644
--- a/src/Lucene.Net.Tests/Index/TestTermsEnum.cs
+++ b/src/Lucene.Net.Tests/Index/TestTermsEnum.cs
@@ -7,6 +7,7 @@ using System;
using System.Collections.Generic;
using System.Diagnostics;
using JCG = J2N.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestTermsEnum2.cs b/src/Lucene.Net.Tests/Index/TestTermsEnum2.cs
index 7609376..3b8c431 100644
--- a/src/Lucene.Net.Tests/Index/TestTermsEnum2.cs
+++ b/src/Lucene.Net.Tests/Index/TestTermsEnum2.cs
@@ -1,11 +1,11 @@
using J2N.Collections.Generic.Extensions;
using Lucene.Net.Documents;
using Lucene.Net.Index.Extensions;
-using Lucene.Net.Support;
using Lucene.Net.Util.Automaton;
using NUnit.Framework;
using System;
using System.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
using JCG = J2N.Collections.Generic;
namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestThreadedForceMerge.cs b/src/Lucene.Net.Tests/Index/TestThreadedForceMerge.cs
index 0c7fead..b13b792 100644
--- a/src/Lucene.Net.Tests/Index/TestThreadedForceMerge.cs
+++ b/src/Lucene.Net.Tests/Index/TestThreadedForceMerge.cs
@@ -4,6 +4,7 @@ using Lucene.Net.Index.Extensions;
using NUnit.Framework;
using System;
using System.Threading;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestTieredMergePolicy.cs b/src/Lucene.Net.Tests/Index/TestTieredMergePolicy.cs
index 1767a59..eeaa9f2 100644
--- a/src/Lucene.Net.Tests/Index/TestTieredMergePolicy.cs
+++ b/src/Lucene.Net.Tests/Index/TestTieredMergePolicy.cs
@@ -4,6 +4,7 @@ using Lucene.Net.Index.Extensions;
using Lucene.Net.Store;
using NUnit.Framework;
using System;
+using Assert = Lucene.Net.TestFramework.Assert;
using Console = Lucene.Net.Util.SystemConsole;
namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestTransactionRollback.cs b/src/Lucene.Net.Tests/Index/TestTransactionRollback.cs
index e9b3f65..c776dcf 100644
--- a/src/Lucene.Net.Tests/Index/TestTransactionRollback.cs
+++ b/src/Lucene.Net.Tests/Index/TestTransactionRollback.cs
@@ -1,20 +1,20 @@
using Lucene.Net.Documents;
using Lucene.Net.Index.Extensions;
+using Lucene.Net.Support;
+using NUnit.Framework;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Globalization;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Index
{
- using Lucene.Net.Support;
- using NUnit.Framework;
- using IBits = Lucene.Net.Util.IBits;
using Directory = Lucene.Net.Store.Directory;
using Document = Documents.Document;
using Field = Field;
+ using IBits = Lucene.Net.Util.IBits;
using LuceneTestCase = Lucene.Net.Util.LuceneTestCase;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git a/src/Lucene.Net.Tests/Index/TestTryDelete.cs b/src/Lucene.Net.Tests/Index/TestTryDelete.cs
index f2b759c..31f0d0d 100644
--- a/src/Lucene.Net.Tests/Index/TestTryDelete.cs
+++ b/src/Lucene.Net.Tests/Index/TestTryDelete.cs
@@ -3,6 +3,7 @@ using Lucene.Net.Documents;
using Lucene.Net.Index.Extensions;
using Lucene.Net.Search;
using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Index
{
[lucenenet] 22/26:
Lucene.Net.Tests.Facet.Taxonomy.WriterCache.TestCharBlockArray::TestArray():
Optimized by comparing against string,
since indexing into a StringBuilder is painfully slow in .NET
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 941b62b9bf4626ce9ebe9c6f1ef204c8ae439de3
Author: Shad Storhaug <sh...@shadstorhaug.com>
AuthorDate: Wed Jun 24 20:01:49 2020 +0700
Lucene.Net.Tests.Facet.Taxonomy.WriterCache.TestCharBlockArray::TestArray(): Optimized by comparing against string, since indexing into a StringBuilder is painfully slow in .NET
---
.../Taxonomy/WriterCache/TestCharBlockArray.cs | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/WriterCache/TestCharBlockArray.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/WriterCache/TestCharBlockArray.cs
index b291ff7..511464f 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/WriterCache/TestCharBlockArray.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/WriterCache/TestCharBlockArray.cs
@@ -26,7 +26,6 @@ namespace Lucene.Net.Facet.Taxonomy.WriterCache
[TestFixture]
public class TestCharBlockArray : FacetTestCase
{
-
[Test, LongRunningTest]
public virtual void TestArray()
{
@@ -111,10 +110,13 @@ namespace Lucene.Net.Facet.Taxonomy.WriterCache
private static void AssertEqualsInternal(string msg, StringBuilder expected, CharBlockArray actual)
{
- Assert.AreEqual(expected.Length, actual.Length, msg);
- for (int i = 0; i < expected.Length; i++)
+ // LUCENENET specific - Indexing a string is much faster than StringBuilder (#295)
+ var expected2 = expected.ToString();
+ var expected2Len = expected2.Length;
+ Assert.AreEqual(expected2Len, actual.Length, msg);
+ for (int i = 0; i < expected2Len; i++)
{
- Assert.AreEqual(expected[i], actual[i], msg);
+ Assert.AreEqual(expected2[i], actual[i], msg);
}
}
}
[lucenenet] 19/26: Lucene.Net.Tests.Analysis.Phonetic: Switched to
using the Assert class from the test framework instead of NUnit (#295, #261)
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 5c258354b3e92fc03f804e5402a14a10132d5f0a
Author: Shad Storhaug <sh...@shadstorhaug.com>
AuthorDate: Wed Jun 24 12:07:47 2020 +0700
Lucene.Net.Tests.Analysis.Phonetic: Switched to using the Assert class from the test framework instead of NUnit (#295, #261)
---
.../Language/Bm/BeiderMorseEncoderTest.cs | 1 +
.../Language/Bm/PhoneticEngineRegressionTest.cs | 1 +
src/Lucene.Net.Tests.Analysis.Phonetic/Language/Bm/PhoneticEngineTest.cs | 1 +
src/Lucene.Net.Tests.Analysis.Phonetic/Language/Bm/RuleTest.cs | 1 +
.../Language/DaitchMokotoffSoundexTest.cs | 1 +
src/Lucene.Net.Tests.Analysis.Phonetic/Language/DoubleMetaphone2Test.cs | 1 +
src/Lucene.Net.Tests.Analysis.Phonetic/Language/DoubleMetaphoneTest.cs | 1 +
.../Language/MatchRatingApproachEncoderTest.cs | 1 +
src/Lucene.Net.Tests.Analysis.Phonetic/Language/MetaphoneTest.cs | 1 +
src/Lucene.Net.Tests.Analysis.Phonetic/Language/NysiisTest.cs | 1 +
src/Lucene.Net.Tests.Analysis.Phonetic/Language/RefinedSoundexTest.cs | 1 +
src/Lucene.Net.Tests.Analysis.Phonetic/Language/SoundexTest.cs | 1 +
.../Language/StringEncoderAbstractTest.cs | 1 +
13 files changed, 13 insertions(+)
diff --git a/src/Lucene.Net.Tests.Analysis.Phonetic/Language/Bm/BeiderMorseEncoderTest.cs b/src/Lucene.Net.Tests.Analysis.Phonetic/Language/Bm/BeiderMorseEncoderTest.cs
index 3ae2833..0cae683 100644
--- a/src/Lucene.Net.Tests.Analysis.Phonetic/Language/Bm/BeiderMorseEncoderTest.cs
+++ b/src/Lucene.Net.Tests.Analysis.Phonetic/Language/Bm/BeiderMorseEncoderTest.cs
@@ -3,6 +3,7 @@ using NUnit.Framework;
using System;
using System.Text;
using System.Text.RegularExpressions;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Analysis.Phonetic.Language.Bm
{
diff --git a/src/Lucene.Net.Tests.Analysis.Phonetic/Language/Bm/PhoneticEngineRegressionTest.cs b/src/Lucene.Net.Tests.Analysis.Phonetic/Language/Bm/PhoneticEngineRegressionTest.cs
index 5d3b249..c89bc36 100644
--- a/src/Lucene.Net.Tests.Analysis.Phonetic/Language/Bm/PhoneticEngineRegressionTest.cs
+++ b/src/Lucene.Net.Tests.Analysis.Phonetic/Language/Bm/PhoneticEngineRegressionTest.cs
@@ -3,6 +3,7 @@ using Lucene.Net.Support;
using NUnit.Framework;
using System;
using System.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
using JCG = J2N.Collections.Generic;
namespace Lucene.Net.Analysis.Phonetic.Language.Bm
diff --git a/src/Lucene.Net.Tests.Analysis.Phonetic/Language/Bm/PhoneticEngineTest.cs b/src/Lucene.Net.Tests.Analysis.Phonetic/Language/Bm/PhoneticEngineTest.cs
index 5d15c8f..7017df2 100644
--- a/src/Lucene.Net.Tests.Analysis.Phonetic/Language/Bm/PhoneticEngineTest.cs
+++ b/src/Lucene.Net.Tests.Analysis.Phonetic/Language/Bm/PhoneticEngineTest.cs
@@ -3,6 +3,7 @@ using NUnit.Framework;
using System;
using System.Collections.Generic;
using System.Text.RegularExpressions;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Analysis.Phonetic.Language.Bm
{
diff --git a/src/Lucene.Net.Tests.Analysis.Phonetic/Language/Bm/RuleTest.cs b/src/Lucene.Net.Tests.Analysis.Phonetic/Language/Bm/RuleTest.cs
index fd2e8a2..c2223d6 100644
--- a/src/Lucene.Net.Tests.Analysis.Phonetic/Language/Bm/RuleTest.cs
+++ b/src/Lucene.Net.Tests.Analysis.Phonetic/Language/Bm/RuleTest.cs
@@ -1,5 +1,6 @@
using NUnit.Framework;
using System;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Analysis.Phonetic.Language.Bm
{
diff --git a/src/Lucene.Net.Tests.Analysis.Phonetic/Language/DaitchMokotoffSoundexTest.cs b/src/Lucene.Net.Tests.Analysis.Phonetic/Language/DaitchMokotoffSoundexTest.cs
index 84bb5d3..c4a1d87 100644
--- a/src/Lucene.Net.Tests.Analysis.Phonetic/Language/DaitchMokotoffSoundexTest.cs
+++ b/src/Lucene.Net.Tests.Analysis.Phonetic/Language/DaitchMokotoffSoundexTest.cs
@@ -1,6 +1,7 @@
// commons-codec version compatibility level: 1.10
using NUnit.Framework;
using System;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Analysis.Phonetic.Language
{
diff --git a/src/Lucene.Net.Tests.Analysis.Phonetic/Language/DoubleMetaphone2Test.cs b/src/Lucene.Net.Tests.Analysis.Phonetic/Language/DoubleMetaphone2Test.cs
index da00973..5cdc9f8 100644
--- a/src/Lucene.Net.Tests.Analysis.Phonetic/Language/DoubleMetaphone2Test.cs
+++ b/src/Lucene.Net.Tests.Analysis.Phonetic/Language/DoubleMetaphone2Test.cs
@@ -1,4 +1,5 @@
using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Analysis.Phonetic.Language
{
diff --git a/src/Lucene.Net.Tests.Analysis.Phonetic/Language/DoubleMetaphoneTest.cs b/src/Lucene.Net.Tests.Analysis.Phonetic/Language/DoubleMetaphoneTest.cs
index 8a4604d..5cbcaf3 100644
--- a/src/Lucene.Net.Tests.Analysis.Phonetic/Language/DoubleMetaphoneTest.cs
+++ b/src/Lucene.Net.Tests.Analysis.Phonetic/Language/DoubleMetaphoneTest.cs
@@ -1,6 +1,7 @@
using NUnit.Framework;
using System;
using System.Text;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Analysis.Phonetic.Language
{
diff --git a/src/Lucene.Net.Tests.Analysis.Phonetic/Language/MatchRatingApproachEncoderTest.cs b/src/Lucene.Net.Tests.Analysis.Phonetic/Language/MatchRatingApproachEncoderTest.cs
index 1c5cb1a..9b80dfe 100644
--- a/src/Lucene.Net.Tests.Analysis.Phonetic/Language/MatchRatingApproachEncoderTest.cs
+++ b/src/Lucene.Net.Tests.Analysis.Phonetic/Language/MatchRatingApproachEncoderTest.cs
@@ -1,4 +1,5 @@
using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Analysis.Phonetic.Language
{
diff --git a/src/Lucene.Net.Tests.Analysis.Phonetic/Language/MetaphoneTest.cs b/src/Lucene.Net.Tests.Analysis.Phonetic/Language/MetaphoneTest.cs
index 18a9e59..eb4b4ae 100644
--- a/src/Lucene.Net.Tests.Analysis.Phonetic/Language/MetaphoneTest.cs
+++ b/src/Lucene.Net.Tests.Analysis.Phonetic/Language/MetaphoneTest.cs
@@ -1,5 +1,6 @@
using NUnit.Framework;
using System;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Analysis.Phonetic.Language
{
diff --git a/src/Lucene.Net.Tests.Analysis.Phonetic/Language/NysiisTest.cs b/src/Lucene.Net.Tests.Analysis.Phonetic/Language/NysiisTest.cs
index d1c04d1..e4297e4 100644
--- a/src/Lucene.Net.Tests.Analysis.Phonetic/Language/NysiisTest.cs
+++ b/src/Lucene.Net.Tests.Analysis.Phonetic/Language/NysiisTest.cs
@@ -1,5 +1,6 @@
using NUnit.Framework;
using System;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Analysis.Phonetic.Language
{
diff --git a/src/Lucene.Net.Tests.Analysis.Phonetic/Language/RefinedSoundexTest.cs b/src/Lucene.Net.Tests.Analysis.Phonetic/Language/RefinedSoundexTest.cs
index eca1827..9ef2433 100644
--- a/src/Lucene.Net.Tests.Analysis.Phonetic/Language/RefinedSoundexTest.cs
+++ b/src/Lucene.Net.Tests.Analysis.Phonetic/Language/RefinedSoundexTest.cs
@@ -1,4 +1,5 @@
using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Analysis.Phonetic.Language
{
diff --git a/src/Lucene.Net.Tests.Analysis.Phonetic/Language/SoundexTest.cs b/src/Lucene.Net.Tests.Analysis.Phonetic/Language/SoundexTest.cs
index 5cc01ec..d05f40e 100644
--- a/src/Lucene.Net.Tests.Analysis.Phonetic/Language/SoundexTest.cs
+++ b/src/Lucene.Net.Tests.Analysis.Phonetic/Language/SoundexTest.cs
@@ -1,6 +1,7 @@
// commons-codec version compatibility level: 1.10
using NUnit.Framework;
using System;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Analysis.Phonetic.Language
{
diff --git a/src/Lucene.Net.Tests.Analysis.Phonetic/Language/StringEncoderAbstractTest.cs b/src/Lucene.Net.Tests.Analysis.Phonetic/Language/StringEncoderAbstractTest.cs
index 8fd8b7f..7e52682 100644
--- a/src/Lucene.Net.Tests.Analysis.Phonetic/Language/StringEncoderAbstractTest.cs
+++ b/src/Lucene.Net.Tests.Analysis.Phonetic/Language/StringEncoderAbstractTest.cs
@@ -2,6 +2,7 @@
using System;
using System.Globalization;
using System.Threading;
+using Assert = Lucene.Net.TestFramework.Assert;
namespace Lucene.Net.Analysis.Phonetic.Language
{