This is an automated email from the ASF dual-hosted git repository. nightowl888 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/lucenenet.git
commit 539eb8500269d6beea0c810948bbfa82802a612f Author: Shad Storhaug <[email protected]> AuthorDate: Wed Jun 24 12:33:13 2020 +0700 Lucene.Net.Tests.Facet: Switched to using the Assert class from the test framework instead of NUnit (#295, #261) --- src/Lucene.Net.Tests.Facet/FacetTestCase.cs | 1 + .../Range/TestRangeFacetCounts.cs | 1 + .../SortedSet/TestSortedSetDocValuesFacets.cs | 21 ++++----- .../Taxonomy/Directory/TestAddTaxonomy.cs | 1 + .../Directory/TestConcurrentFacetedIndexing.cs | 1 + .../Directory/TestDirectoryTaxonomyReader.cs | 1 + .../Directory/TestDirectoryTaxonomyWriter.cs | 1 + .../Taxonomy/TestCachedOrdinalsReader.cs | 1 + .../Taxonomy/TestFacetLabel.cs | 1 + .../Taxonomy/TestLRUHashMap.cs | 1 + .../Taxonomy/TestSearcherTaxonomyManager.cs | 1 + .../Taxonomy/TestTaxonomyCombined.cs | 1 + .../Taxonomy/TestTaxonomyFacetAssociations.cs | 1 + .../Taxonomy/TestTaxonomyFacetCounts.cs | 4 +- .../Taxonomy/TestTaxonomyFacetCounts2.cs | 1 + .../Taxonomy/TestTaxonomyFacetSumValueSource.cs | 49 +++++++++----------- .../Taxonomy/WriterCache/TestCharBlockArray.cs | 1 + src/Lucene.Net.Tests.Facet/TestDrillDownQuery.cs | 27 ++++++----- src/Lucene.Net.Tests.Facet/TestDrillSideways.cs | 54 +++++++++++----------- src/Lucene.Net.Tests.Facet/TestFacetsConfig.cs | 1 + .../TestMultipleIndexFields.cs | 3 +- .../TestRandomSamplingFacetsCollector.cs | 26 +++++------ 22 files changed, 104 insertions(+), 95 deletions(-) diff --git a/src/Lucene.Net.Tests.Facet/FacetTestCase.cs b/src/Lucene.Net.Tests.Facet/FacetTestCase.cs index 08eeb9f..1cbb155 100644 --- a/src/Lucene.Net.Tests.Facet/FacetTestCase.cs +++ b/src/Lucene.Net.Tests.Facet/FacetTestCase.cs @@ -3,6 +3,7 @@ using NUnit.Framework; using System; using System.Collections.Generic; using System.Diagnostics; +using Assert = Lucene.Net.TestFramework.Assert; using Console = Lucene.Net.Util.SystemConsole; namespace Lucene.Net.Facet diff --git a/src/Lucene.Net.Tests.Facet/Range/TestRangeFacetCounts.cs b/src/Lucene.Net.Tests.Facet/Range/TestRangeFacetCounts.cs index 3a17613..50b17b9 100644 --- a/src/Lucene.Net.Tests.Facet/Range/TestRangeFacetCounts.cs +++ b/src/Lucene.Net.Tests.Facet/Range/TestRangeFacetCounts.cs @@ -4,6 +4,7 @@ using System.Diagnostics; using System.Collections; using System.Collections.Generic; using NUnit.Framework; +using Assert = Lucene.Net.TestFramework.Assert; using Console = Lucene.Net.Util.SystemConsole; namespace Lucene.Net.Facet.Range diff --git a/src/Lucene.Net.Tests.Facet/SortedSet/TestSortedSetDocValuesFacets.cs b/src/Lucene.Net.Tests.Facet/SortedSet/TestSortedSetDocValuesFacets.cs index 3c17a44..9aa1dce 100644 --- a/src/Lucene.Net.Tests.Facet/SortedSet/TestSortedSetDocValuesFacets.cs +++ b/src/Lucene.Net.Tests.Facet/SortedSet/TestSortedSetDocValuesFacets.cs @@ -1,10 +1,7 @@ -using System; -using System.Collections; +using NUnit.Framework; +using System; using System.Collections.Generic; -using System.Linq; -using Lucene.Net.Randomized; -using Lucene.Net.Randomized.Generators; -using NUnit.Framework; +using Assert = Lucene.Net.TestFramework.Assert; using Console = Lucene.Net.Util.SystemConsole; namespace Lucene.Net.Facet.SortedSet @@ -28,20 +25,20 @@ namespace Lucene.Net.Facet.SortedSet */ + using Directory = Lucene.Net.Store.Directory; using Document = Lucene.Net.Documents.Document; using Field = Lucene.Net.Documents.Field; using IndexReader = Lucene.Net.Index.IndexReader; + using IndexSearcher = Lucene.Net.Search.IndexSearcher; + using IOUtils = Lucene.Net.Util.IOUtils; + using MatchAllDocsQuery = Lucene.Net.Search.MatchAllDocsQuery; using RandomIndexWriter = Lucene.Net.Index.RandomIndexWriter; using SlowCompositeReaderWrapper = Lucene.Net.Index.SlowCompositeReaderWrapper; using Term = Lucene.Net.Index.Term; - using IndexSearcher = Lucene.Net.Search.IndexSearcher; - using MatchAllDocsQuery = Lucene.Net.Search.MatchAllDocsQuery; using TermQuery = Lucene.Net.Search.TermQuery; - using TopDocs = Lucene.Net.Search.TopDocs; - using Directory = Lucene.Net.Store.Directory; - using IOUtils = Lucene.Net.Util.IOUtils; using TestUtil = Lucene.Net.Util.TestUtil; - + using TopDocs = Lucene.Net.Search.TopDocs; + [TestFixture] public class TestSortedSetDocValuesFacets : FacetTestCase { diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestAddTaxonomy.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestAddTaxonomy.cs index bd30b65..a7b0ebe 100644 --- a/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestAddTaxonomy.cs +++ b/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestAddTaxonomy.cs @@ -3,6 +3,7 @@ using J2N.Threading.Atomic; using NUnit.Framework; using System; using System.IO; +using Assert = Lucene.Net.TestFramework.Assert; using JCG = J2N.Collections.Generic; namespace Lucene.Net.Facet.Taxonomy.Directory diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestConcurrentFacetedIndexing.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestConcurrentFacetedIndexing.cs index 59a9076..d71225c 100644 --- a/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestConcurrentFacetedIndexing.cs +++ b/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestConcurrentFacetedIndexing.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Concurrent; using System.IO; using NUnit.Framework; +using Assert = Lucene.Net.TestFramework.Assert; using Console = Lucene.Net.Util.SystemConsole; using J2N.Threading; diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestDirectoryTaxonomyReader.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestDirectoryTaxonomyReader.cs index 1f6e26a..0909d9f 100644 --- a/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestDirectoryTaxonomyReader.cs +++ b/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestDirectoryTaxonomyReader.cs @@ -1,6 +1,7 @@ using Lucene.Net.Index.Extensions; using NUnit.Framework; using System; +using Assert = Lucene.Net.TestFramework.Assert; using JCG = J2N.Collections.Generic; namespace Lucene.Net.Facet.Taxonomy.Directory diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestDirectoryTaxonomyWriter.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestDirectoryTaxonomyWriter.cs index b1eaa3e..b134ae1 100644 --- a/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestDirectoryTaxonomyWriter.cs +++ b/src/Lucene.Net.Tests.Facet/Taxonomy/Directory/TestDirectoryTaxonomyWriter.cs @@ -5,6 +5,7 @@ using System; using System.Collections.Concurrent; using System.Collections.Generic; using System.IO; +using Assert = Lucene.Net.TestFramework.Assert; using Console = Lucene.Net.Util.SystemConsole; namespace Lucene.Net.Facet.Taxonomy.Directory diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/TestCachedOrdinalsReader.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/TestCachedOrdinalsReader.cs index 6914b6e..b9d65b9 100644 --- a/src/Lucene.Net.Tests.Facet/Taxonomy/TestCachedOrdinalsReader.cs +++ b/src/Lucene.Net.Tests.Facet/Taxonomy/TestCachedOrdinalsReader.cs @@ -2,6 +2,7 @@ using NUnit.Framework; using System; using System.IO; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Facet.Taxonomy { diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/TestFacetLabel.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/TestFacetLabel.cs index ef5b5b1..8aaaa93 100644 --- a/src/Lucene.Net.Tests.Facet/Taxonomy/TestFacetLabel.cs +++ b/src/Lucene.Net.Tests.Facet/Taxonomy/TestFacetLabel.cs @@ -1,6 +1,7 @@ using System; using Lucene.Net.Support; using NUnit.Framework; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Facet.Taxonomy { diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/TestLRUHashMap.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/TestLRUHashMap.cs index e19a900..84eb441 100644 --- a/src/Lucene.Net.Tests.Facet/Taxonomy/TestLRUHashMap.cs +++ b/src/Lucene.Net.Tests.Facet/Taxonomy/TestLRUHashMap.cs @@ -1,4 +1,5 @@ using NUnit.Framework; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Facet.Taxonomy { diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/TestSearcherTaxonomyManager.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/TestSearcherTaxonomyManager.cs index 9e848a2..36a93fb 100644 --- a/src/Lucene.Net.Tests.Facet/Taxonomy/TestSearcherTaxonomyManager.cs +++ b/src/Lucene.Net.Tests.Facet/Taxonomy/TestSearcherTaxonomyManager.cs @@ -9,6 +9,7 @@ using System.Collections.Generic; using System.IO; using System.Threading; using JCG = J2N.Collections.Generic; +using Assert = Lucene.Net.TestFramework.Assert; using Console = Lucene.Net.Util.SystemConsole; namespace Lucene.Net.Facet.Taxonomy diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyCombined.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyCombined.cs index 2a96413..27c8be9 100644 --- a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyCombined.cs +++ b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyCombined.cs @@ -7,6 +7,7 @@ using System; using System.Collections.Generic; using System.Text; using System.Threading; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Facet.Taxonomy { diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetAssociations.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetAssociations.cs index 35c40db..3bff8a2 100644 --- a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetAssociations.cs +++ b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetAssociations.cs @@ -1,4 +1,5 @@ using NUnit.Framework; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Facet.Taxonomy { diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts.cs index 59f1b1b..aeeee70 100644 --- a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts.cs +++ b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts.cs @@ -4,6 +4,8 @@ using NUnit.Framework; using System; using System.Collections.Generic; using System.IO; +using System.Text; +using Assert = Lucene.Net.TestFramework.Assert; using Console = Lucene.Net.Util.SystemConsole; using JCG = J2N.Collections.Generic; @@ -27,8 +29,6 @@ namespace Lucene.Net.Facet.Taxonomy * limitations under the License. */ - - using System.Text; using DefaultSimilarity = Lucene.Net.Search.Similarities.DefaultSimilarity; using DirectoryReader = Lucene.Net.Index.DirectoryReader; using DirectoryTaxonomyReader = Lucene.Net.Facet.Taxonomy.Directory.DirectoryTaxonomyReader; diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts2.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts2.cs index aca39cd..dba7829 100644 --- a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts2.cs +++ b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts2.cs @@ -3,6 +3,7 @@ using Lucene.Net.Support; using NUnit.Framework; using System; using System.Collections.Generic; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Facet.Taxonomy { diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetSumValueSource.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetSumValueSource.cs index 319d61a..6d35016 100644 --- a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetSumValueSource.cs +++ b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetSumValueSource.cs @@ -1,10 +1,9 @@ using System; -using System.Diagnostics; using System.Collections; using System.Collections.Generic; +using System.Diagnostics; using System.IO; -using System.Linq; -using Lucene.Net.Randomized.Generators; +using Assert = Lucene.Net.TestFramework.Assert; using Console = Lucene.Net.Util.SystemConsole; namespace Lucene.Net.Facet.Taxonomy @@ -28,40 +27,38 @@ namespace Lucene.Net.Facet.Taxonomy */ - using MockAnalyzer = Lucene.Net.Analysis.MockAnalyzer; - using Document = Lucene.Net.Documents.Document; - using Field = Lucene.Net.Documents.Field; - using SingleDocValuesField = Lucene.Net.Documents.SingleDocValuesField; - using Int32Field = Lucene.Net.Documents.Int32Field; - using NumericDocValuesField = Lucene.Net.Documents.NumericDocValuesField; - using StringField = Lucene.Net.Documents.StringField; - using DirectoryTaxonomyReader = Lucene.Net.Facet.Taxonomy.Directory.DirectoryTaxonomyReader; - using DirectoryTaxonomyWriter = Lucene.Net.Facet.Taxonomy.Directory.DirectoryTaxonomyWriter; + using NUnit.Framework; using AtomicReaderContext = Lucene.Net.Index.AtomicReaderContext; + using ConstantScoreQuery = Lucene.Net.Search.ConstantScoreQuery; using DirectoryReader = Lucene.Net.Index.DirectoryReader; - using IndexWriter = Lucene.Net.Index.IndexWriter; - using IndexWriterConfig = Lucene.Net.Index.IndexWriterConfig; - using RandomIndexWriter = Lucene.Net.Index.RandomIndexWriter; - using Term = Lucene.Net.Index.Term; + using DirectoryTaxonomyReader = Lucene.Net.Facet.Taxonomy.Directory.DirectoryTaxonomyReader; + using DirectoryTaxonomyWriter = Lucene.Net.Facet.Taxonomy.Directory.DirectoryTaxonomyWriter; + using Document = Lucene.Net.Documents.Document; + using DoubleDocValues = Lucene.Net.Queries.Function.DocValues.DoubleDocValues; + using Field = Lucene.Net.Documents.Field; using FunctionQuery = Lucene.Net.Queries.Function.FunctionQuery; using FunctionValues = Lucene.Net.Queries.Function.FunctionValues; - using ValueSource = Lucene.Net.Queries.Function.ValueSource; - using DoubleDocValues = Lucene.Net.Queries.Function.DocValues.DoubleDocValues; - using SingleFieldSource = Lucene.Net.Queries.Function.ValueSources.SingleFieldSource; + using IndexSearcher = Lucene.Net.Search.IndexSearcher; + using IndexWriter = Lucene.Net.Index.IndexWriter; + using Int32Field = Lucene.Net.Documents.Int32Field; using Int32FieldSource = Lucene.Net.Queries.Function.ValueSources.Int32FieldSource; using Int64FieldSource = Lucene.Net.Queries.Function.ValueSources.Int64FieldSource; - using ConstantScoreQuery = Lucene.Net.Search.ConstantScoreQuery; - using IndexSearcher = Lucene.Net.Search.IndexSearcher; + using IOUtils = Lucene.Net.Util.IOUtils; using MatchAllDocsQuery = Lucene.Net.Search.MatchAllDocsQuery; + using MockAnalyzer = Lucene.Net.Analysis.MockAnalyzer; + using NumericDocValuesField = Lucene.Net.Documents.NumericDocValuesField; + using OpenMode = Lucene.Net.Index.OpenMode; using Query = Lucene.Net.Search.Query; + using RandomIndexWriter = Lucene.Net.Index.RandomIndexWriter; using Scorer = Lucene.Net.Search.Scorer; + using SingleDocValuesField = Lucene.Net.Documents.SingleDocValuesField; + using SingleFieldSource = Lucene.Net.Queries.Function.ValueSources.SingleFieldSource; + using StringField = Lucene.Net.Documents.StringField; + using Term = Lucene.Net.Index.Term; using TermQuery = Lucene.Net.Search.TermQuery; - using TopDocs = Lucene.Net.Search.TopDocs; - using Directory = Lucene.Net.Store.Directory; - using IOUtils = Lucene.Net.Util.IOUtils; using TestUtil = Lucene.Net.Util.TestUtil; - using OpenMode = Lucene.Net.Index.OpenMode; - using NUnit.Framework; + using TopDocs = Lucene.Net.Search.TopDocs; + using ValueSource = Lucene.Net.Queries.Function.ValueSource; [TestFixture] public class TestTaxonomyFacetSumValueSource : FacetTestCase { diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/WriterCache/TestCharBlockArray.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/WriterCache/TestCharBlockArray.cs index bd98b75..b291ff7 100644 --- a/src/Lucene.Net.Tests.Facet/Taxonomy/WriterCache/TestCharBlockArray.cs +++ b/src/Lucene.Net.Tests.Facet/Taxonomy/WriterCache/TestCharBlockArray.cs @@ -2,6 +2,7 @@ using NUnit.Framework; using System.IO; using System.Text; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Facet.Taxonomy.WriterCache { diff --git a/src/Lucene.Net.Tests.Facet/TestDrillDownQuery.cs b/src/Lucene.Net.Tests.Facet/TestDrillDownQuery.cs index f6ee4b1..e2b5be7 100644 --- a/src/Lucene.Net.Tests.Facet/TestDrillDownQuery.cs +++ b/src/Lucene.Net.Tests.Facet/TestDrillDownQuery.cs @@ -1,7 +1,6 @@ -using System; -using System.Diagnostics; -using Lucene.Net.Randomized.Generators; -using NUnit.Framework; +using NUnit.Framework; +using System; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Facet { @@ -24,26 +23,26 @@ namespace Lucene.Net.Facet */ - using MockAnalyzer = Lucene.Net.Analysis.MockAnalyzer; - using MockTokenizer = Lucene.Net.Analysis.MockTokenizer; - using Document = Lucene.Net.Documents.Document; - using Field = Lucene.Net.Documents.Field; - using TextField = Lucene.Net.Documents.TextField; - using ITaxonomyWriter = Lucene.Net.Facet.Taxonomy.ITaxonomyWriter; + using Directory = Lucene.Net.Store.Directory; using DirectoryTaxonomyReader = Lucene.Net.Facet.Taxonomy.Directory.DirectoryTaxonomyReader; using DirectoryTaxonomyWriter = Lucene.Net.Facet.Taxonomy.Directory.DirectoryTaxonomyWriter; + using Document = Lucene.Net.Documents.Document; + using Field = Lucene.Net.Documents.Field; using IndexReader = Lucene.Net.Index.IndexReader; - using RandomIndexWriter = Lucene.Net.Index.RandomIndexWriter; - using Term = Lucene.Net.Index.Term; using IndexSearcher = Lucene.Net.Search.IndexSearcher; + using IOUtils = Lucene.Net.Util.IOUtils; + using ITaxonomyWriter = Lucene.Net.Facet.Taxonomy.ITaxonomyWriter; using MatchAllDocsQuery = Lucene.Net.Search.MatchAllDocsQuery; + using MockAnalyzer = Lucene.Net.Analysis.MockAnalyzer; + using MockTokenizer = Lucene.Net.Analysis.MockTokenizer; using Query = Lucene.Net.Search.Query; using QueryUtils = Lucene.Net.Search.QueryUtils; + using RandomIndexWriter = Lucene.Net.Index.RandomIndexWriter; using ScoreDoc = Lucene.Net.Search.ScoreDoc; + using Term = Lucene.Net.Index.Term; using TermQuery = Lucene.Net.Search.TermQuery; + using TextField = Lucene.Net.Documents.TextField; using TopDocs = Lucene.Net.Search.TopDocs; - using Directory = Lucene.Net.Store.Directory; - using IOUtils = Lucene.Net.Util.IOUtils; [TestFixture] public class TestDrillDownQuery : FacetTestCase diff --git a/src/Lucene.Net.Tests.Facet/TestDrillSideways.cs b/src/Lucene.Net.Tests.Facet/TestDrillSideways.cs index 8ea3ad9..2dbf94f 100644 --- a/src/Lucene.Net.Tests.Facet/TestDrillSideways.cs +++ b/src/Lucene.Net.Tests.Facet/TestDrillSideways.cs @@ -1,11 +1,14 @@ using J2N.Text; +using Lucene.Net.Search; using Lucene.Net.Support; +using NUnit.Framework; using System; -using System.Diagnostics; using System.Collections.Generic; +using System.Diagnostics; using System.Linq; -using JCG = J2N.Collections.Generic; +using Assert = Lucene.Net.TestFramework.Assert; using Console = Lucene.Net.Util.SystemConsole; +using JCG = J2N.Collections.Generic; namespace Lucene.Net.Facet { @@ -28,44 +31,43 @@ namespace Lucene.Net.Facet */ - using MockAnalyzer = Lucene.Net.Analysis.MockAnalyzer; - using Document = Lucene.Net.Documents.Document; - using Field = Lucene.Net.Documents.Field; - using StringField = Lucene.Net.Documents.StringField; + using AtomicReaderContext = Lucene.Net.Index.AtomicReaderContext; + using BytesRef = Lucene.Net.Util.BytesRef; using DefaultSortedSetDocValuesReaderState = Lucene.Net.Facet.SortedSet.DefaultSortedSetDocValuesReaderState; - using SortedSetDocValuesFacetField = Lucene.Net.Facet.SortedSet.SortedSetDocValuesFacetField; - using SortedSetDocValuesReaderState = Lucene.Net.Facet.SortedSet.SortedSetDocValuesReaderState; - using TaxonomyReader = Lucene.Net.Facet.Taxonomy.TaxonomyReader; + using Directory = Lucene.Net.Store.Directory; using DirectoryTaxonomyReader = Lucene.Net.Facet.Taxonomy.Directory.DirectoryTaxonomyReader; using DirectoryTaxonomyWriter = Lucene.Net.Facet.Taxonomy.Directory.DirectoryTaxonomyWriter; - using AtomicReaderContext = Lucene.Net.Index.AtomicReaderContext; - using IndexReader = Lucene.Net.Index.IndexReader; - using IndexWriterConfig = Lucene.Net.Index.IndexWriterConfig; - using OpenMode = Lucene.Net.Index.OpenMode; - using RandomIndexWriter = Lucene.Net.Index.RandomIndexWriter; - using Term = Lucene.Net.Index.Term; - using ICollector = Lucene.Net.Search.ICollector; using DocIdSet = Lucene.Net.Search.DocIdSet; + using Document = Lucene.Net.Documents.Document; + using Field = Lucene.Net.Documents.Field; using Filter = Lucene.Net.Search.Filter; + using FixedBitSet = Lucene.Net.Util.FixedBitSet; + using IBits = Lucene.Net.Util.IBits; + using ICollector = Lucene.Net.Search.ICollector; + using IndexReader = Lucene.Net.Index.IndexReader; using IndexSearcher = Lucene.Net.Search.IndexSearcher; + using IndexWriterConfig = Lucene.Net.Index.IndexWriterConfig; + using InfoStream = Lucene.Net.Util.InfoStream; + using InPlaceMergeSorter = Lucene.Net.Util.InPlaceMergeSorter; + using IOUtils = Lucene.Net.Util.IOUtils; using MatchAllDocsQuery = Lucene.Net.Search.MatchAllDocsQuery; + using MockAnalyzer = Lucene.Net.Analysis.MockAnalyzer; + using OpenMode = Lucene.Net.Index.OpenMode; using Query = Lucene.Net.Search.Query; + using RandomIndexWriter = Lucene.Net.Index.RandomIndexWriter; using ScoreDoc = Lucene.Net.Search.ScoreDoc; using Scorer = Lucene.Net.Search.Scorer; using Sort = Lucene.Net.Search.Sort; + using SortedSetDocValuesFacetField = Lucene.Net.Facet.SortedSet.SortedSetDocValuesFacetField; + using SortedSetDocValuesReaderState = Lucene.Net.Facet.SortedSet.SortedSetDocValuesReaderState; using SortField = Lucene.Net.Search.SortField; + using StringField = Lucene.Net.Documents.StringField; + using TaxonomyReader = Lucene.Net.Facet.Taxonomy.TaxonomyReader; + using Term = Lucene.Net.Index.Term; using TermQuery = Lucene.Net.Search.TermQuery; - using TopDocs = Lucene.Net.Search.TopDocs; - using Directory = Lucene.Net.Store.Directory; - using IBits = Lucene.Net.Util.IBits; - using BytesRef = Lucene.Net.Util.BytesRef; - using FixedBitSet = Lucene.Net.Util.FixedBitSet; - using IOUtils = Lucene.Net.Util.IOUtils; - using InPlaceMergeSorter = Lucene.Net.Util.InPlaceMergeSorter; - using InfoStream = Lucene.Net.Util.InfoStream; using TestUtil = Lucene.Net.Util.TestUtil; - using NUnit.Framework; - using Search; + using TopDocs = Lucene.Net.Search.TopDocs; + [TestFixture] public class TestDrillSideways : FacetTestCase diff --git a/src/Lucene.Net.Tests.Facet/TestFacetsConfig.cs b/src/Lucene.Net.Tests.Facet/TestFacetsConfig.cs index 563ee8d..855a09b 100644 --- a/src/Lucene.Net.Tests.Facet/TestFacetsConfig.cs +++ b/src/Lucene.Net.Tests.Facet/TestFacetsConfig.cs @@ -1,5 +1,6 @@ using Lucene.Net.Support; using NUnit.Framework; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Facet { diff --git a/src/Lucene.Net.Tests.Facet/TestMultipleIndexFields.cs b/src/Lucene.Net.Tests.Facet/TestMultipleIndexFields.cs index ced846f..352e39b 100644 --- a/src/Lucene.Net.Tests.Facet/TestMultipleIndexFields.cs +++ b/src/Lucene.Net.Tests.Facet/TestMultipleIndexFields.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using NUnit.Framework; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Facet { @@ -272,7 +273,7 @@ namespace Lucene.Net.Facet private void AssertCorrectResults(Facets facets) { - Assert.AreEqual(5, facets.GetSpecificValue("Band")); + Assert.AreEqual(5, facets.GetSpecificValue("Band"), 0); Assert.AreEqual("dim=Band path=[] value=5 childCount=2\n Rock & Pop (4)\n Punk (1)\n", facets.GetTopChildren(10, "Band").ToString()); Assert.AreEqual("dim=Band path=[Rock & Pop] value=4 childCount=4\n The Beatles (1)\n U2 (1)\n REM (1)\n Dave Matthews Band (1)\n", facets.GetTopChildren(10, "Band", "Rock & Pop").ToString()); Assert.AreEqual("dim=Author path=[] value=3 childCount=3\n Mark Twain (1)\n Stephen King (1)\n Kurt Vonnegut (1)\n", facets.GetTopChildren(10, "Author").ToString()); diff --git a/src/Lucene.Net.Tests.Facet/TestRandomSamplingFacetsCollector.cs b/src/Lucene.Net.Tests.Facet/TestRandomSamplingFacetsCollector.cs index a4e1f19..c709764 100644 --- a/src/Lucene.Net.Tests.Facet/TestRandomSamplingFacetsCollector.cs +++ b/src/Lucene.Net.Tests.Facet/TestRandomSamplingFacetsCollector.cs @@ -1,26 +1,24 @@ -using System; -using System.Diagnostics; -using Lucene.Net.Randomized.Generators; -using NUnit.Framework; +using NUnit.Framework; +using System; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Facet { - using Document = Lucene.Net.Documents.Document; - using Store = Lucene.Net.Documents.Field.Store; - using StringField = Lucene.Net.Documents.StringField; - using MatchingDocs = Lucene.Net.Facet.FacetsCollector.MatchingDocs; - using FastTaxonomyFacetCounts = Lucene.Net.Facet.Taxonomy.FastTaxonomyFacetCounts; - using TaxonomyReader = Lucene.Net.Facet.Taxonomy.TaxonomyReader; + using Directory = Lucene.Net.Store.Directory; using DirectoryTaxonomyReader = Lucene.Net.Facet.Taxonomy.Directory.DirectoryTaxonomyReader; using DirectoryTaxonomyWriter = Lucene.Net.Facet.Taxonomy.Directory.DirectoryTaxonomyWriter; - using RandomIndexWriter = Lucene.Net.Index.RandomIndexWriter; - using Term = Lucene.Net.Index.Term; + using Document = Lucene.Net.Documents.Document; + using FastTaxonomyFacetCounts = Lucene.Net.Facet.Taxonomy.FastTaxonomyFacetCounts; using IndexSearcher = Lucene.Net.Search.IndexSearcher; + using IOUtils = Lucene.Net.Util.IOUtils; + using MatchingDocs = Lucene.Net.Facet.FacetsCollector.MatchingDocs; using MultiCollector = Lucene.Net.Search.MultiCollector; + using RandomIndexWriter = Lucene.Net.Index.RandomIndexWriter; + using Store = Lucene.Net.Documents.Field.Store; + using StringField = Lucene.Net.Documents.StringField; + using Term = Lucene.Net.Index.Term; using TermQuery = Lucene.Net.Search.TermQuery; - using Directory = Lucene.Net.Store.Directory; - using IOUtils = Lucene.Net.Util.IOUtils; /* * Licensed to the Apache Software Foundation (ASF) under one or more
