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 d10bc9055d26bc1c0c977b81aeb1b7f7d71233c6 Author: Shad Storhaug <[email protected]> AuthorDate: Mon Apr 19 23:11:15 2021 +0700 Lucene.Net.TestFramework: Removed random generation code from TestUtil in favor of using RandomizedTesting.Generators --- .../Analysis/BaseTokenStreamTestCase.cs | 1 + .../Codecs/Compressing/CompressingCodec.cs | 4 +- .../Codecs/MockRandom/MockRandomPostingsFormat.cs | 3 +- .../BaseCompressingDocValuesFormatTestCase.cs | 4 +- .../Index/BaseDocValuesFormatTestCase.cs | 3 +- .../Index/BaseMergePolicyTestCase.cs | 3 +- .../Index/BasePostingsFormatTestCase.cs | 3 +- .../Index/BaseStoredFieldsFormatTestCase.cs | 5 +- .../Index/BaseTermVectorsFormatTestCase.cs | 4 +- .../Index/RandomIndexWriter.cs | 3 +- .../Index/ThreadedIndexingAndSearchingTestCase.cs | 3 +- .../Lucene.Net.TestFramework.csproj | 3 +- .../Search/AssertingBulkScorer.cs | 3 +- .../Search/AssertingIndexSearcher.cs | 3 +- .../Search/AssertingWeight.cs | 3 +- .../Search/RandomSimilarityProvider.cs | 3 +- .../Search/SearchEquivalenceTestBase.cs | 3 +- .../Store/BaseDirectoryTestCase.cs | 2 +- .../Store/MockDirectoryWrapper.cs | 3 +- .../Support/JavaCompatibility/RandomHelpers.cs | 3 +- .../Support/RandomExtensions.cs | 228 +-------- .../Support/Randomized/Generators/RandomBytes.cs | 55 --- .../Support/Randomized/Generators/RandomInts.cs | 49 -- .../Support/Randomized/Generators/RandomPicks.cs | 41 -- .../Util/Automaton/AutomatonTestUtil.cs | 3 +- .../Util/BaseDocIdSetTestCase.cs | 3 +- src/Lucene.Net.TestFramework/Util/Fst/FSTTester.cs | 1 + src/Lucene.Net.TestFramework/Util/LineFileDocs.cs | 3 +- .../Util/LuceneTestCase.cs | 2 +- .../Util/TestRuleSetupAndRestoreClassEnv.cs | 3 +- src/Lucene.Net.TestFramework/Util/TestUtil.cs | 531 +-------------------- .../Analysis/Core/TestDuelingAnalyzers.cs | 3 +- .../Miscellaneous/TestASCIIFoldingFilter.cs | 3 +- .../Analysis/Synonym/TestSynonymMapFilter.cs | 3 +- .../Analysis/Util/TestRollingCharBuffer.cs | 3 +- .../ClassificationTestBase.cs | 3 +- .../TestExpressionSorts.cs | 3 +- src/Lucene.Net.Tests.Facet/FacetTestCase.cs | 1 + .../Range/TestRangeFacetCounts.cs | 1 + src/Lucene.Net.Tests.Facet/SlowRAMDirectory.cs | 1 + .../SortedSet/TestSortedSetDocValuesFacets.cs | 1 + .../Taxonomy/Directory/TestAddTaxonomy.cs | 1 + .../Directory/TestDirectoryTaxonomyReader.cs | 1 + .../Taxonomy/TestTaxonomyFacetCounts.cs | 1 + .../Taxonomy/TestTaxonomyFacetCounts2.cs | 1 + .../Taxonomy/TestTaxonomyFacetSumValueSource.cs | 1 + src/Lucene.Net.Tests.Facet/TestDrillDownQuery.cs | 1 + src/Lucene.Net.Tests.Facet/TestDrillSideways.cs | 1 + .../TestRandomSamplingFacetsCollector.cs | 1 + src/Lucene.Net.Tests.Join/TestBlockJoin.cs | 1 + src/Lucene.Net.Tests.Join/TestBlockJoinSorting.cs | 1 + .../TestBlockJoinValidation.cs | 1 + src/Lucene.Net.Tests.Join/TestJoinUtil.cs | 1 + .../Index/Sorter/TestEarlyTermination.cs | 2 +- .../Index/Sorter/TestSortingMergePolicy.cs | 2 +- .../CommonTermsQueryTest.cs | 1 + .../Function/TestDocValuesFieldSources.cs | 3 +- src/Lucene.Net.Tests.Queries/TermsFilterTest.cs | 1 + .../DistanceStrategyTest.cs | 4 +- src/Lucene.Net.Tests.Spatial/PortedSolr3Test.cs | 4 +- .../Analysis/TestLookaheadTokenFilter.cs | 1 + .../Analysis/TestMockAnalyzer.cs | 1 + .../Analysis/TestLookaheadTokenFilter.cs | 3 +- src/Lucene.Net.Tests/Analysis/TestMockAnalyzer.cs | 3 +- .../Compressing/AbstractTestCompressionMode.cs | 5 +- .../Compressing/AbstractTestLZ4CompressionMode.cs | 2 +- .../TestCompressingStoredFieldsFormat.cs | 4 +- .../Codecs/Lucene40/TestLucene40PostingsReader.cs | 3 +- .../Codecs/Lucene40/TestReuseDocsEnum.cs | 3 +- .../Codecs/Lucene41/TestBlockPostingsFormat3.cs | 3 +- .../Codecs/Lucene41/TestForUtil.cs | 5 +- .../Codecs/PerField/TestPerFieldPostingsFormat2.cs | 3 +- src/Lucene.Net.Tests/Index/Test4GBStoredFields.cs | 2 +- .../Index/TestBackwardsCompatibility.cs | 1 + .../Index/TestBackwardsCompatibility3x.cs | 1 + src/Lucene.Net.Tests/Index/TestBagOfPositions.cs | 3 +- .../Index/TestBinaryDocValuesUpdates.cs | 2 +- src/Lucene.Net.Tests/Index/TestByteSlices.cs | 3 +- .../Index/TestConcurrentMergeScheduler.cs | 1 + .../Index/TestConsistentFieldNumbers.cs | 3 +- .../Index/TestDocValuesWithThreads.cs | 3 +- src/Lucene.Net.Tests/Index/TestDocsAndPositions.cs | 3 +- .../Index/TestDocumentsWriterStallControl.cs | 3 +- .../Index/TestExceedMaxTermLength.cs | 3 +- src/Lucene.Net.Tests/Index/TestIndexReaderClose.cs | 3 +- src/Lucene.Net.Tests/Index/TestIndexWriter.cs | 1 + .../Index/TestIndexWriterCommit.cs | 3 +- .../Index/TestIndexWriterDelete.cs | 1 + .../Index/TestIndexWriterExceptions.cs | 1 + .../Index/TestIndexWriterNRTIsCurrent.cs | 3 +- .../Index/TestIndexWriterOutOfFileDescriptors.cs | 3 +- .../Index/TestIndexWriterReader.cs | 1 + .../Index/TestIndexWriterUnicode.cs | 3 +- .../Index/TestIndexWriterWithThreads.cs | 1 + src/Lucene.Net.Tests/Index/TestIntBlockPool.cs | 3 +- src/Lucene.Net.Tests/Index/TestLongPostings.cs | 3 +- src/Lucene.Net.Tests/Index/TestMixedCodecs.cs | 3 +- .../Index/TestMixedDocValuesUpdates.cs | 4 +- src/Lucene.Net.Tests/Index/TestMultiDocValues.cs | 3 +- src/Lucene.Net.Tests/Index/TestMultiFields.cs | 3 +- src/Lucene.Net.Tests/Index/TestNRTThreads.cs | 3 +- src/Lucene.Net.Tests/Index/TestNoMergeScheduler.cs | 4 +- .../Index/TestNumericDocValuesUpdates.cs | 4 +- src/Lucene.Net.Tests/Index/TestOmitNorms.cs | 3 +- src/Lucene.Net.Tests/Index/TestOmitPositions.cs | 3 +- .../Index/TestParallelAtomicReader.cs | 3 +- .../Index/TestParallelCompositeReader.cs | 3 +- .../Index/TestPayloadsOnVectors.cs | 3 +- src/Lucene.Net.Tests/Index/TestPostingsOffsets.cs | 3 +- src/Lucene.Net.Tests/Index/TestRollingUpdates.cs | 3 +- src/Lucene.Net.Tests/Index/TestStressIndexing2.cs | 1 + src/Lucene.Net.Tests/Index/TestStressNRT.cs | 3 +- src/Lucene.Net.Tests/Index/TestTermsEnum.cs | 3 +- src/Lucene.Net.Tests/Index/TestTermsEnum2.cs | 3 +- src/Lucene.Net.Tests/Index/TestTryDelete.cs | 3 +- .../Index/TestTwoPhaseCommitTool.cs | 3 +- src/Lucene.Net.Tests/Search/TestBoolean2.cs | 1 + .../Search/TestBooleanMinShouldMatch.cs | 3 +- .../Search/TestControlledRealTimeReopenThread.cs | 1 + .../Search/TestDocTermOrdsRangeFilter.cs | 3 +- .../Search/TestDocTermOrdsRewriteMethod.cs | 1 + .../Search/TestEarlyTermination.cs | 3 +- src/Lucene.Net.Tests/Search/TestFieldCache.cs | 3 +- .../Search/TestFieldValueFilter.cs | 3 +- src/Lucene.Net.Tests/Search/TestFilteredQuery.cs | 3 +- src/Lucene.Net.Tests/Search/TestQueryRescorer.cs | 3 +- src/Lucene.Net.Tests/Search/TestRegexpRandom2.cs | 3 +- src/Lucene.Net.Tests/Search/TestSearchAfter.cs | 3 +- .../Search/TestSearchWithThreads.cs | 3 +- src/Lucene.Net.Tests/Search/TestSearcherManager.cs | 1 + src/Lucene.Net.Tests/Search/TestShardSearching.cs | 3 +- src/Lucene.Net.Tests/Search/TestSort.cs | 3 +- src/Lucene.Net.Tests/Search/TestSortRandom.cs | 3 +- src/Lucene.Net.Tests/Search/TestSortRescorer.cs | 3 +- src/Lucene.Net.Tests/Search/TestTopDocsMerge.cs | 3 +- src/Lucene.Net.Tests/Store/TestCopyBytes.cs | 3 +- src/Lucene.Net.Tests/Store/TestDirectory.cs | 1 + .../Util/Automaton/TestBasicOperations.cs | 4 +- .../Util/Automaton/TestUTF32ToUTF8.cs | 3 +- src/Lucene.Net.Tests/Util/Fst/TestBytesStore.cs | 3 +- src/Lucene.Net.Tests/Util/Fst/TestFSTs.cs | 3 +- src/Lucene.Net.Tests/Util/Packed/TestPackedInts.cs | 3 +- src/Lucene.Net.Tests/Util/Test2BPagedBytes.cs | 3 +- src/Lucene.Net.Tests/Util/TestArrayUtil.cs | 3 +- src/Lucene.Net.Tests/Util/TestByteBlockPool.cs | 3 +- src/Lucene.Net.Tests/Util/TestBytesRefArray.cs | 1 + src/Lucene.Net.Tests/Util/TestBytesRefHash.cs | 3 +- src/Lucene.Net.Tests/Util/TestFixedBitSet.cs | 3 +- src/Lucene.Net.Tests/Util/TestLongBitSet.cs | 3 +- src/Lucene.Net.Tests/Util/TestMathUtil.cs | 4 +- src/Lucene.Net.Tests/Util/TestNumericUtils.cs | 1 + src/Lucene.Net.Tests/Util/TestOpenBitSet.cs | 3 +- src/Lucene.Net.Tests/Util/TestPagedBytes.cs | 1 + src/Lucene.Net.Tests/Util/TestSentinelIntSet.cs | 3 +- src/Lucene.Net.Tests/Util/TestSloppyMath.cs | 3 +- src/Lucene.Net.Tests/Util/TestWAH8DocIdSet.cs | 3 +- 156 files changed, 281 insertions(+), 1008 deletions(-) diff --git a/src/Lucene.Net.TestFramework/Analysis/BaseTokenStreamTestCase.cs b/src/Lucene.Net.TestFramework/Analysis/BaseTokenStreamTestCase.cs index 1ba5485..0b070ff 100644 --- a/src/Lucene.Net.TestFramework/Analysis/BaseTokenStreamTestCase.cs +++ b/src/Lucene.Net.TestFramework/Analysis/BaseTokenStreamTestCase.cs @@ -5,6 +5,7 @@ using Lucene.Net.Documents; using Lucene.Net.Index; using Lucene.Net.Support; using Lucene.Net.Util; +using RandomizedTesting.Generators; using System; using System.Collections.Generic; using System.Globalization; diff --git a/src/Lucene.Net.TestFramework/Codecs/Compressing/CompressingCodec.cs b/src/Lucene.Net.TestFramework/Codecs/Compressing/CompressingCodec.cs index 48ae592..99ead48 100644 --- a/src/Lucene.Net.TestFramework/Codecs/Compressing/CompressingCodec.cs +++ b/src/Lucene.Net.TestFramework/Codecs/Compressing/CompressingCodec.cs @@ -1,7 +1,7 @@ -using Lucene.Net.Codecs.Compressing.Dummy; +using Lucene.Net.Codecs.Compressing.Dummy; using Lucene.Net.Codecs.Lucene46; -using Lucene.Net.Randomized.Generators; using System; +using RandomInts = RandomizedTesting.Generators.RandomNumbers; namespace Lucene.Net.Codecs.Compressing { diff --git a/src/Lucene.Net.TestFramework/Codecs/MockRandom/MockRandomPostingsFormat.cs b/src/Lucene.Net.TestFramework/Codecs/MockRandom/MockRandomPostingsFormat.cs index c43ebc0..6ca4445 100644 --- a/src/Lucene.Net.TestFramework/Codecs/MockRandom/MockRandomPostingsFormat.cs +++ b/src/Lucene.Net.TestFramework/Codecs/MockRandom/MockRandomPostingsFormat.cs @@ -1,4 +1,4 @@ -using Lucene.Net.Codecs.BlockTerms; +using Lucene.Net.Codecs.BlockTerms; using Lucene.Net.Codecs.Lucene41; using Lucene.Net.Codecs.Memory; using Lucene.Net.Codecs.MockIntBlock; @@ -9,6 +9,7 @@ using Lucene.Net.Diagnostics; using Lucene.Net.Index; using Lucene.Net.Store; using Lucene.Net.Util; +using RandomizedTesting.Generators; using System; using System.Collections.Generic; using Console = Lucene.Net.Util.SystemConsole; diff --git a/src/Lucene.Net.TestFramework/Index/BaseCompressingDocValuesFormatTestCase.cs b/src/Lucene.Net.TestFramework/Index/BaseCompressingDocValuesFormatTestCase.cs index e5fac6c..40e7ffd 100644 --- a/src/Lucene.Net.TestFramework/Index/BaseCompressingDocValuesFormatTestCase.cs +++ b/src/Lucene.Net.TestFramework/Index/BaseCompressingDocValuesFormatTestCase.cs @@ -1,10 +1,10 @@ -using Lucene.Net.Analysis; +using Lucene.Net.Analysis; using Lucene.Net.Documents; -using Lucene.Net.Randomized.Generators; using Lucene.Net.Store; using Lucene.Net.Util; using Lucene.Net.Util.Packed; using System.Collections.Generic; +using RandomizedTesting.Generators; #if TESTFRAMEWORK_MSTEST using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; diff --git a/src/Lucene.Net.TestFramework/Index/BaseDocValuesFormatTestCase.cs b/src/Lucene.Net.TestFramework/Index/BaseDocValuesFormatTestCase.cs index 8aaccc9..383edce 100644 --- a/src/Lucene.Net.TestFramework/Index/BaseDocValuesFormatTestCase.cs +++ b/src/Lucene.Net.TestFramework/Index/BaseDocValuesFormatTestCase.cs @@ -1,4 +1,4 @@ -using J2N.Threading; +using J2N.Threading; using Lucene.Net.Analysis; using Lucene.Net.Codecs.Lucene42; using Lucene.Net.Diagnostics; @@ -16,6 +16,7 @@ using JCG = J2N.Collections.Generic; using Assert = Lucene.Net.TestFramework.Assert; using static Lucene.Net.Index.TermsEnum; using J2N.Collections.Generic.Extensions; +using RandomizedTesting.Generators; #if TESTFRAMEWORK_MSTEST using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; diff --git a/src/Lucene.Net.TestFramework/Index/BaseMergePolicyTestCase.cs b/src/Lucene.Net.TestFramework/Index/BaseMergePolicyTestCase.cs index b24e256..5ca3422 100644 --- a/src/Lucene.Net.TestFramework/Index/BaseMergePolicyTestCase.cs +++ b/src/Lucene.Net.TestFramework/Index/BaseMergePolicyTestCase.cs @@ -1,9 +1,10 @@ -using J2N.Threading.Atomic; +using J2N.Threading.Atomic; using Lucene.Net.Analysis; using Lucene.Net.Documents; using Lucene.Net.Index.Extensions; using Lucene.Net.Store; using Lucene.Net.Util; +using RandomizedTesting.Generators; using System; #if TESTFRAMEWORK_MSTEST diff --git a/src/Lucene.Net.TestFramework/Index/BasePostingsFormatTestCase.cs b/src/Lucene.Net.TestFramework/Index/BasePostingsFormatTestCase.cs index ad48543..5626525 100644 --- a/src/Lucene.Net.TestFramework/Index/BasePostingsFormatTestCase.cs +++ b/src/Lucene.Net.TestFramework/Index/BasePostingsFormatTestCase.cs @@ -1,4 +1,4 @@ -using J2N.Threading; +using J2N.Threading; using Lucene.Net.Codecs; using Lucene.Net.Diagnostics; using Lucene.Net.Documents; @@ -12,6 +12,7 @@ using Console = Lucene.Net.Util.SystemConsole; using Assert = Lucene.Net.TestFramework.Assert; using Directory = Lucene.Net.Store.Directory; using J2N.Collections.Generic.Extensions; +using RandomizedTesting.Generators; #if TESTFRAMEWORK_MSTEST using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; diff --git a/src/Lucene.Net.TestFramework/Index/BaseStoredFieldsFormatTestCase.cs b/src/Lucene.Net.TestFramework/Index/BaseStoredFieldsFormatTestCase.cs index 2b779e8..1e5418c 100644 --- a/src/Lucene.Net.TestFramework/Index/BaseStoredFieldsFormatTestCase.cs +++ b/src/Lucene.Net.TestFramework/Index/BaseStoredFieldsFormatTestCase.cs @@ -1,4 +1,4 @@ -using J2N.Collections.Generic.Extensions; +using J2N.Collections.Generic.Extensions; using J2N.Text; using J2N.Threading; using J2N.Threading.Atomic; @@ -9,11 +9,11 @@ using Lucene.Net.Codecs.SimpleText; using Lucene.Net.Documents; using Lucene.Net.Documents.Extensions; using Lucene.Net.Index.Extensions; -using Lucene.Net.Randomized.Generators; using Lucene.Net.Search; using Lucene.Net.Store; using Lucene.Net.Support; using Lucene.Net.Util; +using RandomizedTesting.Generators; using System; using System.Collections.Generic; using System.Globalization; @@ -21,6 +21,7 @@ using System.Text; using JCG = J2N.Collections.Generic; using Console = Lucene.Net.Util.SystemConsole; using Assert = Lucene.Net.TestFramework.Assert; +using RandomInts = RandomizedTesting.Generators.RandomNumbers; #if TESTFRAMEWORK_MSTEST using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; diff --git a/src/Lucene.Net.TestFramework/Index/BaseTermVectorsFormatTestCase.cs b/src/Lucene.Net.TestFramework/Index/BaseTermVectorsFormatTestCase.cs index f923bf7..f6451e8 100644 --- a/src/Lucene.Net.TestFramework/Index/BaseTermVectorsFormatTestCase.cs +++ b/src/Lucene.Net.TestFramework/Index/BaseTermVectorsFormatTestCase.cs @@ -1,10 +1,9 @@ -using J2N.Threading; +using J2N.Threading; using J2N.Threading.Atomic; using Lucene.Net.Analysis; using Lucene.Net.Analysis.TokenAttributes; using Lucene.Net.Codecs; using Lucene.Net.Documents; -using Lucene.Net.Randomized.Generators; using Lucene.Net.Search; using Lucene.Net.Store; using Lucene.Net.Support; @@ -19,6 +18,7 @@ using Assert = Lucene.Net.TestFramework.Assert; using AssertionError = Lucene.Net.Diagnostics.AssertionException; using Attribute = Lucene.Net.Util.Attribute; using System.Diagnostics.CodeAnalysis; +using RandomizedTesting.Generators; #if TESTFRAMEWORK_MSTEST using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; diff --git a/src/Lucene.Net.TestFramework/Index/RandomIndexWriter.cs b/src/Lucene.Net.TestFramework/Index/RandomIndexWriter.cs index fc3069e..896db4e 100644 --- a/src/Lucene.Net.TestFramework/Index/RandomIndexWriter.cs +++ b/src/Lucene.Net.TestFramework/Index/RandomIndexWriter.cs @@ -1,9 +1,10 @@ -using Lucene.Net.Analysis; +using Lucene.Net.Analysis; using Lucene.Net.Codecs; using Lucene.Net.Diagnostics; using Lucene.Net.Search; using Lucene.Net.Store; using Lucene.Net.Util; +using RandomizedTesting.Generators; using System; using System.Collections; using System.Collections.Generic; diff --git a/src/Lucene.Net.TestFramework/Index/ThreadedIndexingAndSearchingTestCase.cs b/src/Lucene.Net.TestFramework/Index/ThreadedIndexingAndSearchingTestCase.cs index be5d616..193c129 100644 --- a/src/Lucene.Net.TestFramework/Index/ThreadedIndexingAndSearchingTestCase.cs +++ b/src/Lucene.Net.TestFramework/Index/ThreadedIndexingAndSearchingTestCase.cs @@ -1,4 +1,4 @@ -using J2N.Threading; +using J2N.Threading; using J2N.Threading.Atomic; using Lucene.Net.Analysis; using Lucene.Net.Diagnostics; @@ -8,6 +8,7 @@ using Lucene.Net.Search; using Lucene.Net.Store; using Lucene.Net.Support; using Lucene.Net.Util; +using RandomizedTesting.Generators; using System; using System.Collections.Concurrent; using System.Collections.Generic; diff --git a/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj b/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj index eecdfac..e18189a 100644 --- a/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj +++ b/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <!-- Licensed to the Apache Software Foundation (ASF) under one @@ -58,6 +58,7 @@ <ItemGroup> <PackageReference Include="J2N" Version="$(J2NPackageVersion)" /> <PackageReference Include="NUnit" Version="$(NUnitPackageVersion)" /> + <PackageReference Include="RandomizedTesting.Generators" Version="$(RandomizedTestingGeneratorsPackageVersion)" /> </ItemGroup> <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'"> diff --git a/src/Lucene.Net.TestFramework/Search/AssertingBulkScorer.cs b/src/Lucene.Net.TestFramework/Search/AssertingBulkScorer.cs index 55dece8..8f8b838 100644 --- a/src/Lucene.Net.TestFramework/Search/AssertingBulkScorer.cs +++ b/src/Lucene.Net.TestFramework/Search/AssertingBulkScorer.cs @@ -1,6 +1,7 @@ -using Lucene.Net.Diagnostics; +using Lucene.Net.Diagnostics; using Lucene.Net.Index; using Lucene.Net.Util; +using RandomizedTesting.Generators; using System; namespace Lucene.Net.Search diff --git a/src/Lucene.Net.TestFramework/Search/AssertingIndexSearcher.cs b/src/Lucene.Net.TestFramework/Search/AssertingIndexSearcher.cs index ef44f4a..00d2a7b 100644 --- a/src/Lucene.Net.TestFramework/Search/AssertingIndexSearcher.cs +++ b/src/Lucene.Net.TestFramework/Search/AssertingIndexSearcher.cs @@ -1,5 +1,6 @@ -using Lucene.Net.Index; +using Lucene.Net.Index; using Lucene.Net.Util; +using RandomizedTesting.Generators; using System; using System.Collections.Generic; using System.Threading.Tasks; diff --git a/src/Lucene.Net.TestFramework/Search/AssertingWeight.cs b/src/Lucene.Net.TestFramework/Search/AssertingWeight.cs index 2d31dbd..98422b2 100644 --- a/src/Lucene.Net.TestFramework/Search/AssertingWeight.cs +++ b/src/Lucene.Net.TestFramework/Search/AssertingWeight.cs @@ -1,5 +1,6 @@ -using Lucene.Net.Index; +using Lucene.Net.Index; using Lucene.Net.Util; +using RandomizedTesting.Generators; using System; namespace Lucene.Net.Search diff --git a/src/Lucene.Net.TestFramework/Search/RandomSimilarityProvider.cs b/src/Lucene.Net.TestFramework/Search/RandomSimilarityProvider.cs index e7f0b9e..1d19759 100644 --- a/src/Lucene.Net.TestFramework/Search/RandomSimilarityProvider.cs +++ b/src/Lucene.Net.TestFramework/Search/RandomSimilarityProvider.cs @@ -1,6 +1,7 @@ -using J2N.Collections.Generic.Extensions; +using J2N.Collections.Generic.Extensions; using Lucene.Net.Diagnostics; using Lucene.Net.Search.Similarities; +using RandomizedTesting.Generators; using System; using System.Collections.Generic; using System.Text; diff --git a/src/Lucene.Net.TestFramework/Search/SearchEquivalenceTestBase.cs b/src/Lucene.Net.TestFramework/Search/SearchEquivalenceTestBase.cs index 63b09e9..f2fb843 100644 --- a/src/Lucene.Net.TestFramework/Search/SearchEquivalenceTestBase.cs +++ b/src/Lucene.Net.TestFramework/Search/SearchEquivalenceTestBase.cs @@ -1,9 +1,10 @@ -using Lucene.Net.Analysis; +using Lucene.Net.Analysis; using Lucene.Net.Documents; using Lucene.Net.Index; using Lucene.Net.Store; using Lucene.Net.Util; using Lucene.Net.Util.Automaton; +using RandomizedTesting.Generators; using System; using System.Globalization; using System.Text; diff --git a/src/Lucene.Net.TestFramework/Store/BaseDirectoryTestCase.cs b/src/Lucene.Net.TestFramework/Store/BaseDirectoryTestCase.cs index c57c601..d947563 100644 --- a/src/Lucene.Net.TestFramework/Store/BaseDirectoryTestCase.cs +++ b/src/Lucene.Net.TestFramework/Store/BaseDirectoryTestCase.cs @@ -3,7 +3,6 @@ using J2N.Threading; using Lucene.Net.Index; using Lucene.Net.MockFile; -using Lucene.Net.Randomized.Generators; using Lucene.Net.Support; using Lucene.Net.Util; using System; @@ -11,6 +10,7 @@ using System.IO; using System.Threading; using AssertionError = Lucene.Net.Diagnostics.AssertionException; using Assert = Lucene.Net.TestFramework.Assert; +using RandomizedTesting.Generators; #if TESTFRAMEWORK_MSTEST using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; diff --git a/src/Lucene.Net.TestFramework/Store/MockDirectoryWrapper.cs b/src/Lucene.Net.TestFramework/Store/MockDirectoryWrapper.cs index 41dd014..98c96bc 100644 --- a/src/Lucene.Net.TestFramework/Store/MockDirectoryWrapper.cs +++ b/src/Lucene.Net.TestFramework/Store/MockDirectoryWrapper.cs @@ -1,10 +1,11 @@ -using J2N.Runtime.CompilerServices; +using J2N.Runtime.CompilerServices; using J2N.Threading.Atomic; using Lucene.Net.Diagnostics; using Lucene.Net.Index; using Lucene.Net.Index.Extensions; using Lucene.Net.Support; using Lucene.Net.Util; +using RandomizedTesting.Generators; using System; using System.Collections.Concurrent; using System.Collections.Generic; diff --git a/src/Lucene.Net.TestFramework/Support/JavaCompatibility/RandomHelpers.cs b/src/Lucene.Net.TestFramework/Support/JavaCompatibility/RandomHelpers.cs index 790f8de..7ddb358 100644 --- a/src/Lucene.Net.TestFramework/Support/JavaCompatibility/RandomHelpers.cs +++ b/src/Lucene.Net.TestFramework/Support/JavaCompatibility/RandomHelpers.cs @@ -1,4 +1,5 @@ -using Lucene.Net.Support; +using Lucene.Net.Support; +using RandomizedTesting.Generators; using System; using System.Diagnostics.CodeAnalysis; diff --git a/src/Lucene.Net.TestFramework/Support/RandomExtensions.cs b/src/Lucene.Net.TestFramework/Support/RandomExtensions.cs index 9fdc366..dd11c78 100644 --- a/src/Lucene.Net.TestFramework/Support/RandomExtensions.cs +++ b/src/Lucene.Net.TestFramework/Support/RandomExtensions.cs @@ -1,10 +1,6 @@ -using Lucene.Net.Randomized.Generators; -using Lucene.Net.Search; +using Lucene.Net.Search; using Lucene.Net.Util; using System; -using System.Collections.Generic; -using System.Text.RegularExpressions; -using J2N.Numerics; namespace Lucene.Net { @@ -28,230 +24,10 @@ namespace Lucene.Net /// <summary> /// Extensions to <see cref="Random"/> in order to randomly generate /// types and specially formatted strings that assist with testing - /// custom extensions to Lucene.Net. + /// custom extensions to Lucene.NET. /// </summary> public static class RandomExtensions { - /// <summary> - /// Generates a random <see cref="bool"/>, with a random distribution of - /// approximately 50/50. - /// </summary> - /// <param name="random">This <see cref="Random"/>.</param> - /// <returns>A random <see cref="bool"/>.</returns> - public static bool NextBoolean(this Random random) - { - return (random.Next(1, 100) > 50); - } - - // LUCENENET NOTE: NextInt32() is basically covered by the overloads of Next(), - // the only difference is that the maximum is exclusive in .NET, not inclusive. - - /// <summary> - /// Generates a random <see cref="long"/>. - /// </summary> - /// <param name="random">This <see cref="Random"/>.</param> - /// <returns>A random <see cref="long"/>.</returns> - // http://stackoverflow.com/a/6651656 - public static long NextInt64(this Random random) - { - byte[] buffer = new byte[8]; - random.NextBytes(buffer); - return BitConverter.ToInt64(buffer, 0); - } - - /// <summary> - /// Generates a random <see cref="long"/>. <paramref name="start"/> and <paramref name="end"/> are BOTH inclusive. - /// </summary> - /// <param name="random">This <see cref="Random"/>.</param> - /// <param name="start">The inclusive start.</param> - /// <param name="end">The inclusive end.</param> - /// <returns>A random <see cref="long"/>.</returns> - public static long NextInt64(this Random random, long start, long end) - { - return TestUtil.NextInt64(random, start, end); - } - - /// <summary> - /// Generates a random <see cref="long"/> between <c>0</c> (inclusive) - /// and <paramref name="n"/> (exclusive). - /// </summary> - /// <param name="random">This <see cref="Random"/>.</param> - /// <param name="n">The bound on the random number to be returned. Must be positive.</param> - /// <returns>A random <see cref="long"/> between 0 and <paramref name="n"/>-1.</returns> - public static long NextInt64(this Random random, long n) - { - if (n <= 0) - { - throw new ArgumentOutOfRangeException(nameof(n), $"{n} <= 0: " + n); - } - - long value = NextInt64(random); - long range = n - 1; - if ((n & range) == 0L) - { - value &= range; - } - else - { - for (long u = value.TripleShift(1); u + range - (value = u % n) < 0L;) - { - u = NextInt64(random).TripleShift(1); - } - } - return value; - } - - /// <summary> - /// Generates a random <see cref="float"/>. - /// </summary> - /// <param name="random">This <see cref="Random"/>.</param> - /// <returns>A random <see cref="float"/>.</returns> - public static float NextSingle(this Random random) - { - return (float)random.NextDouble(); - } - - /// <summary> - /// Pick a random object from the <paramref name="collection"/>. - /// </summary> - public static T NextFrom<T>(this Random random, ICollection<T> collection) - { - return RandomPicks.RandomFrom(random, collection); - } - - /// <summary> - /// Returns a random string consisting only of lowercase characters 'a' through 'z'. - /// </summary> - public static string NextSimpleString(this Random random, int maxLength) - { - return TestUtil.RandomSimpleString(random, maxLength); - } - - /// <summary> - /// Returns a random string consisting only of lowercase characters 'a' through 'z'. - /// </summary> - public static string NextSimpleString(this Random random, int minLength, int maxLength) - { - return TestUtil.RandomSimpleString(random, minLength, maxLength); - } - - /// <summary> - /// Returns a random string consisting only of characters between <paramref name="minChar"/> and <paramref name="maxChar"/>. - /// </summary> - public static string NextSimpleStringRange(this Random random, char minChar, char maxChar, int maxLength) - { - return TestUtil.RandomSimpleStringRange(random, minChar, maxChar, maxLength); - } - - /// <summary> - /// Returns a random string consisting only of lowercase characters 'a' through 'z', - /// between 0 and 20 characters in length. - /// </summary> - public static string NextSimpleString(this Random random) - { - return TestUtil.RandomSimpleString(random); - } - - /// <summary> - /// Returns random string, including full unicode range. </summary> - public static string NextUnicodeString(this Random random) - { - return TestUtil.RandomUnicodeString(random); - } - - /// <summary> - /// Returns a random string up to a certain length. - /// </summary> - public static string NextUnicodeString(this Random random, int maxLength) - { - return TestUtil.RandomUnicodeString(random, maxLength); - } - - /// <summary> - /// Fills provided <see cref="T:char[]"/> with valid random unicode code - /// unit sequence. - /// </summary> - public static void NextFixedLengthUnicodeString(this Random random, char[] chars, int offset, int length) - { - TestUtil.RandomFixedLengthUnicodeString(random, chars, offset, length); - } - - /// <summary> - /// Returns a <see cref="string"/> thats "regexish" (contains lots of operators typically found in regular expressions) - /// If you call this enough times, you might get a valid regex! - /// </summary> - public static string NextRegexishString(this Random random) - { - return TestUtil.RandomRegexpishString(random); - } - - /// <summary> - /// Returns a <see cref="string"/> thats "regexish" (contains lots of operators typically found in regular expressions) - /// If you call this enough times, you might get a valid regex! - /// - /// <para/>Note: to avoid practically endless backtracking patterns we replace asterisk and plus - /// operators with bounded repetitions. See LUCENE-4111 for more info. - /// </summary> - /// <param name="maxLength"> A hint about maximum length of the regexpish string. It may be exceeded by a few characters. </param> - public static string NextRegexishString(this Random random, int maxLength) - { - return TestUtil.RandomRegexpishString(random, maxLength); - } - - /// <summary> - /// Returns a random HTML-like string. - /// </summary> - public static string NextHtmlishString(this Random random, int numElements) - { - return TestUtil.RandomHtmlishString(random, numElements); - } - - /// <summary> - /// Randomly upcases, downcases, or leaves intact each code point in the given string. - /// </summary> - public static string NextRecasedString(this Random random, string str) - { - return TestUtil.RandomlyRecaseString(random, str); - } - - /// <summary> - /// Returns random string of length between 0-20 codepoints, all codepoints within the same unicode block. </summary> - public static string NextRealisticUnicodeString(this Random random) - { - return TestUtil.RandomRealisticUnicodeString(random); - } - - /// <summary> - /// Returns random string of length up to maxLength codepoints, all codepoints within the same unicode block. </summary> - public static string NextRealisticUnicodeString(this Random random, int maxLength) - { - return TestUtil.RandomRealisticUnicodeString(random, maxLength); - } - - /// <summary> - /// Returns random string of length between min and max codepoints, all codepoints within the same unicode block. </summary> - public static string NextRealisticUnicodeString(this Random random, int minLength, int maxLength) - { - return TestUtil.RandomRealisticUnicodeString(random, minLength, maxLength); - } - - /// <summary> - /// Returns random string, with a given UTF-8 byte <paramref name="length"/>. </summary> - public static string NextFixedByteLengthUnicodeString(this Random random, int length) - { - return TestUtil.RandomFixedByteLengthUnicodeString(random, length); - } - - /// <summary> - /// Returns a valid (compiling) <see cref="Regex"/> instance with random stuff inside. Be careful - /// when applying random patterns to longer strings as certain types of patterns - /// may explode into exponential times in backtracking implementations (such as Java's). - /// </summary> - public static Regex NextRegex(this Random random) - { - return TestUtil.RandomRegex(random); - } - public static FilteredQuery.FilterStrategy NextFilterStrategy(this Random random) { return TestUtil.RandomFilterStrategy(random); diff --git a/src/Lucene.Net.TestFramework/Support/Randomized/Generators/RandomBytes.cs b/src/Lucene.Net.TestFramework/Support/Randomized/Generators/RandomBytes.cs deleted file mode 100644 index d3c0931..0000000 --- a/src/Lucene.Net.TestFramework/Support/Randomized/Generators/RandomBytes.cs +++ /dev/null @@ -1,55 +0,0 @@ -using System; - -namespace Lucene.Net.Randomized.Generators -{ - /* - * 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> - /// Random byte sequence generators. - /// </summary> - public static class RandomBytes - { - /// <summary> - /// - /// </summary> - /// <param name="r">Random generator.</param> - /// <param name="length">The length of the byte array. Can be zero.</param> - /// <returns>Returns a byte array with random content.</returns> - public static byte[] RandomBytesOfLength(Random r, int length) - { - return RandomBytesOfLengthBetween(r, length, length); - } - - /// <summary> - /// - /// </summary> - /// <param name="r">Random generator.</param> - /// <param name="minLength">The minimum length of the byte array. Can be zero.</param> - /// <param name="maxLength">The maximum length of the byte array. Can be zero.</param> - /// <returns>Returns a byte array with random content.</returns> - public static byte[] RandomBytesOfLengthBetween(Random r, int minLength, int maxLength) - { - byte[] bytes = new byte[RandomInts.RandomInt32Between(r, minLength, maxLength)]; - for (int i = 0; i < bytes.Length; i++) - { - bytes[i] = (byte)r.Next(); - } - return bytes; - } - } -} diff --git a/src/Lucene.Net.TestFramework/Support/Randomized/Generators/RandomInts.cs b/src/Lucene.Net.TestFramework/Support/Randomized/Generators/RandomInts.cs deleted file mode 100644 index 0fbe38b..0000000 --- a/src/Lucene.Net.TestFramework/Support/Randomized/Generators/RandomInts.cs +++ /dev/null @@ -1,49 +0,0 @@ -using Lucene.Net.Support; -using System; -using System.Diagnostics; -using System.Globalization; -// LUCENENET NOTE: The asserts here need to be from System.Diagnostics, since they are not meant for end users. -//using Debug = Lucene.Net.Diagnostics.Debug; - -namespace Lucene.Net.Randomized.Generators -{ - /* - * 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> - /// Utility class for random integer and integer sequences. - /// </summary> - [ExceptionToNetNumericConvention] - public static class RandomInts - { - /// <summary> - /// A random integer from <paramref name="min"/> to <paramref name="max"/> (inclusive). - /// </summary> - public static int RandomInt32Between(Random random, int min, int max) - { - Debug.Assert(min <= max, - $"Min must be less than or equal max int. min: {min.ToString(CultureInfo.InvariantCulture)}, max: {max.ToString(CultureInfo.InvariantCulture)}"); - var range = max - min; - if (range < int.MaxValue) - return min + random.Next(1 + range); - - return min + (int)Math.Round(random.NextDouble() * range); - } - - /* .NET has random.Next(max) which negates the need for randomInt(Random random, int max) as */ - } -} diff --git a/src/Lucene.Net.TestFramework/Support/Randomized/Generators/RandomPicks.cs b/src/Lucene.Net.TestFramework/Support/Randomized/Generators/RandomPicks.cs deleted file mode 100644 index 33516e3..0000000 --- a/src/Lucene.Net.TestFramework/Support/Randomized/Generators/RandomPicks.cs +++ /dev/null @@ -1,41 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; - -namespace Lucene.Net.Randomized.Generators -{ - /* - * 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> - /// Random selections of objects. - /// </summary> - public static class RandomPicks - { - /// <summary> - /// Pick a random object from the <paramref name="collection"/>. - /// </summary> - public static T RandomFrom<T>(Random random, ICollection<T> collection) - { - if (collection.Count == 0) - { - throw new ArgumentException("Can't pick a random object from an empty collection."); - } - return collection.ElementAt(random.Next(0, collection.Count)); - } - } -} diff --git a/src/Lucene.Net.TestFramework/Util/Automaton/AutomatonTestUtil.cs b/src/Lucene.Net.TestFramework/Util/Automaton/AutomatonTestUtil.cs index 0746234..7b9c6fe 100644 --- a/src/Lucene.Net.TestFramework/Util/Automaton/AutomatonTestUtil.cs +++ b/src/Lucene.Net.TestFramework/Util/Automaton/AutomatonTestUtil.cs @@ -1,6 +1,7 @@ -using J2N; +using J2N; using J2N.Runtime.CompilerServices; using Lucene.Net.Diagnostics; +using RandomizedTesting.Generators; using System; using System.Collections.Generic; using JCG = J2N.Collections.Generic; diff --git a/src/Lucene.Net.TestFramework/Util/BaseDocIdSetTestCase.cs b/src/Lucene.Net.TestFramework/Util/BaseDocIdSetTestCase.cs index 430cce7..505d9a5 100644 --- a/src/Lucene.Net.TestFramework/Util/BaseDocIdSetTestCase.cs +++ b/src/Lucene.Net.TestFramework/Util/BaseDocIdSetTestCase.cs @@ -1,5 +1,6 @@ -using Lucene.Net.Diagnostics; +using Lucene.Net.Diagnostics; using Lucene.Net.Search; +using RandomizedTesting.Generators; using System; using Assert = Lucene.Net.TestFramework.Assert; using BitSet = J2N.Collections.BitSet; diff --git a/src/Lucene.Net.TestFramework/Util/Fst/FSTTester.cs b/src/Lucene.Net.TestFramework/Util/Fst/FSTTester.cs index 802761a..1653463 100644 --- a/src/Lucene.Net.TestFramework/Util/Fst/FSTTester.cs +++ b/src/Lucene.Net.TestFramework/Util/Fst/FSTTester.cs @@ -4,6 +4,7 @@ using J2N.Collections.Generic.Extensions; using Lucene.Net.Diagnostics; using Lucene.Net.Store; using Lucene.Net.Util.Packed; +using RandomizedTesting.Generators; using System; using System.Collections; using System.Collections.Concurrent; diff --git a/src/Lucene.Net.TestFramework/Util/LineFileDocs.cs b/src/Lucene.Net.TestFramework/Util/LineFileDocs.cs index 3c5a8e4..cdd1356 100644 --- a/src/Lucene.Net.TestFramework/Util/LineFileDocs.cs +++ b/src/Lucene.Net.TestFramework/Util/LineFileDocs.cs @@ -1,7 +1,8 @@ -using J2N; +using J2N; using J2N.Threading.Atomic; using Lucene.Net.Documents; using Lucene.Net.Support.IO; +using RandomizedTesting.Generators; using System; using System.Globalization; using System.IO; diff --git a/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs b/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs index 351e7b6..3f08ce5 100644 --- a/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs +++ b/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs @@ -5,7 +5,6 @@ using Lucene.Net.Documents; using Lucene.Net.Index; using Lucene.Net.Index.Extensions; using Lucene.Net.Randomized; -using Lucene.Net.Randomized.Generators; using Lucene.Net.Search; using Lucene.Net.Store; using Lucene.Net.Support; @@ -34,6 +33,7 @@ using FieldInfo = Lucene.Net.Index.FieldInfo; using static Lucene.Net.Search.FieldCache; using static Lucene.Net.Util.FieldCacheSanityChecker; using J2N.Collections.Generic.Extensions; +using RandomizedTesting.Generators; #if TESTFRAMEWORK_MSTEST using Before = Microsoft.VisualStudio.TestTools.UnitTesting.TestInitializeAttribute; diff --git a/src/Lucene.Net.TestFramework/Util/TestRuleSetupAndRestoreClassEnv.cs b/src/Lucene.Net.TestFramework/Util/TestRuleSetupAndRestoreClassEnv.cs index 0c833a5..f8c6c52 100644 --- a/src/Lucene.Net.TestFramework/Util/TestRuleSetupAndRestoreClassEnv.cs +++ b/src/Lucene.Net.TestFramework/Util/TestRuleSetupAndRestoreClassEnv.cs @@ -1,4 +1,4 @@ -using Lucene.Net.Codecs; +using Lucene.Net.Codecs; using Lucene.Net.Codecs.Asserting; using Lucene.Net.Codecs.CheapBastard; using Lucene.Net.Codecs.Compressing; @@ -22,6 +22,7 @@ using System.Reflection; using System.Threading; using JCG = J2N.Collections.Generic; using Console = Lucene.Net.Util.SystemConsole; +using RandomizedTesting.Generators; // LUCENENET NOTE: These are primarily here because they are referred to // in the XML documentation. Be sure to add a new option if a new test framework diff --git a/src/Lucene.Net.TestFramework/Util/TestUtil.cs b/src/Lucene.Net.TestFramework/Util/TestUtil.cs index ea6eac3..303d310 100644 --- a/src/Lucene.Net.TestFramework/Util/TestUtil.cs +++ b/src/Lucene.Net.TestFramework/Util/TestUtil.cs @@ -6,20 +6,20 @@ using Lucene.Net.Codecs.Lucene46; using Lucene.Net.Codecs.PerField; using Lucene.Net.Documents; using Lucene.Net.Index; -using Lucene.Net.Randomized.Generators; using Lucene.Net.Search; using Lucene.Net.Support.IO; +using RandomizedTesting.Generators; using System; using System.Collections.Generic; using System.IO; using System.IO.Compression; -using System.Numerics; using System.Text; using System.Text.RegularExpressions; using Assert = Lucene.Net.TestFramework.Assert; using Console = Lucene.Net.Util.SystemConsole; using Directory = Lucene.Net.Store.Directory; using JCG = J2N.Collections.Generic; +using RandomInts = RandomizedTesting.Generators.RandomNumbers; //#if TESTFRAMEWORK_MSTEST @@ -241,51 +241,14 @@ namespace Lucene.Net.Util /// <paramref name="start"/> and <paramref name="end"/> are BOTH inclusive </summary> public static int NextInt32(Random r, int start, int end) { - return RandomInts.RandomInt32Between(r, start, end); + return RandomInts.RandomInt32Between(r, start, end); // LUCENENET: Moved general random data generation to RandomizedTesting.Generators } /// <summary> /// <paramref name="start"/> and <paramref name="end"/> are BOTH inclusive </summary> public static long NextInt64(Random r, long start, long end) { - Assert.True(end >= start); - BigInteger range = (BigInteger)end + (BigInteger)1 - (BigInteger)start; - if (range.CompareTo((BigInteger)int.MaxValue) <= 0) - { - return start + r.Next((int)range); - } - else - { - // probably not evenly distributed when range is large, but OK for tests - //BigInteger augend = BigInteger.Multiply(range, new BigInteger(r.NextDouble())); - //long result = start + (long)augend; - - // LUCENENET NOTE: Using BigInteger/Decimal doesn't work because r.NextDouble() is always - // rounded down to 0, which makes the result always the same as start. This alternative solution was - // snagged from https://stackoverflow.com/a/13095144. All we really care about here is that we get - // a pretty good random distribution of values between start and end. - - //Working with ulong so that modulo works correctly with values > long.MaxValue - ulong uRange = (ulong)unchecked(end - start); - - //Prevent a modolo bias; see https://stackoverflow.com/a/10984975/238419 - //for more information. - //In the worst case, the expected number of calls is 2 (though usually it's - //much closer to 1) so this loop doesn't really hurt performance at all. - ulong ulongRand; - do - { - byte[] buf = new byte[8]; - r.NextBytes(buf); - ulongRand = (ulong)BitConverter.ToInt64(buf, 0); - } while (ulongRand > ulong.MaxValue - ((ulong.MaxValue % uRange) + 1) % uRange); - - long result = (long)(ulongRand % uRange) + start + r.Next(0, 1); // Randomly decide whether to increment by 1 to make the second parameter "inclusive" - - Assert.True(result >= start); - Assert.True(result <= end); - return result; - } + return RandomInts.RandomInt64Between(r, start, end); // LUCENENET: Moved general random data generation to RandomizedTesting.Generators } /// <summary> @@ -293,7 +256,7 @@ namespace Lucene.Net.Util /// </summary> public static string RandomSimpleString(Random r, int maxLength) { - return RandomSimpleString(r, 0, maxLength); + return RandomizedTesting.Generators.RandomExtensions.NextSimpleString(r, maxLength); // LUCENENET: Moved general random data generation to RandomizedTesting.Generators } /// <summary> @@ -301,18 +264,7 @@ namespace Lucene.Net.Util /// </summary> public static string RandomSimpleString(Random r, int minLength, int maxLength) { - int end = NextInt32(r, minLength, maxLength); - if (end == 0) - { - // allow 0 length - return ""; - } - char[] buffer = new char[end]; - for (int i = 0; i < end; i++) - { - buffer[i] = (char)TestUtil.NextInt32(r, 'a', 'z'); - } - return new string(buffer, 0, end); + return RandomizedTesting.Generators.RandomExtensions.NextSimpleString(r, minLength, maxLength); // LUCENENET: Moved general random data generation to RandomizedTesting.Generators } /// <summary> @@ -320,18 +272,7 @@ namespace Lucene.Net.Util /// </summary> public static string RandomSimpleStringRange(Random r, char minChar, char maxChar, int maxLength) { - int end = NextInt32(r, 0, maxLength); - if (end == 0) - { - // allow 0 length - return ""; - } - char[] buffer = new char[end]; - for (int i = 0; i < end; i++) - { - buffer[i] = (char)TestUtil.NextInt32(r, minChar, maxChar); - } - return new string(buffer, 0, end); + return RandomizedTesting.Generators.RandomExtensions.NextSimpleStringRange(r, minChar, maxChar, maxLength); // LUCENENET: Moved general random data generation to RandomizedTesting.Generators } /// <summary> @@ -340,14 +281,14 @@ namespace Lucene.Net.Util /// </summary> public static string RandomSimpleString(Random r) { - return RandomSimpleString(r, 0, 10); + return RandomizedTesting.Generators.RandomExtensions.NextSimpleString(r); // LUCENENET: Moved general random data generation to RandomizedTesting.Generators } /// <summary> /// Returns random string, including full unicode range. </summary> public static string RandomUnicodeString(Random r) { - return RandomUnicodeString(r, 20); + return RandomizedTesting.Generators.RandomExtensions.NextUnicodeString(r); // LUCENENET: Moved general random data generation to RandomizedTesting.Generators } /// <summary> @@ -355,15 +296,7 @@ namespace Lucene.Net.Util /// </summary> public static string RandomUnicodeString(Random r, int maxLength) { - int end = NextInt32(r, 0, maxLength); - if (end == 0) - { - // allow 0 length - return ""; - } - char[] buffer = new char[end]; - RandomFixedLengthUnicodeString(r, buffer, 0, buffer.Length); - return new string(buffer, 0, end); + return RandomizedTesting.Generators.RandomExtensions.NextUnicodeString(r, maxLength); // LUCENENET: Moved general random data generation to RandomizedTesting.Generators } /// <summary> @@ -372,36 +305,7 @@ namespace Lucene.Net.Util /// </summary> public static void RandomFixedLengthUnicodeString(Random random, char[] chars, int offset, int length) { - int i = offset; - int end = offset + length; - while (i < end) - { - int t = random.Next(5); - if (0 == t && i < length - 1) - { - // Make a surrogate pair - // High surrogate - chars[i++] = (char)NextInt32(random, 0xd800, 0xdbff); - // Low surrogate - chars[i++] = (char)NextInt32(random, 0xdc00, 0xdfff); - } - else if (t <= 1) - { - chars[i++] = (char)random.Next(0x80); - } - else if (2 == t) - { - chars[i++] = (char)NextInt32(random, 0x80, 0x7ff); - } - else if (3 == t) - { - chars[i++] = (char)NextInt32(random, 0x800, 0xd7ff); - } - else if (4 == t) - { - chars[i++] = (char)NextInt32(random, 0xe000, 0xffff); - } - } + RandomizedTesting.Generators.RandomExtensions.NextFixedLengthUnicodeString(random, chars, offset, length); // LUCENENET: Moved general random data generation to RandomizedTesting.Generators } /// <summary> @@ -410,31 +314,10 @@ namespace Lucene.Net.Util /// </summary> public static string RandomRegexpishString(Random r) { - return RandomRegexpishString(r, 20); + return RandomizedTesting.Generators.RandomExtensions.NextRegexishString(r); // LUCENENET: Moved general random data generation to RandomizedTesting.Generators } /// <summary> - /// Maximum recursion bound for '+' and '*' replacements in - /// <see cref="RandomRegexpishString(Random, int)"/>. - /// </summary> - private const int MaxRecursionBound = 5; - - /// <summary> - /// Operators for <see cref="RandomRegexpishString(Random, int)"/>. - /// </summary> - private static readonly IList<string> ops = new string[] { - ".", "?", - "{0," + MaxRecursionBound + "}", // bounded replacement for '*' - "{1," + MaxRecursionBound + "}", // bounded replacement for '+' - "(", - ")", - "-", - "[", - "]", - "|" - }; - - /// <summary> /// Returns a <see cref="string"/> thats "regexpish" (contains lots of operators typically found in regular expressions) /// If you call this enough times, you might get a valid regex! /// @@ -444,240 +327,15 @@ namespace Lucene.Net.Util /// <param name="maxLength"> A hint about maximum length of the regexpish string. It may be exceeded by a few characters. </param> public static string RandomRegexpishString(Random r, int maxLength) { - StringBuilder regexp = new StringBuilder(maxLength); - for (int i = NextInt32(r, 0, maxLength); i > 0; i--) - { - if (r.NextBoolean()) - { - regexp.Append((char)RandomInts.RandomInt32Between(r, 'a', 'z')); - } - else - { - regexp.Append(RandomPicks.RandomFrom(r, ops)); - } - } - return regexp.ToString(); + return RandomizedTesting.Generators.RandomExtensions.NextRegexishString(r, maxLength); // LUCENENET: Moved general random data generation to RandomizedTesting.Generators } - private static readonly string[] HTML_CHAR_ENTITIES = new string[] - { - "AElig", "Aacute", "Acirc", "Agrave", "Alpha", "AMP", "Aring", "Atilde", "Auml", "Beta", "COPY", "Ccedil", "Chi", - "Dagger", "Delta", "ETH", "Eacute", "Ecirc", "Egrave", "Epsilon", "Eta", "Euml", "Gamma", "GT", "Iacute", "Icirc", - "Igrave", "Iota", "Iuml", "Kappa", "Lambda", "LT", "Mu", "Ntilde", "Nu", "OElig", "Oacute", "Ocirc", "Ograve", - "Omega", "Omicron", "Oslash", "Otilde", "Ouml", "Phi", "Pi", "Prime", "Psi", "QUOT", "REG", "Rho", "Scaron", - "Sigma", "THORN", "Tau", "Theta", "Uacute", "Ucirc", "Ugrave", "Upsilon", "Uuml", "Xi", "Yacute", "Yuml", "Zeta", - "aacute", "acirc", "acute", "aelig", "agrave", "alefsym", "alpha", "amp", "and", "ang", "apos", "aring", "asymp", - "atilde", "auml", "bdquo", "beta", "brvbar", "bull", "cap", "ccedil", "cedil", "cent", "chi", "circ", "clubs", - "cong", "copy", "crarr", "cup", "curren", "dArr", "dagger", "darr", "deg", "delta", "diams", "divide", "eacute", - "ecirc", "egrave", "empty", "emsp", "ensp", "epsilon", "equiv", "eta", "eth", "euml", "euro", "exist", "fnof", - "forall", "frac12", "frac14", "frac34", "frasl", "gamma", "ge", "gt", "hArr", "harr", "hearts", "hellip", "iacute", - "icirc", "iexcl", "igrave", "image", "infin", "int", "iota", "iquest", "isin", "iuml", "kappa", "lArr", "lambda", - "lang", "laquo", "larr", "lceil", "ldquo", "le", "lfloor", "lowast", "loz", "lrm", "lsaquo", "lsquo", "lt", "macr", - "mdash", "micro", "middot", "minus", "mu", "nabla", "nbsp", "ndash", "ne", "ni", "not", "notin", "nsub", "ntilde", - "nu", "oacute", "ocirc", "oelig", "ograve", "oline", "omega", "omicron", "oplus", "or", "ordf", "ordm", "oslash", - "otilde", "otimes", "ouml", "para", "part", "permil", "perp", "phi", "pi", "piv", "plusmn", "pound", "prime", "prod", - "prop", "psi", "quot", "rArr", "radic", "rang", "raquo", "rarr", "rceil", "rdquo", "real", "reg", "rfloor", "rho", - "rlm", "rsaquo", "rsquo", "sbquo", "scaron", "sdot", "sect", "shy", "sigma", "sigmaf", "sim", "spades", "sub", "sube", - "sum", "sup", "sup1", "sup2", "sup3", "supe", "szlig", "tau", "there4", "theta", "thetasym", "thinsp", "thorn", "tilde", - "times", "trade", "uArr", "uacute", "uarr", "ucirc", "ugrave", "uml", "upsih", "upsilon", "uuml", "weierp", "xi", - "yacute", "yen", "yuml", "zeta", "zwj", "zwnj" - }; - /// <summary> /// Returns a random HTML-like string. /// </summary> public static string RandomHtmlishString(Random random, int numElements) { - int end = NextInt32(random, 0, numElements); - if (end == 0) - { - // allow 0 length - return ""; - } - StringBuilder sb = new StringBuilder(); - for (int i = 0; i < end; i++) - { - int val = random.Next(25); - switch (val) - { - case 0: - sb.Append("<p>"); - break; - - case 1: - { - sb.Append("<"); - sb.Append(" ".Substring(NextInt32(random, 0, 4))); - sb.Append(RandomSimpleString(random)); - for (int j = 0; j < NextInt32(random, 0, 10); ++j) - { - sb.Append(' '); - sb.Append(RandomSimpleString(random)); - sb.Append(" ".Substring(NextInt32(random, 0, 1))); - sb.Append('='); - sb.Append(" ".Substring(NextInt32(random, 0, 1))); - sb.Append("\"".Substring(NextInt32(random, 0, 1))); - sb.Append(RandomSimpleString(random)); - sb.Append("\"".Substring(NextInt32(random, 0, 1))); - } - sb.Append(" ".Substring(NextInt32(random, 0, 4))); - sb.Append("/".Substring(NextInt32(random, 0, 1))); - sb.Append(">".Substring(NextInt32(random, 0, 1))); - break; - } - case 2: - { - sb.Append("</"); - sb.Append(" ".Substring(NextInt32(random, 0, 4))); - sb.Append(RandomSimpleString(random)); - sb.Append(" ".Substring(NextInt32(random, 0, 4))); - sb.Append(">".Substring(NextInt32(random, 0, 1))); - break; - } - case 3: - sb.Append(">"); - break; - - case 4: - sb.Append("</p>"); - break; - - case 5: - sb.Append("<!--"); - break; - - case 6: - sb.Append("<!--#"); - break; - - case 7: - sb.Append("<script><!-- f('"); - break; - - case 8: - sb.Append("</script>"); - break; - - case 9: - sb.Append("<?"); - break; - - case 10: - sb.Append("?>"); - break; - - case 11: - sb.Append("\""); - break; - - case 12: - sb.Append("\\\""); - break; - - case 13: - sb.Append("'"); - break; - - case 14: - sb.Append("\\'"); - break; - - case 15: - sb.Append("-->"); - break; - - case 16: - { - sb.Append("&"); - switch (NextInt32(random, 0, 2)) - { - case 0: - sb.Append(RandomSimpleString(random)); - break; - - case 1: - sb.Append(HTML_CHAR_ENTITIES[random.Next(HTML_CHAR_ENTITIES.Length)]); - break; - } - sb.Append(";".Substring(NextInt32(random, 0, 1))); - break; - } - case 17: - { - sb.Append("&#"); - if (0 == NextInt32(random, 0, 1)) - { - sb.Append(NextInt32(random, 0, int.MaxValue - 1)); - sb.Append(";".Substring(NextInt32(random, 0, 1))); - } - break; - } - case 18: - { - sb.Append("&#x"); - if (0 == NextInt32(random, 0, 1)) - { - sb.Append(Convert.ToString(NextInt32(random, 0, int.MaxValue - 1), 16)); - sb.Append(";".Substring(NextInt32(random, 0, 1))); - } - break; - } - - case 19: - sb.Append(";"); - break; - - case 20: - sb.Append(NextInt32(random, 0, int.MaxValue - 1)); - break; - - case 21: - sb.Append("\n"); - break; - - case 22: - sb.Append(" ".Substring(NextInt32(random, 0, 10))); - break; - - case 23: - { - sb.Append("<"); - if (0 == NextInt32(random, 0, 3)) - { - sb.Append(" ".Substring(NextInt32(random, 1, 10))); - } - if (0 == NextInt32(random, 0, 1)) - { - sb.Append("/"); - if (0 == NextInt32(random, 0, 3)) - { - sb.Append(" ".Substring(NextInt32(random, 1, 10))); - } - } - switch (NextInt32(random, 0, 3)) - { - case 0: - sb.Append(RandomlyRecaseString(random, "script")); - break; - - case 1: - sb.Append(RandomlyRecaseString(random, "style")); - break; - - case 2: - sb.Append(RandomlyRecaseString(random, "br")); - break; - // default: append nothing - } - sb.Append(">".Substring(NextInt32(random, 0, 1))); - break; - } - default: - sb.Append(RandomSimpleString(random)); - break; - } - } - return sb.ToString(); + return RandomizedTesting.Generators.RandomExtensions.NextHtmlishString(random, numElements); // LUCENENET: Moved general random data generation to RandomizedTesting.Generators } /// <summary> @@ -685,163 +343,35 @@ namespace Lucene.Net.Util /// </summary> public static string RandomlyRecaseString(Random random, string str) { - var builder = new StringBuilder(); - int pos = 0; - while (pos < str.Length) - { - string toRecase; - - // check if the next char sequence is a surrogate pair - if (pos + 1 < str.Length && char.IsSurrogatePair(str[pos], str[pos + 1])) - { - toRecase = str.Substring(pos, 2); - } - else - { - toRecase = str.Substring(pos, 1); - } - - pos += toRecase.Length; - - switch (NextInt32(random, 0, 2)) - { - case 0: - builder.Append(toRecase.ToUpper()); // LUCENENET NOTE: Intentionally using current culture - break; - case 1: - builder.Append(toRecase.ToLower()); // LUCENENET NOTE: Intentionally using current culture - break; - case 2: - builder.Append(toRecase); - break; - } - } - return builder.ToString(); + return RandomizedTesting.Generators.RandomExtensions.NextStringRecasing(random, str); // LUCENENET: Moved general random data generation to RandomizedTesting.Generators } - private static readonly int[] blockStarts = new int[] - { - 0x0000, 0x0080, 0x0100, 0x0180, 0x0250, 0x02B0, 0x0300, 0x0370, 0x0400, 0x0500, 0x0530, 0x0590, 0x0600, 0x0700, - 0x0750, 0x0780, 0x07C0, 0x0800, 0x0900, 0x0980, 0x0A00, 0x0A80, 0x0B00, 0x0B80, 0x0C00, 0x0C80, 0x0D00, 0x0D80, - 0x0E00, 0x0E80, 0x0F00, 0x1000, 0x10A0, 0x1100, 0x1200, 0x1380, 0x13A0, 0x1400, 0x1680, 0x16A0, 0x1700, 0x1720, - 0x1740, 0x1760, 0x1780, 0x1800, 0x18B0, 0x1900, 0x1950, 0x1980, 0x19E0, 0x1A00, 0x1A20, 0x1B00, 0x1B80, 0x1C00, - 0x1C50, 0x1CD0, 0x1D00, 0x1D80, 0x1DC0, 0x1E00, 0x1F00, 0x2000, 0x2070, 0x20A0, 0x20D0, 0x2100, 0x2150, 0x2190, - 0x2200, 0x2300, 0x2400, 0x2440, 0x2460, 0x2500, 0x2580, 0x25A0, 0x2600, 0x2700, 0x27C0, 0x27F0, 0x2800, 0x2900, - 0x2980, 0x2A00, 0x2B00, 0x2C00, 0x2C60, 0x2C80, 0x2D00, 0x2D30, 0x2D80, 0x2DE0, 0x2E00, 0x2E80, 0x2F00, 0x2FF0, - 0x3000, 0x3040, 0x30A0, 0x3100, 0x3130, 0x3190, 0x31A0, 0x31C0, 0x31F0, 0x3200, 0x3300, 0x3400, 0x4DC0, 0x4E00, - 0xA000, 0xA490, 0xA4D0, 0xA500, 0xA640, 0xA6A0, 0xA700, 0xA720, 0xA800, 0xA830, 0xA840, 0xA880, 0xA8E0, 0xA900, - 0xA930, 0xA960, 0xA980, 0xAA00, 0xAA60, 0xAA80, 0xABC0, 0xAC00, 0xD7B0, 0xE000, 0xF900, 0xFB00, 0xFB50, 0xFE00, - 0xFE10, 0xFE20, 0xFE30, 0xFE50, 0xFE70, 0xFF00, 0xFFF0, 0x10000, 0x10080, 0x10100, 0x10140, 0x10190, 0x101D0, - 0x10280, 0x102A0, 0x10300, 0x10330, 0x10380, 0x103A0, 0x10400, 0x10450, 0x10480, 0x10800, 0x10840, 0x10900, - 0x10920, 0x10A00, 0x10A60, 0x10B00, 0x10B40, 0x10B60, 0x10C00, 0x10E60, 0x11080, 0x12000, 0x12400, 0x13000, - 0x1D000, 0x1D100, 0x1D200, 0x1D300, 0x1D360, 0x1D400, 0x1F000, 0x1F030, 0x1F100, 0x1F200, 0x20000, 0x2A700, - 0x2F800, 0xE0000, 0xE0100, 0xF0000, 0x100000 - }; - - private static readonly int[] blockEnds = new int[] - { - 0x007F, 0x00FF, 0x017F, 0x024F, 0x02AF, 0x02FF, 0x036F, 0x03FF, 0x04FF, 0x052F, 0x058F, 0x05FF, 0x06FF, 0x074F, - 0x077F, 0x07BF, 0x07FF, 0x083F, 0x097F, 0x09FF, 0x0A7F, 0x0AFF, 0x0B7F, 0x0BFF, 0x0C7F, 0x0CFF, 0x0D7F, 0x0DFF, - 0x0E7F, 0x0EFF, 0x0FFF, 0x109F, 0x10FF, 0x11FF, 0x137F, 0x139F, 0x13FF, 0x167F, 0x169F, 0x16FF, 0x171F, 0x173F, - 0x175F, 0x177F, 0x17FF, 0x18AF, 0x18FF, 0x194F, 0x197F, 0x19DF, 0x19FF, 0x1A1F, 0x1AAF, 0x1B7F, 0x1BBF, 0x1C4F, - 0x1C7F, 0x1CFF, 0x1D7F, 0x1DBF, 0x1DFF, 0x1EFF, 0x1FFF, 0x206F, 0x209F, 0x20CF, 0x20FF, 0x214F, 0x218F, 0x21FF, - 0x22FF, 0x23FF, 0x243F, 0x245F, 0x24FF, 0x257F, 0x259F, 0x25FF, 0x26FF, 0x27BF, 0x27EF, 0x27FF, 0x28FF, 0x297F, - 0x29FF, 0x2AFF, 0x2BFF, 0x2C5F, 0x2C7F, 0x2CFF, 0x2D2F, 0x2D7F, 0x2DDF, 0x2DFF, 0x2E7F, 0x2EFF, 0x2FDF, 0x2FFF, - 0x303F, 0x309F, 0x30FF, 0x312F, 0x318F, 0x319F, 0x31BF, 0x31EF, 0x31FF, 0x32FF, 0x33FF, 0x4DBF, 0x4DFF, 0x9FFF, - 0xA48F, 0xA4CF, 0xA4FF, 0xA63F, 0xA69F, 0xA6FF, 0xA71F, 0xA7FF, 0xA82F, 0xA83F, 0xA87F, 0xA8DF, 0xA8FF, 0xA92F, - 0xA95F, 0xA97F, 0xA9DF, 0xAA5F, 0xAA7F, 0xAADF, 0xABFF, 0xD7AF, 0xD7FF, 0xF8FF, 0xFAFF, 0xFB4F, 0xFDFF, 0xFE0F, - 0xFE1F, 0xFE2F, 0xFE4F, 0xFE6F, 0xFEFF, 0xFFEF, 0xFFFF, 0x1007F, 0x100FF, 0x1013F, 0x1018F, 0x101CF, 0x101FF, - 0x1029F, 0x102DF, 0x1032F, 0x1034F, 0x1039F, 0x103DF, 0x1044F, 0x1047F, 0x104AF, 0x1083F, 0x1085F, 0x1091F, - 0x1093F, 0x10A5F, 0x10A7F, 0x10B3F, 0x10B5F, 0x10B7F, 0x10C4F, 0x10E7F, 0x110CF, 0x123FF, 0x1247F, 0x1342F, - 0x1D0FF, 0x1D1FF, 0x1D24F, 0x1D35F, 0x1D37F, 0x1D7FF, 0x1F02F, 0x1F09F, 0x1F1FF, 0x1F2FF, 0x2A6DF, 0x2B73F, - 0x2FA1F, 0xE007F, 0xE01EF, 0xFFFFF, 0x10FFFF - }; - /// <summary> /// Returns random string of length between 0-20 codepoints, all codepoints within the same unicode block. </summary> public static string RandomRealisticUnicodeString(Random r) { - return RandomRealisticUnicodeString(r, 20); + return RandomizedTesting.Generators.RandomExtensions.NextRealisticUnicodeString(r); // LUCENENET: Moved general random data generation to RandomizedTesting.Generators } /// <summary> /// Returns random string of length up to maxLength codepoints, all codepoints within the same unicode block. </summary> public static string RandomRealisticUnicodeString(Random r, int maxLength) { - return RandomRealisticUnicodeString(r, 0, maxLength); + return RandomizedTesting.Generators.RandomExtensions.NextRealisticUnicodeString(r, maxLength); // LUCENENET: Moved general random data generation to RandomizedTesting.Generators } /// <summary> /// Returns random string of length between min and max codepoints, all codepoints within the same unicode block. </summary> public static string RandomRealisticUnicodeString(Random r, int minLength, int maxLength) { - int end = NextInt32(r, minLength, maxLength); - int block = r.Next(blockStarts.Length); - StringBuilder sb = new StringBuilder(); - for (int i = 0; i < end; i++) - { - sb.AppendCodePoint(NextInt32(r, blockStarts[block], blockEnds[block])); - } - return sb.ToString(); + return RandomizedTesting.Generators.RandomExtensions.NextRealisticUnicodeString(r, minLength, maxLength); // LUCENENET: Moved general random data generation to RandomizedTesting.Generators } /// <summary> /// Returns random string, with a given UTF-8 byte <paramref name="length"/>. </summary> public static string RandomFixedByteLengthUnicodeString(Random r, int length) { - char[] buffer = new char[length * 3]; - int bytes = length; - int i = 0; - for (; i < buffer.Length && bytes != 0; i++) - { - int t; - if (bytes >= 4) - { - t = r.Next(5); - } - else if (bytes >= 3) - { - t = r.Next(4); - } - else if (bytes >= 2) - { - t = r.Next(2); - } - else - { - t = 0; - } - if (t == 0) - { - buffer[i] = (char)r.Next(0x80); - bytes--; - } - else if (1 == t) - { - buffer[i] = (char)NextInt32(r, 0x80, 0x7ff); - bytes -= 2; - } - else if (2 == t) - { - buffer[i] = (char)NextInt32(r, 0x800, 0xd7ff); - bytes -= 3; - } - else if (3 == t) - { - buffer[i] = (char)NextInt32(r, 0xe000, 0xffff); - bytes -= 3; - } - else if (4 == t) - { - // Make a surrogate pair - // High surrogate - buffer[i++] = (char)NextInt32(r, 0xd800, 0xdbff); - // Low surrogate - buffer[i] = (char)NextInt32(r, 0xdc00, 0xdfff); - bytes -= 4; - } - } - return new string(buffer, 0, i); + return RandomizedTesting.Generators.RandomExtensions.NextFixedByteLengthUnicodeString(r, length); // LUCENENET: Moved general random data generation to RandomizedTesting.Generators } /// <summary> @@ -1230,28 +760,7 @@ namespace Lucene.Net.Util /// </summary> public static Regex RandomRegex(Random random) // LUCENENET specific - renamed from RandomPattern() { - const string nonBmpString = "AB\uD840\uDC00C"; - while (true) - { - try - { - Regex p = new Regex(TestUtil.RandomRegexpishString(random), RegexOptions.Compiled); - string replacement = p.Replace(nonBmpString, "_"); - - // Make sure the result of applying the pattern to a string with extended - // unicode characters is a valid utf16 string. See LUCENE-4078 for discussion. - if (replacement != null && UnicodeUtil.ValidUTF16String(replacement)) - { - return p; - } - } -#pragma warning disable 168, IDE0059 - catch (Exception ignored) -#pragma warning restore 168, IDE0059 - { - // Loop trying until we hit something that compiles. - } - } + return RandomizedTesting.Generators.RandomExtensions.NextRegex(random); // LUCENENET: Moved general random data generation to RandomizedTesting.Generators } public static FilteredQuery.FilterStrategy RandomFilterStrategy(Random random) diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestDuelingAnalyzers.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestDuelingAnalyzers.cs index b61b22d..1eccc53 100644 --- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestDuelingAnalyzers.cs +++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestDuelingAnalyzers.cs @@ -1,9 +1,10 @@ -// Lucene version compatibility level 4.8.1 +// Lucene version compatibility level 4.8.1 using J2N; using Lucene.Net.Analysis.TokenAttributes; using Lucene.Net.Util; using Lucene.Net.Util.Automaton; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using System.IO; diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestASCIIFoldingFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestASCIIFoldingFilter.cs index dcd63d2..e08625f 100644 --- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestASCIIFoldingFilter.cs +++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestASCIIFoldingFilter.cs @@ -1,7 +1,8 @@ -// Lucene version compatibility level 4.8.1 +// Lucene version compatibility level 4.8.1 using Lucene.Net.Analysis.Core; using Lucene.Net.Analysis.TokenAttributes; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using System.Collections.Generic; using System.IO; diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Synonym/TestSynonymMapFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Synonym/TestSynonymMapFilter.cs index 007543b..d840c7c 100644 --- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Synonym/TestSynonymMapFilter.cs +++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Synonym/TestSynonymMapFilter.cs @@ -1,4 +1,4 @@ -// Lucene version compatibility level 4.8.1 +// Lucene version compatibility level 4.8.1 using J2N.Text; using Lucene.Net.Analysis.Core; using Lucene.Net.Analysis.TokenAttributes; @@ -6,6 +6,7 @@ using Lucene.Net.Diagnostics; using Lucene.Net.Support; using Lucene.Net.Util; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using System.Collections.Generic; using System.Globalization; diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestRollingCharBuffer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestRollingCharBuffer.cs index 1a8a799..f5a7513 100644 --- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestRollingCharBuffer.cs +++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestRollingCharBuffer.cs @@ -1,6 +1,7 @@ -// Lucene version compatibility level 4.8.1 +// Lucene version compatibility level 4.8.1 using Lucene.Net.Util; using NUnit.Framework; +using RandomizedTesting.Generators; using System.IO; using Console = Lucene.Net.Util.SystemConsole; diff --git a/src/Lucene.Net.Tests.Classification/ClassificationTestBase.cs b/src/Lucene.Net.Tests.Classification/ClassificationTestBase.cs index b27b8ee..e9d821b 100644 --- a/src/Lucene.Net.Tests.Classification/ClassificationTestBase.cs +++ b/src/Lucene.Net.Tests.Classification/ClassificationTestBase.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Diagnostics; using System.Text; using Lucene.Net.Analysis; @@ -8,6 +8,7 @@ using Lucene.Net.Search; using Lucene.Net.Store; using Lucene.Net.Util; using NUnit.Framework; +using RandomizedTesting.Generators; using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Classification diff --git a/src/Lucene.Net.Tests.Expressions/TestExpressionSorts.cs b/src/Lucene.Net.Tests.Expressions/TestExpressionSorts.cs index a18c030..1a9e22b 100644 --- a/src/Lucene.Net.Tests.Expressions/TestExpressionSorts.cs +++ b/src/Lucene.Net.Tests.Expressions/TestExpressionSorts.cs @@ -1,4 +1,4 @@ -using J2N.Collections.Generic.Extensions; +using J2N.Collections.Generic.Extensions; using Lucene.Net.Documents; using Lucene.Net.Expressions.JS; using Lucene.Net.Index; @@ -7,6 +7,7 @@ using Lucene.Net.Store; using Lucene.Net.Support; using Lucene.Net.Util; using NUnit.Framework; +using RandomizedTesting.Generators; using System.Globalization; namespace Lucene.Net.Expressions diff --git a/src/Lucene.Net.Tests.Facet/FacetTestCase.cs b/src/Lucene.Net.Tests.Facet/FacetTestCase.cs index 6befeff..4da783e 100644 --- a/src/Lucene.Net.Tests.Facet/FacetTestCase.cs +++ b/src/Lucene.Net.Tests.Facet/FacetTestCase.cs @@ -2,6 +2,7 @@ using Lucene.Net.Diagnostics; using Lucene.Net.Support; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using System.Collections.Generic; using Assert = Lucene.Net.TestFramework.Assert; diff --git a/src/Lucene.Net.Tests.Facet/Range/TestRangeFacetCounts.cs b/src/Lucene.Net.Tests.Facet/Range/TestRangeFacetCounts.cs index be755e8..71142ab 100644 --- a/src/Lucene.Net.Tests.Facet/Range/TestRangeFacetCounts.cs +++ b/src/Lucene.Net.Tests.Facet/Range/TestRangeFacetCounts.cs @@ -3,6 +3,7 @@ using J2N.Threading.Atomic; using Lucene.Net.Diagnostics; using Lucene.Net.Search; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using System.Collections; using System.Collections.Generic; diff --git a/src/Lucene.Net.Tests.Facet/SlowRAMDirectory.cs b/src/Lucene.Net.Tests.Facet/SlowRAMDirectory.cs index 0484433..d333fb8 100644 --- a/src/Lucene.Net.Tests.Facet/SlowRAMDirectory.cs +++ b/src/Lucene.Net.Tests.Facet/SlowRAMDirectory.cs @@ -1,4 +1,5 @@ // Lucene version compatibility level 4.8.1 +using RandomizedTesting.Generators; using System; using System.Threading; diff --git a/src/Lucene.Net.Tests.Facet/SortedSet/TestSortedSetDocValuesFacets.cs b/src/Lucene.Net.Tests.Facet/SortedSet/TestSortedSetDocValuesFacets.cs index 69fb35a..1ee9d2d 100644 --- a/src/Lucene.Net.Tests.Facet/SortedSet/TestSortedSetDocValuesFacets.cs +++ b/src/Lucene.Net.Tests.Facet/SortedSet/TestSortedSetDocValuesFacets.cs @@ -1,5 +1,6 @@ // Lucene version compatibility level 4.8.1 using NUnit.Framework; +using RandomizedTesting.Generators; using System; using System.Collections.Generic; using Assert = Lucene.Net.TestFramework.Assert; diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestAddTaxonomy.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestAddTaxonomy.cs index 96b0892..de895d7 100644 --- a/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestAddTaxonomy.cs +++ b/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestAddTaxonomy.cs @@ -2,6 +2,7 @@ using J2N.Threading; using J2N.Threading.Atomic; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using System.Globalization; using System.IO; diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestDirectoryTaxonomyReader.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestDirectoryTaxonomyReader.cs index e76dc9d..3c38fff9 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 @@ // Lucene version compatibility level 4.8.1 using Lucene.Net.Index.Extensions; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using System.Globalization; using Assert = Lucene.Net.TestFramework.Assert; diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts.cs index afc86a5..8858f1b 100644 --- a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts.cs +++ b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts.cs @@ -2,6 +2,7 @@ using Lucene.Net.Index.Extensions; using Lucene.Net.Support.IO; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using System.Collections.Generic; using System.Globalization; diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts2.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts2.cs index fc89050..999e8a2 100644 --- a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts2.cs +++ b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts2.cs @@ -3,6 +3,7 @@ using J2N.Collections.Generic.Extensions; using Lucene.Net.Index; using Lucene.Net.Support; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using System.Collections.Generic; using System.Globalization; diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetSumValueSource.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetSumValueSource.cs index d56e83a..3e7a0bd 100644 --- a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetSumValueSource.cs +++ b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetSumValueSource.cs @@ -1,6 +1,7 @@ // Lucene version compatibility level 4.8.1 using Lucene.Net.Diagnostics; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using System.Collections; using System.Collections.Generic; diff --git a/src/Lucene.Net.Tests.Facet/TestDrillDownQuery.cs b/src/Lucene.Net.Tests.Facet/TestDrillDownQuery.cs index 3824e10..34d1c42 100644 --- a/src/Lucene.Net.Tests.Facet/TestDrillDownQuery.cs +++ b/src/Lucene.Net.Tests.Facet/TestDrillDownQuery.cs @@ -1,5 +1,6 @@ // Lucene version compatibility level 4.8.1 using NUnit.Framework; +using RandomizedTesting.Generators; using System; using Assert = Lucene.Net.TestFramework.Assert; diff --git a/src/Lucene.Net.Tests.Facet/TestDrillSideways.cs b/src/Lucene.Net.Tests.Facet/TestDrillSideways.cs index a00f51b..44478ff 100644 --- a/src/Lucene.Net.Tests.Facet/TestDrillSideways.cs +++ b/src/Lucene.Net.Tests.Facet/TestDrillSideways.cs @@ -5,6 +5,7 @@ using Lucene.Net.Diagnostics; using Lucene.Net.Search; using Lucene.Net.Support; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using System.Collections.Generic; using System.Globalization; diff --git a/src/Lucene.Net.Tests.Facet/TestRandomSamplingFacetsCollector.cs b/src/Lucene.Net.Tests.Facet/TestRandomSamplingFacetsCollector.cs index 4f3f6e0..116d86a 100644 --- a/src/Lucene.Net.Tests.Facet/TestRandomSamplingFacetsCollector.cs +++ b/src/Lucene.Net.Tests.Facet/TestRandomSamplingFacetsCollector.cs @@ -1,5 +1,6 @@ // Lucene version compatibility level 4.8.1 using NUnit.Framework; +using RandomizedTesting.Generators; using System; using System.Globalization; using Assert = Lucene.Net.TestFramework.Assert; diff --git a/src/Lucene.Net.Tests.Join/TestBlockJoin.cs b/src/Lucene.Net.Tests.Join/TestBlockJoin.cs index d7e2fe9..6e0c822 100644 --- a/src/Lucene.Net.Tests.Join/TestBlockJoin.cs +++ b/src/Lucene.Net.Tests.Join/TestBlockJoin.cs @@ -11,6 +11,7 @@ using Lucene.Net.Search.Grouping; using Lucene.Net.Store; using Lucene.Net.Util; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using System.Collections.Generic; using System.Globalization; diff --git a/src/Lucene.Net.Tests.Join/TestBlockJoinSorting.cs b/src/Lucene.Net.Tests.Join/TestBlockJoinSorting.cs index 38aa343..f12137f 100644 --- a/src/Lucene.Net.Tests.Join/TestBlockJoinSorting.cs +++ b/src/Lucene.Net.Tests.Join/TestBlockJoinSorting.cs @@ -8,6 +8,7 @@ using Lucene.Net.Search; using Lucene.Net.Store; using Lucene.Net.Util; using NUnit.Framework; +using RandomizedTesting.Generators; using System.Collections.Generic; namespace Lucene.Net.Tests.Join diff --git a/src/Lucene.Net.Tests.Join/TestBlockJoinValidation.cs b/src/Lucene.Net.Tests.Join/TestBlockJoinValidation.cs index 9d7f6e6..f38f87f 100644 --- a/src/Lucene.Net.Tests.Join/TestBlockJoinValidation.cs +++ b/src/Lucene.Net.Tests.Join/TestBlockJoinValidation.cs @@ -7,6 +7,7 @@ using Lucene.Net.Search; using Lucene.Net.Store; using Lucene.Net.Util; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using System.Collections.Generic; using System.Text; diff --git a/src/Lucene.Net.Tests.Join/TestJoinUtil.cs b/src/Lucene.Net.Tests.Join/TestJoinUtil.cs index 9d0b606..9c984dd 100644 --- a/src/Lucene.Net.Tests.Join/TestJoinUtil.cs +++ b/src/Lucene.Net.Tests.Join/TestJoinUtil.cs @@ -9,6 +9,7 @@ using Lucene.Net.Search; using Lucene.Net.Store; using Lucene.Net.Util; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using System.Collections.Generic; using System.Globalization; diff --git a/src/Lucene.Net.Tests.Misc/Index/Sorter/TestEarlyTermination.cs b/src/Lucene.Net.Tests.Misc/Index/Sorter/TestEarlyTermination.cs index 2750162..19c6032 100644 --- a/src/Lucene.Net.Tests.Misc/Index/Sorter/TestEarlyTermination.cs +++ b/src/Lucene.Net.Tests.Misc/Index/Sorter/TestEarlyTermination.cs @@ -1,11 +1,11 @@ using Lucene.Net.Analysis; using Lucene.Net.Documents; using Lucene.Net.Index.Extensions; -using Lucene.Net.Randomized.Generators; using Lucene.Net.Search; using Lucene.Net.Store; using Lucene.Net.Util; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using System.Collections.Generic; using JCG = J2N.Collections.Generic; diff --git a/src/Lucene.Net.Tests.Misc/Index/Sorter/TestSortingMergePolicy.cs b/src/Lucene.Net.Tests.Misc/Index/Sorter/TestSortingMergePolicy.cs index fd78e13..3bf4a61 100644 --- a/src/Lucene.Net.Tests.Misc/Index/Sorter/TestSortingMergePolicy.cs +++ b/src/Lucene.Net.Tests.Misc/Index/Sorter/TestSortingMergePolicy.cs @@ -1,11 +1,11 @@ using Lucene.Net.Analysis; using Lucene.Net.Documents; using Lucene.Net.Index.Extensions; -using Lucene.Net.Randomized.Generators; using Lucene.Net.Search; using Lucene.Net.Store; using Lucene.Net.Util; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using System.Collections.Generic; using JCG = J2N.Collections.Generic; diff --git a/src/Lucene.Net.Tests.Queries/CommonTermsQueryTest.cs b/src/Lucene.Net.Tests.Queries/CommonTermsQueryTest.cs index 822530e..dbf4a85 100644 --- a/src/Lucene.Net.Tests.Queries/CommonTermsQueryTest.cs +++ b/src/Lucene.Net.Tests.Queries/CommonTermsQueryTest.cs @@ -9,6 +9,7 @@ using Lucene.Net.Search; using Lucene.Net.Store; using Lucene.Net.Util; using NUnit.Framework; +using RandomizedTesting.Generators; using JCG = J2N.Collections.Generic; namespace Lucene.Net.Tests.Queries diff --git a/src/Lucene.Net.Tests.Queries/Function/TestDocValuesFieldSources.cs b/src/Lucene.Net.Tests.Queries/Function/TestDocValuesFieldSources.cs index 9afd780..8c4e6c3 100644 --- a/src/Lucene.Net.Tests.Queries/Function/TestDocValuesFieldSources.cs +++ b/src/Lucene.Net.Tests.Queries/Function/TestDocValuesFieldSources.cs @@ -4,13 +4,14 @@ using Lucene.Net.Documents; using Lucene.Net.Index; using Lucene.Net.Queries.Function; using Lucene.Net.Queries.Function.ValueSources; -using Lucene.Net.Randomized.Generators; using Lucene.Net.Store; using Lucene.Net.Util; using Lucene.Net.Util.Packed; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using System.Globalization; +using RandomInts = RandomizedTesting.Generators.RandomNumbers; namespace Lucene.Net.Tests.Queries.Function { diff --git a/src/Lucene.Net.Tests.Queries/TermsFilterTest.cs b/src/Lucene.Net.Tests.Queries/TermsFilterTest.cs index 660b4b7..f8c51fd 100644 --- a/src/Lucene.Net.Tests.Queries/TermsFilterTest.cs +++ b/src/Lucene.Net.Tests.Queries/TermsFilterTest.cs @@ -12,6 +12,7 @@ using Lucene.Net.Store; using Lucene.Net.Support; using Lucene.Net.Util; using NUnit.Framework; +using RandomizedTesting.Generators; using JCG = J2N.Collections.Generic; namespace Lucene.Net.Tests.Queries diff --git a/src/Lucene.Net.Tests.Spatial/DistanceStrategyTest.cs b/src/Lucene.Net.Tests.Spatial/DistanceStrategyTest.cs index 198f030..9795238 100644 --- a/src/Lucene.Net.Tests.Spatial/DistanceStrategyTest.cs +++ b/src/Lucene.Net.Tests.Spatial/DistanceStrategyTest.cs @@ -1,10 +1,10 @@ -using Lucene.Net.Randomized.Generators; -using Lucene.Net.Spatial.Prefix; +using Lucene.Net.Spatial.Prefix; using Lucene.Net.Spatial.Prefix.Tree; using Lucene.Net.Spatial.Serialized; using Lucene.Net.Spatial.Vector; using Lucene.Net.Support; using NUnit.Framework; +using RandomizedTesting.Generators; using Spatial4n.Core.Context; using Spatial4n.Core.Shapes; using System; diff --git a/src/Lucene.Net.Tests.Spatial/PortedSolr3Test.cs b/src/Lucene.Net.Tests.Spatial/PortedSolr3Test.cs index 2f4059b..e169996 100644 --- a/src/Lucene.Net.Tests.Spatial/PortedSolr3Test.cs +++ b/src/Lucene.Net.Tests.Spatial/PortedSolr3Test.cs @@ -1,10 +1,10 @@ -using Lucene.Net.Randomized.Generators; -using Lucene.Net.Search; +using Lucene.Net.Search; using Lucene.Net.Spatial.Prefix; using Lucene.Net.Spatial.Prefix.Tree; using Lucene.Net.Spatial.Queries; using Lucene.Net.Spatial.Vector; using NUnit.Framework; +using RandomizedTesting.Generators; using Spatial4n.Core.Context; using Spatial4n.Core.Distance; using Spatial4n.Core.Shapes; diff --git a/src/Lucene.Net.Tests.TestFramework/Analysis/TestLookaheadTokenFilter.cs b/src/Lucene.Net.Tests.TestFramework/Analysis/TestLookaheadTokenFilter.cs index a7ae4aa..bcd7e34 100644 --- a/src/Lucene.Net.Tests.TestFramework/Analysis/TestLookaheadTokenFilter.cs +++ b/src/Lucene.Net.Tests.TestFramework/Analysis/TestLookaheadTokenFilter.cs @@ -1,6 +1,7 @@ // Lucene version compatibility level 8.2.0 using System; using Lucene.Net.TestFramework; +using RandomizedTesting.Generators; #if TESTFRAMEWORK_MSTEST using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; diff --git a/src/Lucene.Net.Tests.TestFramework/Analysis/TestMockAnalyzer.cs b/src/Lucene.Net.Tests.TestFramework/Analysis/TestMockAnalyzer.cs index 9777d1a..0100b26 100644 --- a/src/Lucene.Net.Tests.TestFramework/Analysis/TestMockAnalyzer.cs +++ b/src/Lucene.Net.Tests.TestFramework/Analysis/TestMockAnalyzer.cs @@ -5,6 +5,7 @@ using Lucene.Net.Util.Automaton; using System; using System.IO; using Lucene.Net.TestFramework; +using RandomizedTesting.Generators; #if TESTFRAMEWORK_MSTEST using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; diff --git a/src/Lucene.Net.Tests/Analysis/TestLookaheadTokenFilter.cs b/src/Lucene.Net.Tests/Analysis/TestLookaheadTokenFilter.cs index 1a662ea..7e0f89d 100644 --- a/src/Lucene.Net.Tests/Analysis/TestLookaheadTokenFilter.cs +++ b/src/Lucene.Net.Tests/Analysis/TestLookaheadTokenFilter.cs @@ -1,4 +1,5 @@ -using NUnit.Framework; +using NUnit.Framework; +using RandomizedTesting.Generators; using System; namespace Lucene.Net.Analysis diff --git a/src/Lucene.Net.Tests/Analysis/TestMockAnalyzer.cs b/src/Lucene.Net.Tests/Analysis/TestMockAnalyzer.cs index f49f63f..87d03e7 100644 --- a/src/Lucene.Net.Tests/Analysis/TestMockAnalyzer.cs +++ b/src/Lucene.Net.Tests/Analysis/TestMockAnalyzer.cs @@ -1,6 +1,7 @@ -using Lucene.Net.Documents; +using Lucene.Net.Documents; using Lucene.Net.Index; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using System.IO; using Assert = Lucene.Net.TestFramework.Assert; diff --git a/src/Lucene.Net.Tests/Codecs/Compressing/AbstractTestCompressionMode.cs b/src/Lucene.Net.Tests/Codecs/Compressing/AbstractTestCompressionMode.cs index d41a5cd..4abb213 100644 --- a/src/Lucene.Net.Tests/Codecs/Compressing/AbstractTestCompressionMode.cs +++ b/src/Lucene.Net.Tests/Codecs/Compressing/AbstractTestCompressionMode.cs @@ -1,8 +1,9 @@ -using Lucene.Net.Randomized.Generators; -using Lucene.Net.Support; +using Lucene.Net.Support; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using Assert = Lucene.Net.TestFramework.Assert; +using RandomInts = RandomizedTesting.Generators.RandomNumbers; namespace Lucene.Net.Codecs.Compressing { diff --git a/src/Lucene.Net.Tests/Codecs/Compressing/AbstractTestLZ4CompressionMode.cs b/src/Lucene.Net.Tests/Codecs/Compressing/AbstractTestLZ4CompressionMode.cs index 50eb109..ddcb199 100644 --- a/src/Lucene.Net.Tests/Codecs/Compressing/AbstractTestLZ4CompressionMode.cs +++ b/src/Lucene.Net.Tests/Codecs/Compressing/AbstractTestLZ4CompressionMode.cs @@ -1,10 +1,10 @@ using J2N.Numerics; using J2N.Text; -using Lucene.Net.Randomized.Generators; using NUnit.Framework; using System; using System.Text; using Assert = Lucene.Net.TestFramework.Assert; +using RandomInts = RandomizedTesting.Generators.RandomNumbers; 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 fe210da..23e2665 100644 --- a/src/Lucene.Net.Tests/Codecs/Compressing/TestCompressingStoredFieldsFormat.cs +++ b/src/Lucene.Net.Tests/Codecs/Compressing/TestCompressingStoredFieldsFormat.cs @@ -1,10 +1,10 @@ -using Lucene.Net.Documents; +using Lucene.Net.Documents; 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; +using RandomInts = RandomizedTesting.Generators.RandomNumbers; namespace Lucene.Net.Codecs.Compressing { diff --git a/src/Lucene.Net.Tests/Codecs/Lucene40/TestLucene40PostingsReader.cs b/src/Lucene.Net.Tests/Codecs/Lucene40/TestLucene40PostingsReader.cs index e214301..d8d522b 100644 --- a/src/Lucene.Net.Tests/Codecs/Lucene40/TestLucene40PostingsReader.cs +++ b/src/Lucene.Net.Tests/Codecs/Lucene40/TestLucene40PostingsReader.cs @@ -1,8 +1,9 @@ -using J2N.Collections.Generic.Extensions; +using J2N.Collections.Generic.Extensions; using Lucene.Net.Documents; using Lucene.Net.Index; using Lucene.Net.Index.Extensions; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using System.Collections.Generic; using System.Text; diff --git a/src/Lucene.Net.Tests/Codecs/Lucene40/TestReuseDocsEnum.cs b/src/Lucene.Net.Tests/Codecs/Lucene40/TestReuseDocsEnum.cs index 19bbec2..9ceac85 100644 --- a/src/Lucene.Net.Tests/Codecs/Lucene40/TestReuseDocsEnum.cs +++ b/src/Lucene.Net.Tests/Codecs/Lucene40/TestReuseDocsEnum.cs @@ -1,7 +1,8 @@ -using J2N.Runtime.CompilerServices; +using J2N.Runtime.CompilerServices; using Lucene.Net.Index; using Lucene.Net.Index.Extensions; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using System.Collections.Generic; using Assert = Lucene.Net.TestFramework.Assert; diff --git a/src/Lucene.Net.Tests/Codecs/Lucene41/TestBlockPostingsFormat3.cs b/src/Lucene.Net.Tests/Codecs/Lucene41/TestBlockPostingsFormat3.cs index 52c58e6..214ab67 100644 --- a/src/Lucene.Net.Tests/Codecs/Lucene41/TestBlockPostingsFormat3.cs +++ b/src/Lucene.Net.Tests/Codecs/Lucene41/TestBlockPostingsFormat3.cs @@ -1,4 +1,4 @@ -using J2N.Collections.Generic.Extensions; +using J2N.Collections.Generic.Extensions; using Lucene.Net.Analysis; using Lucene.Net.Diagnostics; using Lucene.Net.Documents; @@ -6,6 +6,7 @@ using Lucene.Net.Index; using Lucene.Net.Index.Extensions; using Lucene.Net.Util.Automaton; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using System.Collections.Generic; using Assert = Lucene.Net.TestFramework.Assert; diff --git a/src/Lucene.Net.Tests/Codecs/Lucene41/TestForUtil.cs b/src/Lucene.Net.Tests/Codecs/Lucene41/TestForUtil.cs index 15234c0..f031046 100644 --- a/src/Lucene.Net.Tests/Codecs/Lucene41/TestForUtil.cs +++ b/src/Lucene.Net.Tests/Codecs/Lucene41/TestForUtil.cs @@ -1,7 +1,8 @@ -using Lucene.Net.Randomized.Generators; -using Lucene.Net.Support; +using Lucene.Net.Support; using NUnit.Framework; +using RandomizedTesting.Generators; using Assert = Lucene.Net.TestFramework.Assert; +using RandomInts = RandomizedTesting.Generators.RandomNumbers; namespace Lucene.Net.Codecs.Lucene41 { diff --git a/src/Lucene.Net.Tests/Codecs/PerField/TestPerFieldPostingsFormat2.cs b/src/Lucene.Net.Tests/Codecs/PerField/TestPerFieldPostingsFormat2.cs index c1fde4f..5eb0e1a 100644 --- a/src/Lucene.Net.Tests/Codecs/PerField/TestPerFieldPostingsFormat2.cs +++ b/src/Lucene.Net.Tests/Codecs/PerField/TestPerFieldPostingsFormat2.cs @@ -1,4 +1,4 @@ -using Lucene.Net.Analysis; +using Lucene.Net.Analysis; using Lucene.Net.Documents; using Lucene.Net.Codecs.Lucene41; using Lucene.Net.Codecs.Lucene46; @@ -14,6 +14,7 @@ using NUnit.Framework; using System; using Assert = Lucene.Net.TestFramework.Assert; using Console = Lucene.Net.Util.SystemConsole; +using RandomizedTesting.Generators; namespace Lucene.Net.Codecs.PerField { diff --git a/src/Lucene.Net.Tests/Index/Test4GBStoredFields.cs b/src/Lucene.Net.Tests/Index/Test4GBStoredFields.cs index 731fcd4..3025d08 100644 --- a/src/Lucene.Net.Tests/Index/Test4GBStoredFields.cs +++ b/src/Lucene.Net.Tests/Index/Test4GBStoredFields.cs @@ -1,12 +1,12 @@ using Lucene.Net.Documents; using Lucene.Net.Index.Extensions; -using Lucene.Net.Randomized.Generators; 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; +using RandomInts = RandomizedTesting.Generators.RandomNumbers; namespace Lucene.Net.Index { diff --git a/src/Lucene.Net.Tests/Index/TestBackwardsCompatibility.cs b/src/Lucene.Net.Tests/Index/TestBackwardsCompatibility.cs index d37a8f2..a762f3a 100644 --- a/src/Lucene.Net.Tests/Index/TestBackwardsCompatibility.cs +++ b/src/Lucene.Net.Tests/Index/TestBackwardsCompatibility.cs @@ -4,6 +4,7 @@ using J2N.Numerics; using Lucene.Net.Diagnostics; using Lucene.Net.Index.Extensions; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using System.Collections.Generic; using System.IO; diff --git a/src/Lucene.Net.Tests/Index/TestBackwardsCompatibility3x.cs b/src/Lucene.Net.Tests/Index/TestBackwardsCompatibility3x.cs index 5a8604a..ec17dff 100644 --- a/src/Lucene.Net.Tests/Index/TestBackwardsCompatibility3x.cs +++ b/src/Lucene.Net.Tests/Index/TestBackwardsCompatibility3x.cs @@ -3,6 +3,7 @@ using J2N.Numerics; using Lucene.Net.Diagnostics; using Lucene.Net.Index.Extensions; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using System.Collections.Generic; using System.IO; diff --git a/src/Lucene.Net.Tests/Index/TestBagOfPositions.cs b/src/Lucene.Net.Tests/Index/TestBagOfPositions.cs index 8e36ab4..35b838d 100644 --- a/src/Lucene.Net.Tests/Index/TestBagOfPositions.cs +++ b/src/Lucene.Net.Tests/Index/TestBagOfPositions.cs @@ -1,7 +1,8 @@ -using J2N.Collections.Generic.Extensions; +using J2N.Collections.Generic.Extensions; using J2N.Threading; using Lucene.Net.Documents; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using System.Collections.Concurrent; using System.Collections.Generic; diff --git a/src/Lucene.Net.Tests/Index/TestBinaryDocValuesUpdates.cs b/src/Lucene.Net.Tests/Index/TestBinaryDocValuesUpdates.cs index 6148f47..7391e07 100644 --- a/src/Lucene.Net.Tests/Index/TestBinaryDocValuesUpdates.cs +++ b/src/Lucene.Net.Tests/Index/TestBinaryDocValuesUpdates.cs @@ -8,11 +8,11 @@ using Lucene.Net.Facet; using Lucene.Net.Facet.Taxonomy; using Lucene.Net.Facet.Taxonomy.Directory; using Lucene.Net.Index.Extensions; -using Lucene.Net.Randomized.Generators; using Lucene.Net.Search; using Lucene.Net.Store; using Lucene.Net.Support; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using System.Collections.Generic; using System.IO; diff --git a/src/Lucene.Net.Tests/Index/TestByteSlices.cs b/src/Lucene.Net.Tests/Index/TestByteSlices.cs index d3b9329..972129a 100644 --- a/src/Lucene.Net.Tests/Index/TestByteSlices.cs +++ b/src/Lucene.Net.Tests/Index/TestByteSlices.cs @@ -1,4 +1,5 @@ -using NUnit.Framework; +using NUnit.Framework; +using RandomizedTesting.Generators; using System; using Assert = Lucene.Net.TestFramework.Assert; using Console = Lucene.Net.Util.SystemConsole; diff --git a/src/Lucene.Net.Tests/Index/TestConcurrentMergeScheduler.cs b/src/Lucene.Net.Tests/Index/TestConcurrentMergeScheduler.cs index 120f7c3..94f2d62 100644 --- a/src/Lucene.Net.Tests/Index/TestConcurrentMergeScheduler.cs +++ b/src/Lucene.Net.Tests/Index/TestConcurrentMergeScheduler.cs @@ -5,6 +5,7 @@ using Lucene.Net.Index.Extensions; using Lucene.Net.Store; using Lucene.Net.Util; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using System.IO; using System.Threading; diff --git a/src/Lucene.Net.Tests/Index/TestConsistentFieldNumbers.cs b/src/Lucene.Net.Tests/Index/TestConsistentFieldNumbers.cs index 558aa84..75251af 100644 --- a/src/Lucene.Net.Tests/Index/TestConsistentFieldNumbers.cs +++ b/src/Lucene.Net.Tests/Index/TestConsistentFieldNumbers.cs @@ -1,8 +1,9 @@ -using System; +using System; using Lucene.Net.Documents; using Lucene.Net.Index.Extensions; using Lucene.Net.Support; using NUnit.Framework; +using RandomizedTesting.Generators; 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 d02467a..95abf11 100644 --- a/src/Lucene.Net.Tests/Index/TestDocValuesWithThreads.cs +++ b/src/Lucene.Net.Tests/Index/TestDocValuesWithThreads.cs @@ -1,4 +1,4 @@ -using J2N.Threading; +using J2N.Threading; using Lucene.Net.Documents; using Lucene.Net.Index.Extensions; using Lucene.Net.Search; @@ -10,6 +10,7 @@ using System.Threading; using JCG = J2N.Collections.Generic; using Assert = Lucene.Net.TestFramework.Assert; using Console = Lucene.Net.Util.SystemConsole; +using RandomizedTesting.Generators; namespace Lucene.Net.Index { diff --git a/src/Lucene.Net.Tests/Index/TestDocsAndPositions.cs b/src/Lucene.Net.Tests/Index/TestDocsAndPositions.cs index 4faf72d..e343094 100644 --- a/src/Lucene.Net.Tests/Index/TestDocsAndPositions.cs +++ b/src/Lucene.Net.Tests/Index/TestDocsAndPositions.cs @@ -1,6 +1,7 @@ -using Lucene.Net.Documents; +using Lucene.Net.Documents; using Lucene.Net.Index.Extensions; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using System.Collections.Generic; using System.Text; diff --git a/src/Lucene.Net.Tests/Index/TestDocumentsWriterStallControl.cs b/src/Lucene.Net.Tests/Index/TestDocumentsWriterStallControl.cs index 8b3c3b5..ab89514 100644 --- a/src/Lucene.Net.Tests/Index/TestDocumentsWriterStallControl.cs +++ b/src/Lucene.Net.Tests/Index/TestDocumentsWriterStallControl.cs @@ -1,6 +1,7 @@ -using J2N.Threading; +using J2N.Threading; using J2N.Threading.Atomic; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using System.Collections.Generic; using System.Threading; diff --git a/src/Lucene.Net.Tests/Index/TestExceedMaxTermLength.cs b/src/Lucene.Net.Tests/Index/TestExceedMaxTermLength.cs index 5f9c534..ce85fac 100644 --- a/src/Lucene.Net.Tests/Index/TestExceedMaxTermLength.cs +++ b/src/Lucene.Net.Tests/Index/TestExceedMaxTermLength.cs @@ -1,5 +1,6 @@ -using Lucene.Net.Documents; +using Lucene.Net.Documents; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using Assert = Lucene.Net.TestFramework.Assert; diff --git a/src/Lucene.Net.Tests/Index/TestIndexReaderClose.cs b/src/Lucene.Net.Tests/Index/TestIndexReaderClose.cs index 57c52af..49cb950 100644 --- a/src/Lucene.Net.Tests/Index/TestIndexReaderClose.cs +++ b/src/Lucene.Net.Tests/Index/TestIndexReaderClose.cs @@ -1,5 +1,6 @@ -using J2N.Threading.Atomic; +using J2N.Threading.Atomic; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using System.Collections.Generic; using Assert = Lucene.Net.TestFramework.Assert; diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriter.cs b/src/Lucene.Net.Tests/Index/TestIndexWriter.cs index ac8d91a..46efc40 100644 --- a/src/Lucene.Net.Tests/Index/TestIndexWriter.cs +++ b/src/Lucene.Net.Tests/Index/TestIndexWriter.cs @@ -11,6 +11,7 @@ using Lucene.Net.Search; using Lucene.Net.Support; using Lucene.Net.Util; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using System.Collections.Generic; using System.IO; diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterCommit.cs b/src/Lucene.Net.Tests/Index/TestIndexWriterCommit.cs index 33155f1..7ea3c1f 100644 --- a/src/Lucene.Net.Tests/Index/TestIndexWriterCommit.cs +++ b/src/Lucene.Net.Tests/Index/TestIndexWriterCommit.cs @@ -1,9 +1,10 @@ -using J2N.Threading; +using J2N.Threading; using J2N.Threading.Atomic; using Lucene.Net.Analysis; using Lucene.Net.Documents; using Lucene.Net.Index.Extensions; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using System.Collections.Generic; using Assert = Lucene.Net.TestFramework.Assert; diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterDelete.cs b/src/Lucene.Net.Tests/Index/TestIndexWriterDelete.cs index 3f38404..695b0a0 100644 --- a/src/Lucene.Net.Tests/Index/TestIndexWriterDelete.cs +++ b/src/Lucene.Net.Tests/Index/TestIndexWriterDelete.cs @@ -8,6 +8,7 @@ using Lucene.Net.Store; using Lucene.Net.Support.IO; using Lucene.Net.Util; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using System.Collections.Generic; using System.IO; diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterExceptions.cs b/src/Lucene.Net.Tests/Index/TestIndexWriterExceptions.cs index f82f31e..65e1630 100644 --- a/src/Lucene.Net.Tests/Index/TestIndexWriterExceptions.cs +++ b/src/Lucene.Net.Tests/Index/TestIndexWriterExceptions.cs @@ -9,6 +9,7 @@ using Lucene.Net.Store; using Lucene.Net.Support; using Lucene.Net.Util; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using System.Collections.Generic; using System.IO; diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterNRTIsCurrent.cs b/src/Lucene.Net.Tests/Index/TestIndexWriterNRTIsCurrent.cs index 925a5bc..166c84f 100644 --- a/src/Lucene.Net.Tests/Index/TestIndexWriterNRTIsCurrent.cs +++ b/src/Lucene.Net.Tests/Index/TestIndexWriterNRTIsCurrent.cs @@ -1,6 +1,7 @@ -using J2N.Threading; +using J2N.Threading; using Lucene.Net.Documents; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using System.IO; using System.Threading; diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterOutOfFileDescriptors.cs b/src/Lucene.Net.Tests/Index/TestIndexWriterOutOfFileDescriptors.cs index 441a468..a2e1a93 100644 --- a/src/Lucene.Net.Tests/Index/TestIndexWriterOutOfFileDescriptors.cs +++ b/src/Lucene.Net.Tests/Index/TestIndexWriterOutOfFileDescriptors.cs @@ -1,10 +1,11 @@ -using System; +using System; using System.Collections.Generic; using System.IO; using NUnit.Framework; using JCG = J2N.Collections.Generic; using Assert = Lucene.Net.TestFramework.Assert; using Console = Lucene.Net.Util.SystemConsole; +using RandomizedTesting.Generators; namespace Lucene.Net.Index { diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterReader.cs b/src/Lucene.Net.Tests/Index/TestIndexWriterReader.cs index 20a1fb0..fa7c92c 100644 --- a/src/Lucene.Net.Tests/Index/TestIndexWriterReader.cs +++ b/src/Lucene.Net.Tests/Index/TestIndexWriterReader.cs @@ -6,6 +6,7 @@ using Lucene.Net.Index.Extensions; using Lucene.Net.Store; using Lucene.Net.Util; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using System.Collections.Concurrent; using System.Collections.Generic; diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterUnicode.cs b/src/Lucene.Net.Tests/Index/TestIndexWriterUnicode.cs index a73a486..c284e27 100644 --- a/src/Lucene.Net.Tests/Index/TestIndexWriterUnicode.cs +++ b/src/Lucene.Net.Tests/Index/TestIndexWriterUnicode.cs @@ -1,7 +1,8 @@ -using J2N.Text; +using J2N.Text; using Lucene.Net.Documents; using Lucene.Net.Util; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using System.Collections.Generic; using System.Text; diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterWithThreads.cs b/src/Lucene.Net.Tests/Index/TestIndexWriterWithThreads.cs index 0fb7708..fc3fc5f 100644 --- a/src/Lucene.Net.Tests/Index/TestIndexWriterWithThreads.cs +++ b/src/Lucene.Net.Tests/Index/TestIndexWriterWithThreads.cs @@ -7,6 +7,7 @@ using Lucene.Net.Store; using Lucene.Net.Support.Threading; using Lucene.Net.Util; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using System.IO; using System.Threading; diff --git a/src/Lucene.Net.Tests/Index/TestIntBlockPool.cs b/src/Lucene.Net.Tests/Index/TestIntBlockPool.cs index 8767e8f..a806000 100644 --- a/src/Lucene.Net.Tests/Index/TestIntBlockPool.cs +++ b/src/Lucene.Net.Tests/Index/TestIntBlockPool.cs @@ -1,4 +1,5 @@ -using NUnit.Framework; +using NUnit.Framework; +using RandomizedTesting.Generators; using System.Collections.Generic; using Assert = Lucene.Net.TestFramework.Assert; diff --git a/src/Lucene.Net.Tests/Index/TestLongPostings.cs b/src/Lucene.Net.Tests/Index/TestLongPostings.cs index 4ffecfa..57f5afb 100644 --- a/src/Lucene.Net.Tests/Index/TestLongPostings.cs +++ b/src/Lucene.Net.Tests/Index/TestLongPostings.cs @@ -1,8 +1,9 @@ -using Lucene.Net.Analysis.TokenAttributes; +using Lucene.Net.Analysis.TokenAttributes; using Lucene.Net.Diagnostics; using Lucene.Net.Documents; using Lucene.Net.Index.Extensions; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using System.IO; using Assert = Lucene.Net.TestFramework.Assert; diff --git a/src/Lucene.Net.Tests/Index/TestMixedCodecs.cs b/src/Lucene.Net.Tests/Index/TestMixedCodecs.cs index 0bee4b7..48ccd44 100644 --- a/src/Lucene.Net.Tests/Index/TestMixedCodecs.cs +++ b/src/Lucene.Net.Tests/Index/TestMixedCodecs.cs @@ -1,4 +1,4 @@ -using Lucene.Net.Documents; +using Lucene.Net.Documents; using Lucene.Net.Index.Extensions; using NUnit.Framework; using System; @@ -6,6 +6,7 @@ using System.Collections.Generic; using JCG = J2N.Collections.Generic; using Assert = Lucene.Net.TestFramework.Assert; using Console = Lucene.Net.Util.SystemConsole; +using RandomizedTesting.Generators; namespace Lucene.Net.Index { diff --git a/src/Lucene.Net.Tests/Index/TestMixedDocValuesUpdates.cs b/src/Lucene.Net.Tests/Index/TestMixedDocValuesUpdates.cs index 61a7417..8254664 100644 --- a/src/Lucene.Net.Tests/Index/TestMixedDocValuesUpdates.cs +++ b/src/Lucene.Net.Tests/Index/TestMixedDocValuesUpdates.cs @@ -1,10 +1,10 @@ -using J2N.Threading; +using J2N.Threading; using J2N.Threading.Atomic; using Lucene.Net.Documents; using Lucene.Net.Index.Extensions; -using Lucene.Net.Randomized.Generators; using Lucene.Net.Support; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using System.Collections.Generic; using System.IO; diff --git a/src/Lucene.Net.Tests/Index/TestMultiDocValues.cs b/src/Lucene.Net.Tests/Index/TestMultiDocValues.cs index a929ff0..f7c2377 100644 --- a/src/Lucene.Net.Tests/Index/TestMultiDocValues.cs +++ b/src/Lucene.Net.Tests/Index/TestMultiDocValues.cs @@ -1,6 +1,7 @@ -using Lucene.Net.Documents; +using Lucene.Net.Documents; using Lucene.Net.Index.Extensions; using NUnit.Framework; +using RandomizedTesting.Generators; using System.Collections.Generic; using Assert = Lucene.Net.TestFramework.Assert; diff --git a/src/Lucene.Net.Tests/Index/TestMultiFields.cs b/src/Lucene.Net.Tests/Index/TestMultiFields.cs index 52ef84a..380d52c 100644 --- a/src/Lucene.Net.Tests/Index/TestMultiFields.cs +++ b/src/Lucene.Net.Tests/Index/TestMultiFields.cs @@ -1,4 +1,4 @@ -using Lucene.Net.Analysis; +using Lucene.Net.Analysis; using Lucene.Net.Documents; using Lucene.Net.Index.Extensions; using Lucene.Net.Store; @@ -9,6 +9,7 @@ using System.Collections.Generic; using JCG = J2N.Collections.Generic; using Assert = Lucene.Net.TestFramework.Assert; using Console = Lucene.Net.Util.SystemConsole; +using RandomizedTesting.Generators; namespace Lucene.Net.Index { diff --git a/src/Lucene.Net.Tests/Index/TestNRTThreads.cs b/src/Lucene.Net.Tests/Index/TestNRTThreads.cs index 9a7916d..abd75f3 100644 --- a/src/Lucene.Net.Tests/Index/TestNRTThreads.cs +++ b/src/Lucene.Net.Tests/Index/TestNRTThreads.cs @@ -1,5 +1,6 @@ -using Lucene.Net.Diagnostics; +using Lucene.Net.Diagnostics; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using System.Collections.Generic; using System.Threading.Tasks; diff --git a/src/Lucene.Net.Tests/Index/TestNoMergeScheduler.cs b/src/Lucene.Net.Tests/Index/TestNoMergeScheduler.cs index e49e65b..403ccb0 100644 --- a/src/Lucene.Net.Tests/Index/TestNoMergeScheduler.cs +++ b/src/Lucene.Net.Tests/Index/TestNoMergeScheduler.cs @@ -1,6 +1,6 @@ -using Lucene.Net.Randomized.Generators; -using Lucene.Net.Support; +using Lucene.Net.Support; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using System.Reflection; using Assert = Lucene.Net.TestFramework.Assert; diff --git a/src/Lucene.Net.Tests/Index/TestNumericDocValuesUpdates.cs b/src/Lucene.Net.Tests/Index/TestNumericDocValuesUpdates.cs index afd0ffc..db654d5 100644 --- a/src/Lucene.Net.Tests/Index/TestNumericDocValuesUpdates.cs +++ b/src/Lucene.Net.Tests/Index/TestNumericDocValuesUpdates.cs @@ -1,10 +1,10 @@ -using J2N.Threading; +using J2N.Threading; using J2N.Threading.Atomic; using Lucene.Net.Documents; using Lucene.Net.Index.Extensions; -using Lucene.Net.Randomized.Generators; using Lucene.Net.Support; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using System.Collections.Generic; using System.IO; diff --git a/src/Lucene.Net.Tests/Index/TestOmitNorms.cs b/src/Lucene.Net.Tests/Index/TestOmitNorms.cs index 0710432..c026157 100644 --- a/src/Lucene.Net.Tests/Index/TestOmitNorms.cs +++ b/src/Lucene.Net.Tests/Index/TestOmitNorms.cs @@ -1,6 +1,7 @@ -using Lucene.Net.Documents; +using Lucene.Net.Documents; using Lucene.Net.Index.Extensions; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using Assert = Lucene.Net.TestFramework.Assert; diff --git a/src/Lucene.Net.Tests/Index/TestOmitPositions.cs b/src/Lucene.Net.Tests/Index/TestOmitPositions.cs index b2a0d41..9834cbe 100644 --- a/src/Lucene.Net.Tests/Index/TestOmitPositions.cs +++ b/src/Lucene.Net.Tests/Index/TestOmitPositions.cs @@ -1,6 +1,7 @@ -using Lucene.Net.Documents; +using Lucene.Net.Documents; using Lucene.Net.Index.Extensions; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using Assert = Lucene.Net.TestFramework.Assert; diff --git a/src/Lucene.Net.Tests/Index/TestParallelAtomicReader.cs b/src/Lucene.Net.Tests/Index/TestParallelAtomicReader.cs index 1c0aa21..3a86f62 100644 --- a/src/Lucene.Net.Tests/Index/TestParallelAtomicReader.cs +++ b/src/Lucene.Net.Tests/Index/TestParallelAtomicReader.cs @@ -1,6 +1,7 @@ -using Lucene.Net.Documents; +using Lucene.Net.Documents; using Lucene.Net.Search; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using Assert = Lucene.Net.TestFramework.Assert; diff --git a/src/Lucene.Net.Tests/Index/TestParallelCompositeReader.cs b/src/Lucene.Net.Tests/Index/TestParallelCompositeReader.cs index f11c545..bae4c99 100644 --- a/src/Lucene.Net.Tests/Index/TestParallelCompositeReader.cs +++ b/src/Lucene.Net.Tests/Index/TestParallelCompositeReader.cs @@ -1,7 +1,8 @@ -using Lucene.Net.Documents; +using Lucene.Net.Documents; using Lucene.Net.Index.Extensions; using Lucene.Net.Search; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using Assert = Lucene.Net.TestFramework.Assert; diff --git a/src/Lucene.Net.Tests/Index/TestPayloadsOnVectors.cs b/src/Lucene.Net.Tests/Index/TestPayloadsOnVectors.cs index f026bf1..7460630 100644 --- a/src/Lucene.Net.Tests/Index/TestPayloadsOnVectors.cs +++ b/src/Lucene.Net.Tests/Index/TestPayloadsOnVectors.cs @@ -1,8 +1,9 @@ -using Lucene.Net.Analysis.TokenAttributes; +using Lucene.Net.Analysis.TokenAttributes; using Lucene.Net.Diagnostics; using Lucene.Net.Documents; using Lucene.Net.Index.Extensions; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using System.IO; using Assert = Lucene.Net.TestFramework.Assert; diff --git a/src/Lucene.Net.Tests/Index/TestPostingsOffsets.cs b/src/Lucene.Net.Tests/Index/TestPostingsOffsets.cs index b8f3622..1641915 100644 --- a/src/Lucene.Net.Tests/Index/TestPostingsOffsets.cs +++ b/src/Lucene.Net.Tests/Index/TestPostingsOffsets.cs @@ -1,9 +1,10 @@ -using J2N.Collections.Generic.Extensions; +using J2N.Collections.Generic.Extensions; using Lucene.Net.Diagnostics; using Lucene.Net.Documents; using Lucene.Net.Index.Extensions; using Lucene.Net.Search; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using System.Collections.Generic; using System.Linq; diff --git a/src/Lucene.Net.Tests/Index/TestRollingUpdates.cs b/src/Lucene.Net.Tests/Index/TestRollingUpdates.cs index 5092583..825a990 100644 --- a/src/Lucene.Net.Tests/Index/TestRollingUpdates.cs +++ b/src/Lucene.Net.Tests/Index/TestRollingUpdates.cs @@ -1,10 +1,11 @@ -using J2N.Threading; +using J2N.Threading; using Lucene.Net.Codecs.Memory; using Lucene.Net.Documents; using Lucene.Net.Index.Extensions; using Lucene.Net.Store; using Lucene.Net.Util; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using Assert = Lucene.Net.TestFramework.Assert; using Console = Lucene.Net.Util.SystemConsole; diff --git a/src/Lucene.Net.Tests/Index/TestStressIndexing2.cs b/src/Lucene.Net.Tests/Index/TestStressIndexing2.cs index 4624df4..bbd6ef0 100644 --- a/src/Lucene.Net.Tests/Index/TestStressIndexing2.cs +++ b/src/Lucene.Net.Tests/Index/TestStressIndexing2.cs @@ -9,6 +9,7 @@ using Lucene.Net.Index.Extensions; using Lucene.Net.Support; using Lucene.Net.Util; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using System.Collections.Generic; using System.Globalization; diff --git a/src/Lucene.Net.Tests/Index/TestStressNRT.cs b/src/Lucene.Net.Tests/Index/TestStressNRT.cs index 6590b7b..c396928 100644 --- a/src/Lucene.Net.Tests/Index/TestStressNRT.cs +++ b/src/Lucene.Net.Tests/Index/TestStressNRT.cs @@ -1,9 +1,10 @@ -using J2N.Threading; +using J2N.Threading; using J2N.Threading.Atomic; using Lucene.Net.Diagnostics; using Lucene.Net.Documents; using Lucene.Net.Support; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using System.Collections.Concurrent; using System.Collections.Generic; diff --git a/src/Lucene.Net.Tests/Index/TestTermsEnum.cs b/src/Lucene.Net.Tests/Index/TestTermsEnum.cs index 4180f80..80bde48 100644 --- a/src/Lucene.Net.Tests/Index/TestTermsEnum.cs +++ b/src/Lucene.Net.Tests/Index/TestTermsEnum.cs @@ -1,9 +1,10 @@ -using Lucene.Net.Diagnostics; +using Lucene.Net.Diagnostics; using Lucene.Net.Documents; using Lucene.Net.Index.Extensions; using Lucene.Net.Search; using Lucene.Net.Util.Automaton; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using System.Collections.Generic; using Assert = Lucene.Net.TestFramework.Assert; diff --git a/src/Lucene.Net.Tests/Index/TestTermsEnum2.cs b/src/Lucene.Net.Tests/Index/TestTermsEnum2.cs index bad12a2..db1bb76 100644 --- a/src/Lucene.Net.Tests/Index/TestTermsEnum2.cs +++ b/src/Lucene.Net.Tests/Index/TestTermsEnum2.cs @@ -1,8 +1,9 @@ -using J2N.Collections.Generic.Extensions; +using J2N.Collections.Generic.Extensions; using Lucene.Net.Documents; using Lucene.Net.Index.Extensions; using Lucene.Net.Util.Automaton; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using System.Collections.Generic; using Assert = Lucene.Net.TestFramework.Assert; diff --git a/src/Lucene.Net.Tests/Index/TestTryDelete.cs b/src/Lucene.Net.Tests/Index/TestTryDelete.cs index 8d09411..52e0e1c 100644 --- a/src/Lucene.Net.Tests/Index/TestTryDelete.cs +++ b/src/Lucene.Net.Tests/Index/TestTryDelete.cs @@ -1,8 +1,9 @@ -using System; +using System; using Lucene.Net.Documents; using Lucene.Net.Index.Extensions; using Lucene.Net.Search; using NUnit.Framework; +using RandomizedTesting.Generators; using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Index diff --git a/src/Lucene.Net.Tests/Index/TestTwoPhaseCommitTool.cs b/src/Lucene.Net.Tests/Index/TestTwoPhaseCommitTool.cs index 6e45989..35ff0ce 100644 --- a/src/Lucene.Net.Tests/Index/TestTwoPhaseCommitTool.cs +++ b/src/Lucene.Net.Tests/Index/TestTwoPhaseCommitTool.cs @@ -1,4 +1,5 @@ -using NUnit.Framework; +using NUnit.Framework; +using RandomizedTesting.Generators; using System; using System.Collections.Generic; using System.IO; diff --git a/src/Lucene.Net.Tests/Search/TestBoolean2.cs b/src/Lucene.Net.Tests/Search/TestBoolean2.cs index 2da3b2d..20bde96 100644 --- a/src/Lucene.Net.Tests/Search/TestBoolean2.cs +++ b/src/Lucene.Net.Tests/Search/TestBoolean2.cs @@ -1,6 +1,7 @@ using Lucene.Net.Documents; using Lucene.Net.Index.Extensions; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using Assert = Lucene.Net.TestFramework.Assert; using Console = Lucene.Net.Util.SystemConsole; diff --git a/src/Lucene.Net.Tests/Search/TestBooleanMinShouldMatch.cs b/src/Lucene.Net.Tests/Search/TestBooleanMinShouldMatch.cs index 5a0746c..b5d3953 100644 --- a/src/Lucene.Net.Tests/Search/TestBooleanMinShouldMatch.cs +++ b/src/Lucene.Net.Tests/Search/TestBooleanMinShouldMatch.cs @@ -1,7 +1,8 @@ -using System; +using System; using System.Globalization; using Lucene.Net.Documents; using NUnit.Framework; +using RandomizedTesting.Generators; using Assert = Lucene.Net.TestFramework.Assert; using Console = Lucene.Net.Util.SystemConsole; diff --git a/src/Lucene.Net.Tests/Search/TestControlledRealTimeReopenThread.cs b/src/Lucene.Net.Tests/Search/TestControlledRealTimeReopenThread.cs index ffe0131..01f7d15 100644 --- a/src/Lucene.Net.Tests/Search/TestControlledRealTimeReopenThread.cs +++ b/src/Lucene.Net.Tests/Search/TestControlledRealTimeReopenThread.cs @@ -3,6 +3,7 @@ using J2N.Threading.Atomic; using Lucene.Net.Index.Extensions; using Lucene.Net.Util; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using System.Collections.Generic; using System.Linq; diff --git a/src/Lucene.Net.Tests/Search/TestDocTermOrdsRangeFilter.cs b/src/Lucene.Net.Tests/Search/TestDocTermOrdsRangeFilter.cs index 86fb0fa..3d701f4 100644 --- a/src/Lucene.Net.Tests/Search/TestDocTermOrdsRangeFilter.cs +++ b/src/Lucene.Net.Tests/Search/TestDocTermOrdsRangeFilter.cs @@ -1,6 +1,7 @@ -using Lucene.Net.Documents; +using Lucene.Net.Documents; using Lucene.Net.Index.Extensions; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using System.Collections.Generic; using Console = Lucene.Net.Util.SystemConsole; diff --git a/src/Lucene.Net.Tests/Search/TestDocTermOrdsRewriteMethod.cs b/src/Lucene.Net.Tests/Search/TestDocTermOrdsRewriteMethod.cs index 5df09a8..622e9f3 100644 --- a/src/Lucene.Net.Tests/Search/TestDocTermOrdsRewriteMethod.cs +++ b/src/Lucene.Net.Tests/Search/TestDocTermOrdsRewriteMethod.cs @@ -2,6 +2,7 @@ using Lucene.Net.Index.Extensions; using Lucene.Net.Util.Automaton; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using System.Collections.Generic; using Assert = Lucene.Net.TestFramework.Assert; diff --git a/src/Lucene.Net.Tests/Search/TestEarlyTermination.cs b/src/Lucene.Net.Tests/Search/TestEarlyTermination.cs index 431f29b..5d1a487 100644 --- a/src/Lucene.Net.Tests/Search/TestEarlyTermination.cs +++ b/src/Lucene.Net.Tests/Search/TestEarlyTermination.cs @@ -1,4 +1,5 @@ -using NUnit.Framework; +using NUnit.Framework; +using RandomizedTesting.Generators; 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 30086c0..81a4f6e 100644 --- a/src/Lucene.Net.Tests/Search/TestFieldCache.cs +++ b/src/Lucene.Net.Tests/Search/TestFieldCache.cs @@ -1,10 +1,11 @@ -using J2N.Threading; +using J2N.Threading; using J2N.Threading.Atomic; using Lucene.Net.Diagnostics; using Lucene.Net.Index.Extensions; using Lucene.Net.Support; using Lucene.Net.Util; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using System.Collections.Generic; using System.Globalization; diff --git a/src/Lucene.Net.Tests/Search/TestFieldValueFilter.cs b/src/Lucene.Net.Tests/Search/TestFieldValueFilter.cs index 31837c2..753332e 100644 --- a/src/Lucene.Net.Tests/Search/TestFieldValueFilter.cs +++ b/src/Lucene.Net.Tests/Search/TestFieldValueFilter.cs @@ -1,5 +1,6 @@ -using Lucene.Net.Documents; +using Lucene.Net.Documents; using NUnit.Framework; +using RandomizedTesting.Generators; using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Search diff --git a/src/Lucene.Net.Tests/Search/TestFilteredQuery.cs b/src/Lucene.Net.Tests/Search/TestFilteredQuery.cs index 416733f..9fe12bb 100644 --- a/src/Lucene.Net.Tests/Search/TestFilteredQuery.cs +++ b/src/Lucene.Net.Tests/Search/TestFilteredQuery.cs @@ -1,7 +1,8 @@ -using Lucene.Net.Documents; +using Lucene.Net.Documents; using Lucene.Net.Index.Extensions; using Lucene.Net.Util; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using Assert = Lucene.Net.TestFramework.Assert; using BitSet = J2N.Collections.BitSet; diff --git a/src/Lucene.Net.Tests/Search/TestQueryRescorer.cs b/src/Lucene.Net.Tests/Search/TestQueryRescorer.cs index 6d1a4d0..a23ff7e 100644 --- a/src/Lucene.Net.Tests/Search/TestQueryRescorer.cs +++ b/src/Lucene.Net.Tests/Search/TestQueryRescorer.cs @@ -1,6 +1,7 @@ -using Lucene.Net.Documents; +using Lucene.Net.Documents; using Lucene.Net.Support; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using System.Collections.Generic; using System.Text; diff --git a/src/Lucene.Net.Tests/Search/TestRegexpRandom2.cs b/src/Lucene.Net.Tests/Search/TestRegexpRandom2.cs index 08a4e9e..799a8b7 100644 --- a/src/Lucene.Net.Tests/Search/TestRegexpRandom2.cs +++ b/src/Lucene.Net.Tests/Search/TestRegexpRandom2.cs @@ -1,7 +1,8 @@ -using Lucene.Net.Documents; +using Lucene.Net.Documents; using Lucene.Net.Index.Extensions; using Lucene.Net.Util.Automaton; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using System.Collections.Generic; using Console = Lucene.Net.Util.SystemConsole; diff --git a/src/Lucene.Net.Tests/Search/TestSearchAfter.cs b/src/Lucene.Net.Tests/Search/TestSearchAfter.cs index caea463..e181026 100644 --- a/src/Lucene.Net.Tests/Search/TestSearchAfter.cs +++ b/src/Lucene.Net.Tests/Search/TestSearchAfter.cs @@ -1,6 +1,7 @@ -using Lucene.Net.Documents; +using Lucene.Net.Documents; using Lucene.Net.Util; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using System.Collections.Generic; using System.Globalization; diff --git a/src/Lucene.Net.Tests/Search/TestSearchWithThreads.cs b/src/Lucene.Net.Tests/Search/TestSearchWithThreads.cs index 09f2eb1..7cdddaf 100644 --- a/src/Lucene.Net.Tests/Search/TestSearchWithThreads.cs +++ b/src/Lucene.Net.Tests/Search/TestSearchWithThreads.cs @@ -1,7 +1,8 @@ -using J2N.Threading; +using J2N.Threading; using J2N.Threading.Atomic; using Lucene.Net.Documents; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using System.Text; using Assert = Lucene.Net.TestFramework.Assert; diff --git a/src/Lucene.Net.Tests/Search/TestSearcherManager.cs b/src/Lucene.Net.Tests/Search/TestSearcherManager.cs index 45fc8dd..246c10a 100644 --- a/src/Lucene.Net.Tests/Search/TestSearcherManager.cs +++ b/src/Lucene.Net.Tests/Search/TestSearcherManager.cs @@ -3,6 +3,7 @@ using J2N.Threading.Atomic; using Lucene.Net.Index; using Lucene.Net.Index.Extensions; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using System.Collections.Generic; using System.Threading; diff --git a/src/Lucene.Net.Tests/Search/TestShardSearching.cs b/src/Lucene.Net.Tests/Search/TestShardSearching.cs index c268c66..2dd0600 100644 --- a/src/Lucene.Net.Tests/Search/TestShardSearching.cs +++ b/src/Lucene.Net.Tests/Search/TestShardSearching.cs @@ -1,6 +1,7 @@ -using J2N.Collections.Generic.Extensions; +using J2N.Collections.Generic.Extensions; using Lucene.Net.Support; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using System.Collections.Generic; using Assert = Lucene.Net.TestFramework.Assert; diff --git a/src/Lucene.Net.Tests/Search/TestSort.cs b/src/Lucene.Net.Tests/Search/TestSort.cs index 99176a0..83c54f1 100644 --- a/src/Lucene.Net.Tests/Search/TestSort.cs +++ b/src/Lucene.Net.Tests/Search/TestSort.cs @@ -1,8 +1,9 @@ -using J2N.Collections.Generic.Extensions; +using J2N.Collections.Generic.Extensions; using Lucene.Net.Attributes; using Lucene.Net.Documents; using Lucene.Net.Util; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using System.Collections.Generic; using System.IO; diff --git a/src/Lucene.Net.Tests/Search/TestSortRandom.cs b/src/Lucene.Net.Tests/Search/TestSortRandom.cs index 74582ce..c9f7888 100644 --- a/src/Lucene.Net.Tests/Search/TestSortRandom.cs +++ b/src/Lucene.Net.Tests/Search/TestSortRandom.cs @@ -1,4 +1,4 @@ -using Lucene.Net.Documents; +using Lucene.Net.Documents; using Lucene.Net.Index; using NUnit.Framework; using System; @@ -7,6 +7,7 @@ using System.Linq; using JCG = J2N.Collections.Generic; using Assert = Lucene.Net.TestFramework.Assert; using Console = Lucene.Net.Util.SystemConsole; +using RandomizedTesting.Generators; namespace Lucene.Net.Search { diff --git a/src/Lucene.Net.Tests/Search/TestSortRescorer.cs b/src/Lucene.Net.Tests/Search/TestSortRescorer.cs index a053b80..bec82e7 100644 --- a/src/Lucene.Net.Tests/Search/TestSortRescorer.cs +++ b/src/Lucene.Net.Tests/Search/TestSortRescorer.cs @@ -1,5 +1,6 @@ -using Lucene.Net.Documents; +using Lucene.Net.Documents; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using System.Collections.Generic; using System.Text; diff --git a/src/Lucene.Net.Tests/Search/TestTopDocsMerge.cs b/src/Lucene.Net.Tests/Search/TestTopDocsMerge.cs index 19fe613..28e5d86 100644 --- a/src/Lucene.Net.Tests/Search/TestTopDocsMerge.cs +++ b/src/Lucene.Net.Tests/Search/TestTopDocsMerge.cs @@ -1,5 +1,6 @@ -using Lucene.Net.Documents; +using Lucene.Net.Documents; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using System.Collections.Generic; using System.Text; diff --git a/src/Lucene.Net.Tests/Store/TestCopyBytes.cs b/src/Lucene.Net.Tests/Store/TestCopyBytes.cs index 541b951..595c240 100644 --- a/src/Lucene.Net.Tests/Store/TestCopyBytes.cs +++ b/src/Lucene.Net.Tests/Store/TestCopyBytes.cs @@ -1,5 +1,6 @@ -using J2N.Threading; +using J2N.Threading; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using System.IO; using Assert = Lucene.Net.TestFramework.Assert; diff --git a/src/Lucene.Net.Tests/Store/TestDirectory.cs b/src/Lucene.Net.Tests/Store/TestDirectory.cs index 4d1913e..53b94e4 100644 --- a/src/Lucene.Net.Tests/Store/TestDirectory.cs +++ b/src/Lucene.Net.Tests/Store/TestDirectory.cs @@ -4,6 +4,7 @@ using Lucene.Net.Attributes; using Lucene.Net.Support; using Lucene.Net.Util; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using System.IO; using System.Threading; diff --git a/src/Lucene.Net.Tests/Util/Automaton/TestBasicOperations.cs b/src/Lucene.Net.Tests/Util/Automaton/TestBasicOperations.cs index d995def..121e830 100644 --- a/src/Lucene.Net.Tests/Util/Automaton/TestBasicOperations.cs +++ b/src/Lucene.Net.Tests/Util/Automaton/TestBasicOperations.cs @@ -1,9 +1,9 @@ -using Lucene.Net.Randomized.Generators; -using NUnit.Framework; +using NUnit.Framework; using System; using System.Collections.Generic; using Assert = Lucene.Net.TestFramework.Assert; using Console = Lucene.Net.Util.SystemConsole; +using RandomInts = RandomizedTesting.Generators.RandomNumbers; namespace Lucene.Net.Util.Automaton { diff --git a/src/Lucene.Net.Tests/Util/Automaton/TestUTF32ToUTF8.cs b/src/Lucene.Net.Tests/Util/Automaton/TestUTF32ToUTF8.cs index 8a67109..5463cc6 100644 --- a/src/Lucene.Net.Tests/Util/Automaton/TestUTF32ToUTF8.cs +++ b/src/Lucene.Net.Tests/Util/Automaton/TestUTF32ToUTF8.cs @@ -1,7 +1,8 @@ -using J2N; +using J2N; using J2N.Text; using Lucene.Net.Diagnostics; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using System.Text; using Assert = Lucene.Net.TestFramework.Assert; diff --git a/src/Lucene.Net.Tests/Util/Fst/TestBytesStore.cs b/src/Lucene.Net.Tests/Util/Fst/TestBytesStore.cs index 25a8c61..2a6f6ad 100644 --- a/src/Lucene.Net.Tests/Util/Fst/TestBytesStore.cs +++ b/src/Lucene.Net.Tests/Util/Fst/TestBytesStore.cs @@ -1,5 +1,6 @@ -using Lucene.Net.Support; +using Lucene.Net.Support; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using Assert = Lucene.Net.TestFramework.Assert; using Console = Lucene.Net.Util.SystemConsole; diff --git a/src/Lucene.Net.Tests/Util/Fst/TestFSTs.cs b/src/Lucene.Net.Tests/Util/Fst/TestFSTs.cs index ee62eb1..f4dfb75 100644 --- a/src/Lucene.Net.Tests/Util/Fst/TestFSTs.cs +++ b/src/Lucene.Net.Tests/Util/Fst/TestFSTs.cs @@ -1,10 +1,11 @@ -using J2N.Collections.Generic.Extensions; +using J2N.Collections.Generic.Extensions; using J2N.Threading.Atomic; using Lucene.Net.Diagnostics; using Lucene.Net.Index.Extensions; using Lucene.Net.Support; using Lucene.Net.Util.Automaton; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using System.Collections.Generic; using System.Globalization; diff --git a/src/Lucene.Net.Tests/Util/Packed/TestPackedInts.cs b/src/Lucene.Net.Tests/Util/Packed/TestPackedInts.cs index 99c393f..e8c4801 100644 --- a/src/Lucene.Net.Tests/Util/Packed/TestPackedInts.cs +++ b/src/Lucene.Net.Tests/Util/Packed/TestPackedInts.cs @@ -1,14 +1,15 @@ using J2N.IO; using J2N.Numerics; -using Lucene.Net.Randomized.Generators; using Lucene.Net.Support; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using System.Collections.Generic; using System.Globalization; using System.IO; using Assert = Lucene.Net.TestFramework.Assert; using Console = Lucene.Net.Util.SystemConsole; +using RandomInts = RandomizedTesting.Generators.RandomNumbers; namespace Lucene.Net.Util.Packed { diff --git a/src/Lucene.Net.Tests/Util/Test2BPagedBytes.cs b/src/Lucene.Net.Tests/Util/Test2BPagedBytes.cs index 9c044cc..0ec5cf9 100644 --- a/src/Lucene.Net.Tests/Util/Test2BPagedBytes.cs +++ b/src/Lucene.Net.Tests/Util/Test2BPagedBytes.cs @@ -1,6 +1,7 @@ -using Lucene.Net.Diagnostics; +using Lucene.Net.Diagnostics; using Lucene.Net.Store; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using Assert = Lucene.Net.TestFramework.Assert; diff --git a/src/Lucene.Net.Tests/Util/TestArrayUtil.cs b/src/Lucene.Net.Tests/Util/TestArrayUtil.cs index 31eeef9..86bf42e 100644 --- a/src/Lucene.Net.Tests/Util/TestArrayUtil.cs +++ b/src/Lucene.Net.Tests/Util/TestArrayUtil.cs @@ -1,5 +1,6 @@ -using Lucene.Net.Support; +using Lucene.Net.Support; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using Assert = Lucene.Net.TestFramework.Assert; using Console = Lucene.Net.Util.SystemConsole; diff --git a/src/Lucene.Net.Tests/Util/TestByteBlockPool.cs b/src/Lucene.Net.Tests/Util/TestByteBlockPool.cs index 2bfb7e1..fb5d970 100644 --- a/src/Lucene.Net.Tests/Util/TestByteBlockPool.cs +++ b/src/Lucene.Net.Tests/Util/TestByteBlockPool.cs @@ -1,4 +1,5 @@ -using NUnit.Framework; +using NUnit.Framework; +using RandomizedTesting.Generators; using System.Collections.Generic; using Assert = Lucene.Net.TestFramework.Assert; diff --git a/src/Lucene.Net.Tests/Util/TestBytesRefArray.cs b/src/Lucene.Net.Tests/Util/TestBytesRefArray.cs index d814025..3247f9f 100644 --- a/src/Lucene.Net.Tests/Util/TestBytesRefArray.cs +++ b/src/Lucene.Net.Tests/Util/TestBytesRefArray.cs @@ -1,4 +1,5 @@ using NUnit.Framework; +using RandomizedTesting.Generators; using System; using System.Collections.Generic; using Assert = Lucene.Net.TestFramework.Assert; diff --git a/src/Lucene.Net.Tests/Util/TestBytesRefHash.cs b/src/Lucene.Net.Tests/Util/TestBytesRefHash.cs index a4f63fe..8fbe614 100644 --- a/src/Lucene.Net.Tests/Util/TestBytesRefHash.cs +++ b/src/Lucene.Net.Tests/Util/TestBytesRefHash.cs @@ -1,10 +1,11 @@ -using Lucene.Net.Support; +using Lucene.Net.Support; using NUnit.Framework; using System; using System.Collections; using System.Collections.Generic; using JCG = J2N.Collections.Generic; using Assert = Lucene.Net.TestFramework.Assert; +using RandomizedTesting.Generators; namespace Lucene.Net.Util { diff --git a/src/Lucene.Net.Tests/Util/TestFixedBitSet.cs b/src/Lucene.Net.Tests/Util/TestFixedBitSet.cs index 0461d1e..faf72bf 100644 --- a/src/Lucene.Net.Tests/Util/TestFixedBitSet.cs +++ b/src/Lucene.Net.Tests/Util/TestFixedBitSet.cs @@ -1,5 +1,6 @@ -using Lucene.Net.Attributes; +using Lucene.Net.Attributes; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using Assert = Lucene.Net.TestFramework.Assert; using BitSet = J2N.Collections.BitSet; diff --git a/src/Lucene.Net.Tests/Util/TestLongBitSet.cs b/src/Lucene.Net.Tests/Util/TestLongBitSet.cs index 19bfed0..15ea4a4 100644 --- a/src/Lucene.Net.Tests/Util/TestLongBitSet.cs +++ b/src/Lucene.Net.Tests/Util/TestLongBitSet.cs @@ -1,9 +1,10 @@ -using System; +using System; using Lucene.Net.Attributes; using Lucene.Net.Support; using NUnit.Framework; using System.Collections; using Assert = Lucene.Net.TestFramework.Assert; +using RandomizedTesting.Generators; namespace Lucene.Net.Util { diff --git a/src/Lucene.Net.Tests/Util/TestMathUtil.cs b/src/Lucene.Net.Tests/Util/TestMathUtil.cs index eeb8c8b..e2392c9 100644 --- a/src/Lucene.Net.Tests/Util/TestMathUtil.cs +++ b/src/Lucene.Net.Tests/Util/TestMathUtil.cs @@ -1,5 +1,5 @@ -using Lucene.Net.Randomized.Generators; -using NUnit.Framework; +using NUnit.Framework; +using RandomizedTesting.Generators; using System; using Assert = Lucene.Net.TestFramework.Assert; diff --git a/src/Lucene.Net.Tests/Util/TestNumericUtils.cs b/src/Lucene.Net.Tests/Util/TestNumericUtils.cs index a654c97..293805e 100644 --- a/src/Lucene.Net.Tests/Util/TestNumericUtils.cs +++ b/src/Lucene.Net.Tests/Util/TestNumericUtils.cs @@ -2,6 +2,7 @@ using J2N.Text; using Lucene.Net.Support; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using System.Collections.Generic; using Assert = Lucene.Net.TestFramework.Assert; diff --git a/src/Lucene.Net.Tests/Util/TestOpenBitSet.cs b/src/Lucene.Net.Tests/Util/TestOpenBitSet.cs index 0d4b9cc..5fcdfb9 100644 --- a/src/Lucene.Net.Tests/Util/TestOpenBitSet.cs +++ b/src/Lucene.Net.Tests/Util/TestOpenBitSet.cs @@ -1,6 +1,7 @@ -using J2N.Collections; +using J2N.Collections; using Lucene.Net.Attributes; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using Assert = Lucene.Net.TestFramework.Assert; diff --git a/src/Lucene.Net.Tests/Util/TestPagedBytes.cs b/src/Lucene.Net.Tests/Util/TestPagedBytes.cs index 2b67251..937ab45 100644 --- a/src/Lucene.Net.Tests/Util/TestPagedBytes.cs +++ b/src/Lucene.Net.Tests/Util/TestPagedBytes.cs @@ -1,6 +1,7 @@ using Lucene.Net.Store; using Lucene.Net.Support; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using Assert = Lucene.Net.TestFramework.Assert; diff --git a/src/Lucene.Net.Tests/Util/TestSentinelIntSet.cs b/src/Lucene.Net.Tests/Util/TestSentinelIntSet.cs index 215d65c..e9231d2 100644 --- a/src/Lucene.Net.Tests/Util/TestSentinelIntSet.cs +++ b/src/Lucene.Net.Tests/Util/TestSentinelIntSet.cs @@ -1,4 +1,5 @@ -using NUnit.Framework; +using NUnit.Framework; +using RandomizedTesting.Generators; using System.Collections.Generic; using Assert = Lucene.Net.TestFramework.Assert; using JCG = J2N.Collections.Generic; diff --git a/src/Lucene.Net.Tests/Util/TestSloppyMath.cs b/src/Lucene.Net.Tests/Util/TestSloppyMath.cs index 73d2d7d..de988ff 100644 --- a/src/Lucene.Net.Tests/Util/TestSloppyMath.cs +++ b/src/Lucene.Net.Tests/Util/TestSloppyMath.cs @@ -1,4 +1,5 @@ -using NUnit.Framework; +using NUnit.Framework; +using RandomizedTesting.Generators; using System; using Assert = Lucene.Net.TestFramework.Assert; diff --git a/src/Lucene.Net.Tests/Util/TestWAH8DocIdSet.cs b/src/Lucene.Net.Tests/Util/TestWAH8DocIdSet.cs index a71ef90..ba1aac6 100644 --- a/src/Lucene.Net.Tests/Util/TestWAH8DocIdSet.cs +++ b/src/Lucene.Net.Tests/Util/TestWAH8DocIdSet.cs @@ -1,6 +1,7 @@ -using Lucene.Net.Diagnostics; +using Lucene.Net.Diagnostics; using Lucene.Net.Search; using NUnit.Framework; +using RandomizedTesting.Generators; using System; using System.Collections.Generic; using Assert = Lucene.Net.TestFramework.Assert;
