This is an automated email from the ASF dual-hosted git repository. nightowl888 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/lucenenet.git
commit b5f8a944060a372dbfdd01fbe33584bf39014e12 Author: Shad Storhaug <[email protected]> AuthorDate: Wed Jun 24 07:36:16 2020 +0700 Lucene.Net.Tests.Search + Lucene.Net.Tests.Support: Switched to using the Assert class in the test framework instead of NUnit (#295, #261) --- .../Support/TestFramework/Assert.cs | 10 ++ .../Analysis/Hunspell/StemmerTestBase.cs | 2 +- src/Lucene.Net.Tests/Search/BaseTestRangeFilter.cs | 1 + .../Search/FuzzyTermOnShortTermsTest.cs | 1 + .../Search/Payloads/TestPayloadNearQuery.cs | 1 + .../Search/Similarities/TestSimilarity2.cs | 3 +- .../Search/Similarities/TestSimilarityBase.cs | 3 +- src/Lucene.Net.Tests/Search/Spans/TestBasics.cs | 10 +- .../Search/Spans/TestFieldMaskingSpanQuery.cs | 1 + .../Search/Spans/TestNearSpansOrdered.cs | 1 + .../Search/Spans/TestPayloadSpans.cs | 1 + .../Search/Spans/TestSpanFirstQuery.cs | 34 +++--- .../Search/Spans/TestSpanMultiTermQueryWrapper.cs | 3 +- src/Lucene.Net.Tests/Search/Spans/TestSpans.cs | 1 + .../Search/Spans/TestSpansAdvanced.cs | 1 + .../Search/Spans/TestSpansAdvanced2.cs | 1 + src/Lucene.Net.Tests/Search/TestAutomatonQuery.cs | 1 + .../Search/TestAutomatonQueryUnicode.cs | 3 +- src/Lucene.Net.Tests/Search/TestBoolean2.cs | 1 + .../Search/TestBooleanMinShouldMatch.cs | 4 +- src/Lucene.Net.Tests/Search/TestBooleanOr.cs | 1 + src/Lucene.Net.Tests/Search/TestBooleanQuery.cs | 14 +-- .../Search/TestBooleanQueryVisitSubscorers.cs | 1 + src/Lucene.Net.Tests/Search/TestBooleanScorer.cs | 11 +- .../Search/TestCachingCollector.cs | 7 +- .../Search/TestCachingWrapperFilter.cs | 1 + src/Lucene.Net.Tests/Search/TestConjunctions.cs | 1 + .../Search/TestConstantScoreQuery.cs | 5 +- .../Search/TestCustomSearcherSort.cs | 5 +- src/Lucene.Net.Tests/Search/TestDateFilter.cs | 5 +- .../Search/TestDisjunctionMaxQuery.cs | 1 + src/Lucene.Net.Tests/Search/TestDocIdSet.cs | 10 +- .../Search/TestDocTermOrdsRewriteMethod.cs | 1 + .../Search/TestDocValuesScoring.cs | 9 +- .../Search/TestElevationComparator.cs | 1 + src/Lucene.Net.Tests/Search/TestFieldCache.cs | 7 +- .../Search/TestFieldCacheRangeFilter.cs | 1 + .../Search/TestFieldCacheRewriteMethod.cs | 4 +- .../Search/TestFieldCacheTermsFilter.cs | 5 +- .../Search/TestFieldValueFilter.cs | 4 +- src/Lucene.Net.Tests/Search/TestFilteredQuery.cs | 1 + src/Lucene.Net.Tests/Search/TestFilteredSearch.cs | 1 + src/Lucene.Net.Tests/Search/TestFuzzyQuery.cs | 7 +- src/Lucene.Net.Tests/Search/TestLiveFieldValues.cs | 1 + .../Search/TestMatchAllDocsQuery.cs | 1 + src/Lucene.Net.Tests/Search/TestMinShouldMatch2.cs | 1 + .../Search/TestMultiPhraseQuery.cs | 1 + .../Search/TestMultiTermConstantScore.cs | 122 ++++++++++----------- .../Search/TestMultiTermQueryRewrites.cs | 8 +- .../Search/TestMultiValuedNumericRangeQuery.cs | 1 + .../Search/TestNGramPhraseQuery.cs | 4 +- src/Lucene.Net.Tests/Search/TestNot.cs | 3 +- .../Search/TestNumericRangeQuery32.cs | 1 + .../Search/TestNumericRangeQuery64.cs | 1 + .../Search/TestPhrasePrefixQuery.cs | 3 +- src/Lucene.Net.Tests/Search/TestPhraseQuery.cs | 1 + .../Search/TestPositionIncrement.cs | 3 +- .../Search/TestPositiveScoresOnlyCollector.cs | 4 +- src/Lucene.Net.Tests/Search/TestPrefixFilter.cs | 3 +- .../Search/TestPrefixInBooleanQuery.cs | 3 +- src/Lucene.Net.Tests/Search/TestPrefixQuery.cs | 3 +- src/Lucene.Net.Tests/Search/TestQueryRescorer.cs | 8 +- .../Search/TestQueryWrapperFilter.cs | 1 + src/Lucene.Net.Tests/Search/TestRegexpQuery.cs | 8 +- src/Lucene.Net.Tests/Search/TestRegexpRandom.cs | 1 + .../Search/TestSameScoresWithThreads.cs | 2 +- .../Search/TestScoreCachingWrappingScorer.cs | 5 +- src/Lucene.Net.Tests/Search/TestScorerPerf.cs | 6 +- src/Lucene.Net.Tests/Search/TestSearchAfter.cs | 1 + src/Lucene.Net.Tests/Search/TestShardSearching.cs | 2 +- src/Lucene.Net.Tests/Search/TestSimilarity.cs | 1 + .../Search/TestSloppyPhraseQuery.cs | 1 + src/Lucene.Net.Tests/Search/TestSort.cs | 1 + src/Lucene.Net.Tests/Search/TestSortDocValues.cs | 4 +- src/Lucene.Net.Tests/Search/TestSortRandom.cs | 1 + src/Lucene.Net.Tests/Search/TestSortRescorer.cs | 9 +- src/Lucene.Net.Tests/Search/TestSubScorerFreqs.cs | 22 ++-- src/Lucene.Net.Tests/Search/TestTermRangeFilter.cs | 5 +- src/Lucene.Net.Tests/Search/TestTermRangeQuery.cs | 1 + src/Lucene.Net.Tests/Search/TestTermVectors.cs | 1 + .../Search/TestTopDocsCollector.cs | 4 +- src/Lucene.Net.Tests/Search/TestTopDocsMerge.cs | 10 +- .../Search/TestTopFieldCollector.cs | 3 +- .../Search/TestTopScoreDocCollector.cs | 4 +- .../Search/TestTotalHitCountCollector.cs | 3 +- src/Lucene.Net.Tests/Search/TestWildcard.cs | 1 + src/Lucene.Net.Tests/Search/TestWildcardRandom.cs | 1 + src/Lucene.Net.Tests/Store/TestBufferedChecksum.cs | 1 + .../Store/TestBufferedIndexInput.cs | 1 + .../Store/TestByteArrayDataInput.cs | 1 + src/Lucene.Net.Tests/Store/TestCopyBytes.cs | 1 + src/Lucene.Net.Tests/Store/TestDirectory.cs | 1 + .../Store/TestFileSwitchDirectory.cs | 3 +- src/Lucene.Net.Tests/Store/TestHugeRamFile.cs | 1 + src/Lucene.Net.Tests/Store/TestLock.cs | 1 + src/Lucene.Net.Tests/Store/TestLockFactory.cs | 1 + src/Lucene.Net.Tests/Store/TestMultiMMap.cs | 1 + .../Store/TestNRTCachingDirectory.cs | 2 +- src/Lucene.Net.Tests/Store/TestRAMDirectory.cs | 1 + src/Lucene.Net.Tests/Support/TestCRC32.cs | 1 + src/Lucene.Net.Tests/Support/TestOldPatches.cs | 9 +- src/Lucene.Net.Tests/Support/TestSerialization.cs | 10 +- src/Lucene.Net.Tests/Support/TestWeakDictionary.cs | 1 + .../Support/TestWeakDictionaryBehavior.cs | 1 + 104 files changed, 282 insertions(+), 211 deletions(-) diff --git a/src/Lucene.Net.TestFramework.NUnit/Support/TestFramework/Assert.cs b/src/Lucene.Net.TestFramework.NUnit/Support/TestFramework/Assert.cs index 40334c8..a3fd36c 100644 --- a/src/Lucene.Net.TestFramework.NUnit/Support/TestFramework/Assert.cs +++ b/src/Lucene.Net.TestFramework.NUnit/Support/TestFramework/Assert.cs @@ -713,6 +713,16 @@ namespace Lucene.Net.TestFramework } + public static void LessOrEqual(int arg1, int arg2) + { + _NUnit.Assert.LessOrEqual(arg1, arg2); + } + + public static void Greater(int arg1, int arg2) + { + _NUnit.Assert.Greater(arg1, arg2); + } + public static Exception Throws<TException>(Action action) { return Throws(typeof(TException), action); diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/StemmerTestBase.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/StemmerTestBase.cs index 941d01e..3384203 100644 --- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/StemmerTestBase.cs +++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/StemmerTestBase.cs @@ -1,9 +1,9 @@ using Lucene.Net.Support; using Lucene.Net.Util; -using NUnit.Framework; using System; using System.Collections.Generic; using System.IO; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Analysis.Hunspell { diff --git a/src/Lucene.Net.Tests/Search/BaseTestRangeFilter.cs b/src/Lucene.Net.Tests/Search/BaseTestRangeFilter.cs index 61583d5..de81b77 100644 --- a/src/Lucene.Net.Tests/Search/BaseTestRangeFilter.cs +++ b/src/Lucene.Net.Tests/Search/BaseTestRangeFilter.cs @@ -3,6 +3,7 @@ using Lucene.Net.Index.Extensions; using NUnit.Framework; using System; using System.Text; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Search { diff --git a/src/Lucene.Net.Tests/Search/FuzzyTermOnShortTermsTest.cs b/src/Lucene.Net.Tests/Search/FuzzyTermOnShortTermsTest.cs index cc2d0e6..e4a98fa 100644 --- a/src/Lucene.Net.Tests/Search/FuzzyTermOnShortTermsTest.cs +++ b/src/Lucene.Net.Tests/Search/FuzzyTermOnShortTermsTest.cs @@ -20,6 +20,7 @@ using Lucene.Net.Documents; using Lucene.Net.Index.Extensions; using NUnit.Framework; using System.IO; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Search { diff --git a/src/Lucene.Net.Tests/Search/Payloads/TestPayloadNearQuery.cs b/src/Lucene.Net.Tests/Search/Payloads/TestPayloadNearQuery.cs index f9d5f70..fd2dba9 100644 --- a/src/Lucene.Net.Tests/Search/Payloads/TestPayloadNearQuery.cs +++ b/src/Lucene.Net.Tests/Search/Payloads/TestPayloadNearQuery.cs @@ -7,6 +7,7 @@ using NUnit.Framework; using System; using System.IO; using System.Text.RegularExpressions; +using Assert = Lucene.Net.TestFramework.Assert; using Console = Lucene.Net.Util.SystemConsole; namespace Lucene.Net.Search.Payloads diff --git a/src/Lucene.Net.Tests/Search/Similarities/TestSimilarity2.cs b/src/Lucene.Net.Tests/Search/Similarities/TestSimilarity2.cs index 481799b..72e04d7 100644 --- a/src/Lucene.Net.Tests/Search/Similarities/TestSimilarity2.cs +++ b/src/Lucene.Net.Tests/Search/Similarities/TestSimilarity2.cs @@ -1,10 +1,11 @@ using System.Collections.Generic; using Lucene.Net.Documents; using Lucene.Net.Index; +using NUnit.Framework; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Search.Similarities { - using NUnit.Framework; using Directory = Lucene.Net.Store.Directory; /* diff --git a/src/Lucene.Net.Tests/Search/Similarities/TestSimilarityBase.cs b/src/Lucene.Net.Tests/Search/Similarities/TestSimilarityBase.cs index cf31b6c..6628342 100644 --- a/src/Lucene.Net.Tests/Search/Similarities/TestSimilarityBase.cs +++ b/src/Lucene.Net.Tests/Search/Similarities/TestSimilarityBase.cs @@ -1,10 +1,11 @@ using System; using System.Collections.Generic; using Lucene.Net.Documents; +using NUnit.Framework; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Search.Similarities { - using NUnit.Framework; using BytesRef = Lucene.Net.Util.BytesRef; /* diff --git a/src/Lucene.Net.Tests/Search/Spans/TestBasics.cs b/src/Lucene.Net.Tests/Search/Spans/TestBasics.cs index 7705e5d..9301171 100644 --- a/src/Lucene.Net.Tests/Search/Spans/TestBasics.cs +++ b/src/Lucene.Net.Tests/Search/Spans/TestBasics.cs @@ -1,8 +1,13 @@ using J2N.Text; +using Lucene.Net.Analysis; using Lucene.Net.Analysis.TokenAttributes; using Lucene.Net.Documents; using Lucene.Net.Index.Extensions; +using Lucene.Net.Util; +using NUnit.Framework; using System.Collections.Generic; +using System.IO; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Search.Spans { @@ -23,10 +28,7 @@ namespace Lucene.Net.Search.Spans * limitations under the License. */ - using Lucene.Net.Analysis; - using Lucene.Net.Util; - using NUnit.Framework; - using System.IO; + using BytesRef = Lucene.Net.Util.BytesRef; using Directory = Lucene.Net.Store.Directory; using Document = Documents.Document; diff --git a/src/Lucene.Net.Tests/Search/Spans/TestFieldMaskingSpanQuery.cs b/src/Lucene.Net.Tests/Search/Spans/TestFieldMaskingSpanQuery.cs index b8f52bc..a87890d 100644 --- a/src/Lucene.Net.Tests/Search/Spans/TestFieldMaskingSpanQuery.cs +++ b/src/Lucene.Net.Tests/Search/Spans/TestFieldMaskingSpanQuery.cs @@ -3,6 +3,7 @@ using Lucene.Net.Index.Extensions; using NUnit.Framework; using System.Collections.Generic; using JCG = J2N.Collections.Generic; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Search.Spans { diff --git a/src/Lucene.Net.Tests/Search/Spans/TestNearSpansOrdered.cs b/src/Lucene.Net.Tests/Search/Spans/TestNearSpansOrdered.cs index e0d0f0d..2d65699 100644 --- a/src/Lucene.Net.Tests/Search/Spans/TestNearSpansOrdered.cs +++ b/src/Lucene.Net.Tests/Search/Spans/TestNearSpansOrdered.cs @@ -2,6 +2,7 @@ using Lucene.Net.Documents; using Lucene.Net.Index; using Lucene.Net.Index.Extensions; using NUnit.Framework; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Search.Spans { diff --git a/src/Lucene.Net.Tests/Search/Spans/TestPayloadSpans.cs b/src/Lucene.Net.Tests/Search/Spans/TestPayloadSpans.cs index f89a80f..be31ca8 100644 --- a/src/Lucene.Net.Tests/Search/Spans/TestPayloadSpans.cs +++ b/src/Lucene.Net.Tests/Search/Spans/TestPayloadSpans.cs @@ -8,6 +8,7 @@ using Lucene.Net.Documents; using NUnit.Framework; using System.IO; using JCG = J2N.Collections.Generic; +using Assert = Lucene.Net.TestFramework.Assert; using Console = Lucene.Net.Util.SystemConsole; namespace Lucene.Net.Search.Spans diff --git a/src/Lucene.Net.Tests/Search/Spans/TestSpanFirstQuery.cs b/src/Lucene.Net.Tests/Search/Spans/TestSpanFirstQuery.cs index 40e508f..0573ddb 100644 --- a/src/Lucene.Net.Tests/Search/Spans/TestSpanFirstQuery.cs +++ b/src/Lucene.Net.Tests/Search/Spans/TestSpanFirstQuery.cs @@ -1,25 +1,25 @@ using Lucene.Net.Documents; +using NUnit.Framework; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Search.Spans { - using NUnit.Framework; - /* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ using Analyzer = Lucene.Net.Analysis.Analyzer; using CharacterRunAutomaton = Lucene.Net.Util.Automaton.CharacterRunAutomaton; diff --git a/src/Lucene.Net.Tests/Search/Spans/TestSpanMultiTermQueryWrapper.cs b/src/Lucene.Net.Tests/Search/Spans/TestSpanMultiTermQueryWrapper.cs index b9e6fd2..9a87d66 100644 --- a/src/Lucene.Net.Tests/Search/Spans/TestSpanMultiTermQueryWrapper.cs +++ b/src/Lucene.Net.Tests/Search/Spans/TestSpanMultiTermQueryWrapper.cs @@ -1,8 +1,9 @@ using Lucene.Net.Documents; +using NUnit.Framework; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Search.Spans { - using NUnit.Framework; using Directory = Lucene.Net.Store.Directory; /* diff --git a/src/Lucene.Net.Tests/Search/Spans/TestSpans.cs b/src/Lucene.Net.Tests/Search/Spans/TestSpans.cs index 17fa10e..65d81eb 100644 --- a/src/Lucene.Net.Tests/Search/Spans/TestSpans.cs +++ b/src/Lucene.Net.Tests/Search/Spans/TestSpans.cs @@ -3,6 +3,7 @@ using Lucene.Net.Index; using Lucene.Net.Index.Extensions; using NUnit.Framework; using System.Collections.Generic; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Search.Spans { diff --git a/src/Lucene.Net.Tests/Search/Spans/TestSpansAdvanced.cs b/src/Lucene.Net.Tests/Search/Spans/TestSpansAdvanced.cs index 7b958d0..c652390 100644 --- a/src/Lucene.Net.Tests/Search/Spans/TestSpansAdvanced.cs +++ b/src/Lucene.Net.Tests/Search/Spans/TestSpansAdvanced.cs @@ -2,6 +2,7 @@ using Lucene.Net.Documents; using Lucene.Net.Index.Extensions; using NUnit.Framework; using System; +using Assert = Lucene.Net.TestFramework.Assert; using Console = Lucene.Net.Util.SystemConsole; namespace Lucene.Net.Search.Spans diff --git a/src/Lucene.Net.Tests/Search/Spans/TestSpansAdvanced2.cs b/src/Lucene.Net.Tests/Search/Spans/TestSpansAdvanced2.cs index ddf076d..26da105 100644 --- a/src/Lucene.Net.Tests/Search/Spans/TestSpansAdvanced2.cs +++ b/src/Lucene.Net.Tests/Search/Spans/TestSpansAdvanced2.cs @@ -1,5 +1,6 @@ using Lucene.Net.Index.Extensions; using NUnit.Framework; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Search.Spans { diff --git a/src/Lucene.Net.Tests/Search/TestAutomatonQuery.cs b/src/Lucene.Net.Tests/Search/TestAutomatonQuery.cs index d97a7ad..b6a46fd 100644 --- a/src/Lucene.Net.Tests/Search/TestAutomatonQuery.cs +++ b/src/Lucene.Net.Tests/Search/TestAutomatonQuery.cs @@ -4,6 +4,7 @@ using Lucene.Net.Documents; using NUnit.Framework; using System; using System.Threading; +using Assert = Lucene.Net.TestFramework.Assert; using Console = Lucene.Net.Util.SystemConsole; namespace Lucene.Net.Search diff --git a/src/Lucene.Net.Tests/Search/TestAutomatonQueryUnicode.cs b/src/Lucene.Net.Tests/Search/TestAutomatonQueryUnicode.cs index c0b86c8..4fbf422 100644 --- a/src/Lucene.Net.Tests/Search/TestAutomatonQueryUnicode.cs +++ b/src/Lucene.Net.Tests/Search/TestAutomatonQueryUnicode.cs @@ -1,8 +1,9 @@ using Lucene.Net.Documents; +using NUnit.Framework; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Search { - using NUnit.Framework; using Automaton = Lucene.Net.Util.Automaton.Automaton; using Directory = Lucene.Net.Store.Directory; diff --git a/src/Lucene.Net.Tests/Search/TestBoolean2.cs b/src/Lucene.Net.Tests/Search/TestBoolean2.cs index 8ea259f..c6bd56e 100644 --- a/src/Lucene.Net.Tests/Search/TestBoolean2.cs +++ b/src/Lucene.Net.Tests/Search/TestBoolean2.cs @@ -2,6 +2,7 @@ using Lucene.Net.Documents; using Lucene.Net.Index.Extensions; using NUnit.Framework; using System; +using Assert = Lucene.Net.TestFramework.Assert; using Console = Lucene.Net.Util.SystemConsole; namespace Lucene.Net.Search diff --git a/src/Lucene.Net.Tests/Search/TestBooleanMinShouldMatch.cs b/src/Lucene.Net.Tests/Search/TestBooleanMinShouldMatch.cs index 4387716..1b9df89 100644 --- a/src/Lucene.Net.Tests/Search/TestBooleanMinShouldMatch.cs +++ b/src/Lucene.Net.Tests/Search/TestBooleanMinShouldMatch.cs @@ -1,12 +1,12 @@ using System; using System.Globalization; using Lucene.Net.Documents; +using NUnit.Framework; +using Assert = Lucene.Net.TestFramework.Assert; using Console = Lucene.Net.Util.SystemConsole; namespace Lucene.Net.Search { - using Lucene.Net.Randomized.Generators; - using NUnit.Framework; using DefaultSimilarity = Lucene.Net.Search.Similarities.DefaultSimilarity; using Directory = Lucene.Net.Store.Directory; using Document = Documents.Document; diff --git a/src/Lucene.Net.Tests/Search/TestBooleanOr.cs b/src/Lucene.Net.Tests/Search/TestBooleanOr.cs index be7f8a1..05e720f 100644 --- a/src/Lucene.Net.Tests/Search/TestBooleanOr.cs +++ b/src/Lucene.Net.Tests/Search/TestBooleanOr.cs @@ -1,6 +1,7 @@ using J2N.Threading.Atomic; using Lucene.Net.Documents; using NUnit.Framework; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Search { diff --git a/src/Lucene.Net.Tests/Search/TestBooleanQuery.cs b/src/Lucene.Net.Tests/Search/TestBooleanQuery.cs index aaea68a..5a7dba0 100644 --- a/src/Lucene.Net.Tests/Search/TestBooleanQuery.cs +++ b/src/Lucene.Net.Tests/Search/TestBooleanQuery.cs @@ -1,16 +1,15 @@ +using Lucene.Net.Documents; +using Lucene.Net.Index; +using Lucene.Net.Util; +using NUnit.Framework; using System; using System.Collections.Generic; -using Lucene.Net.Documents; +using System.Threading.Tasks; +using Assert = Lucene.Net.TestFramework.Assert; using Console = Lucene.Net.Util.SystemConsole; namespace Lucene.Net.Search { - using Index; - using NUnit.Framework; - using Support; - using System.Threading.Tasks; - using Util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -40,6 +39,7 @@ namespace Lucene.Net.Search using IndexWriterConfig = Lucene.Net.Index.IndexWriterConfig; using LuceneTestCase = Lucene.Net.Util.LuceneTestCase; using MockAnalyzer = Lucene.Net.Analysis.MockAnalyzer; + using MultiReader = Lucene.Net.Index.MultiReader; using RandomIndexWriter = Lucene.Net.Index.RandomIndexWriter; using SpanQuery = Lucene.Net.Search.Spans.SpanQuery; using SpanTermQuery = Lucene.Net.Search.Spans.SpanTermQuery; diff --git a/src/Lucene.Net.Tests/Search/TestBooleanQueryVisitSubscorers.cs b/src/Lucene.Net.Tests/Search/TestBooleanQueryVisitSubscorers.cs index c5fd27b..0fdc6c4 100644 --- a/src/Lucene.Net.Tests/Search/TestBooleanQueryVisitSubscorers.cs +++ b/src/Lucene.Net.Tests/Search/TestBooleanQueryVisitSubscorers.cs @@ -3,6 +3,7 @@ using Lucene.Net.Documents; using Lucene.Net.Index.Extensions; using NUnit.Framework; using JCG = J2N.Collections.Generic; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Search { diff --git a/src/Lucene.Net.Tests/Search/TestBooleanScorer.cs b/src/Lucene.Net.Tests/Search/TestBooleanScorer.cs index ce7e502..b81886e 100644 --- a/src/Lucene.Net.Tests/Search/TestBooleanScorer.cs +++ b/src/Lucene.Net.Tests/Search/TestBooleanScorer.cs @@ -1,17 +1,15 @@ +using Lucene.Net.Documents; +using NUnit.Framework; using System; using System.Collections.Generic; -using Lucene.Net.Documents; +using System.Diagnostics; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Search { - using Lucene.Net.Support; - using NUnit.Framework; - using System.Diagnostics; using AtomicReaderContext = Lucene.Net.Index.AtomicReaderContext; - using IBits = Lucene.Net.Util.IBits; using BooleanWeight = Lucene.Net.Search.BooleanQuery.BooleanWeight; using Directory = Lucene.Net.Store.Directory; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -31,6 +29,7 @@ namespace Lucene.Net.Search using Document = Documents.Document; using Field = Field; + using IBits = Lucene.Net.Util.IBits; using IndexReader = Lucene.Net.Index.IndexReader; using LuceneTestCase = Lucene.Net.Util.LuceneTestCase; using RandomIndexWriter = Lucene.Net.Index.RandomIndexWriter; diff --git a/src/Lucene.Net.Tests/Search/TestCachingCollector.cs b/src/Lucene.Net.Tests/Search/TestCachingCollector.cs index cdb6e9d..75a46d7 100644 --- a/src/Lucene.Net.Tests/Search/TestCachingCollector.cs +++ b/src/Lucene.Net.Tests/Search/TestCachingCollector.cs @@ -1,8 +1,9 @@ +using NUnit.Framework; +using System; +using Assert = Lucene.Net.TestFramework.Assert; + namespace Lucene.Net.Search { - using NUnit.Framework; - using System; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/src/Lucene.Net.Tests/Search/TestCachingWrapperFilter.cs b/src/Lucene.Net.Tests/Search/TestCachingWrapperFilter.cs index b6ef29a..4aa832a 100644 --- a/src/Lucene.Net.Tests/Search/TestCachingWrapperFilter.cs +++ b/src/Lucene.Net.Tests/Search/TestCachingWrapperFilter.cs @@ -2,6 +2,7 @@ using Lucene.Net.Documents; using Lucene.Net.Index.Extensions; using NUnit.Framework; using System; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Search { diff --git a/src/Lucene.Net.Tests/Search/TestConjunctions.cs b/src/Lucene.Net.Tests/Search/TestConjunctions.cs index 7f7d198..5df4e67 100644 --- a/src/Lucene.Net.Tests/Search/TestConjunctions.cs +++ b/src/Lucene.Net.Tests/Search/TestConjunctions.cs @@ -1,6 +1,7 @@ using Lucene.Net.Documents; using Lucene.Net.Index.Extensions; using NUnit.Framework; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Search { diff --git a/src/Lucene.Net.Tests/Search/TestConstantScoreQuery.cs b/src/Lucene.Net.Tests/Search/TestConstantScoreQuery.cs index 3a83048..8929369 100644 --- a/src/Lucene.Net.Tests/Search/TestConstantScoreQuery.cs +++ b/src/Lucene.Net.Tests/Search/TestConstantScoreQuery.cs @@ -1,9 +1,10 @@ -using System.Diagnostics; using Lucene.Net.Documents; +using NUnit.Framework; +using System.Diagnostics; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Search { - using NUnit.Framework; using AtomicReaderContext = Lucene.Net.Index.AtomicReaderContext; using DefaultSimilarity = Lucene.Net.Search.Similarities.DefaultSimilarity; using Directory = Lucene.Net.Store.Directory; diff --git a/src/Lucene.Net.Tests/Search/TestCustomSearcherSort.cs b/src/Lucene.Net.Tests/Search/TestCustomSearcherSort.cs index 25af02b..a2bee8d 100644 --- a/src/Lucene.Net.Tests/Search/TestCustomSearcherSort.cs +++ b/src/Lucene.Net.Tests/Search/TestCustomSearcherSort.cs @@ -1,10 +1,11 @@ +using Lucene.Net.Documents; using NUnit.Framework; using System; using System.Collections.Generic; using System.Text; -using Lucene.Net.Documents; -using JCG = J2N.Collections.Generic; +using Assert = Lucene.Net.TestFramework.Assert; using Console = Lucene.Net.Util.SystemConsole; +using JCG = J2N.Collections.Generic; namespace Lucene.Net.Search { diff --git a/src/Lucene.Net.Tests/Search/TestDateFilter.cs b/src/Lucene.Net.Tests/Search/TestDateFilter.cs index 85786e5..8ec2d27 100644 --- a/src/Lucene.Net.Tests/Search/TestDateFilter.cs +++ b/src/Lucene.Net.Tests/Search/TestDateFilter.cs @@ -1,10 +1,11 @@ -using System; using Lucene.Net.Attributes; using Lucene.Net.Documents; +using NUnit.Framework; +using System; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Search { - using NUnit.Framework; using DateTools = DateTools; using Directory = Lucene.Net.Store.Directory; using Document = Documents.Document; diff --git a/src/Lucene.Net.Tests/Search/TestDisjunctionMaxQuery.cs b/src/Lucene.Net.Tests/Search/TestDisjunctionMaxQuery.cs index 298d087..818ad15 100644 --- a/src/Lucene.Net.Tests/Search/TestDisjunctionMaxQuery.cs +++ b/src/Lucene.Net.Tests/Search/TestDisjunctionMaxQuery.cs @@ -3,6 +3,7 @@ using System.Globalization; using Lucene.Net.Documents; using Lucene.Net.Index.Extensions; using NUnit.Framework; +using Assert = Lucene.Net.TestFramework.Assert; using Console = Lucene.Net.Util.SystemConsole; namespace Lucene.Net.Search diff --git a/src/Lucene.Net.Tests/Search/TestDocIdSet.cs b/src/Lucene.Net.Tests/Search/TestDocIdSet.cs index 101bd59..bd339dd 100644 --- a/src/Lucene.Net.Tests/Search/TestDocIdSet.cs +++ b/src/Lucene.Net.Tests/Search/TestDocIdSet.cs @@ -1,16 +1,15 @@ +using Lucene.Net.Documents; +using Lucene.Net.Support; +using NUnit.Framework; using System; using System.Collections.Generic; -using Lucene.Net.Documents; +using Assert = Lucene.Net.TestFramework.Assert; using Console = Lucene.Net.Util.SystemConsole; namespace Lucene.Net.Search { - using Lucene.Net.Support; - using NUnit.Framework; using AtomicReaderContext = Lucene.Net.Index.AtomicReaderContext; - using IBits = Lucene.Net.Util.IBits; using Directory = Lucene.Net.Store.Directory; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -30,6 +29,7 @@ namespace Lucene.Net.Search using Document = Documents.Document; using Field = Field; + using IBits = Lucene.Net.Util.IBits; using IndexReader = Lucene.Net.Index.IndexReader; using LuceneTestCase = Lucene.Net.Util.LuceneTestCase; using RandomIndexWriter = Lucene.Net.Index.RandomIndexWriter; diff --git a/src/Lucene.Net.Tests/Search/TestDocTermOrdsRewriteMethod.cs b/src/Lucene.Net.Tests/Search/TestDocTermOrdsRewriteMethod.cs index 5caba8b..a7d3429 100644 --- a/src/Lucene.Net.Tests/Search/TestDocTermOrdsRewriteMethod.cs +++ b/src/Lucene.Net.Tests/Search/TestDocTermOrdsRewriteMethod.cs @@ -4,6 +4,7 @@ using Lucene.Net.Util.Automaton; using NUnit.Framework; using System; using System.Collections.Generic; +using Assert = Lucene.Net.TestFramework.Assert; using Console = Lucene.Net.Util.SystemConsole; namespace Lucene.Net.Search diff --git a/src/Lucene.Net.Tests/Search/TestDocValuesScoring.cs b/src/Lucene.Net.Tests/Search/TestDocValuesScoring.cs index 763cbec..59ae1f3 100644 --- a/src/Lucene.Net.Tests/Search/TestDocValuesScoring.cs +++ b/src/Lucene.Net.Tests/Search/TestDocValuesScoring.cs @@ -1,13 +1,13 @@ using Lucene.Net.Documents; +using NUnit.Framework; +using System; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Search { - using Lucene.Net.Index; - using NUnit.Framework; using AtomicReaderContext = Lucene.Net.Index.AtomicReaderContext; using BytesRef = Lucene.Net.Util.BytesRef; using Directory = Lucene.Net.Store.Directory; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -28,14 +28,13 @@ namespace Lucene.Net.Search using Document = Documents.Document; using Field = Field; using FieldInvertState = Lucene.Net.Index.FieldInvertState; - using SingleDocValuesField = SingleDocValuesField; using IndexReader = Lucene.Net.Index.IndexReader; using LuceneTestCase = Lucene.Net.Util.LuceneTestCase; using PerFieldSimilarityWrapper = Lucene.Net.Search.Similarities.PerFieldSimilarityWrapper; using RandomIndexWriter = Lucene.Net.Index.RandomIndexWriter; using Similarity = Lucene.Net.Search.Similarities.Similarity; + using SingleDocValuesField = SingleDocValuesField; using Term = Lucene.Net.Index.Term; - using System; /// <summary> /// Tests the use of indexdocvalues in scoring. diff --git a/src/Lucene.Net.Tests/Search/TestElevationComparator.cs b/src/Lucene.Net.Tests/Search/TestElevationComparator.cs index 3296f2c..50e3b5f 100644 --- a/src/Lucene.Net.Tests/Search/TestElevationComparator.cs +++ b/src/Lucene.Net.Tests/Search/TestElevationComparator.cs @@ -5,6 +5,7 @@ using Lucene.Net.Store; using NUnit.Framework; using System; using System.Collections.Generic; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Search { diff --git a/src/Lucene.Net.Tests/Search/TestFieldCache.cs b/src/Lucene.Net.Tests/Search/TestFieldCache.cs index 1666206..20515cf 100644 --- a/src/Lucene.Net.Tests/Search/TestFieldCache.cs +++ b/src/Lucene.Net.Tests/Search/TestFieldCache.cs @@ -9,10 +9,11 @@ using System.Diagnostics; using System.Collections.Generic; using System.Globalization; using System.IO; +using System.Linq; using System.Text; using System.Threading; +using Assert = Lucene.Net.TestFramework.Assert; using Console = Lucene.Net.Util.SystemConsole; -using System.Linq; namespace Lucene.Net.Search { @@ -847,7 +848,7 @@ namespace Lucene.Net.Search #pragma warning disable 612, 618 Bytes bytes = cache.GetBytes(ar, "bogusbytes", true); - Assert.AreEqual(0, bytes.Get(0)); + Assert.AreEqual((byte)0, bytes.Get(0)); Int16s shorts = cache.GetInt16s(ar, "bogusshorts", true); Assert.AreEqual(0, shorts.Get(0)); @@ -920,7 +921,7 @@ namespace Lucene.Net.Search #pragma warning disable 612, 618 Bytes bytes = cache.GetBytes(ar, "bogusbytes", true); - Assert.AreEqual(0, bytes.Get(0)); + Assert.AreEqual((byte)0, bytes.Get(0)); Int16s shorts = cache.GetInt16s(ar, "bogusshorts", true); Assert.AreEqual(0, shorts.Get(0)); diff --git a/src/Lucene.Net.Tests/Search/TestFieldCacheRangeFilter.cs b/src/Lucene.Net.Tests/Search/TestFieldCacheRangeFilter.cs index 3be16ef..af4cd7e 100644 --- a/src/Lucene.Net.Tests/Search/TestFieldCacheRangeFilter.cs +++ b/src/Lucene.Net.Tests/Search/TestFieldCacheRangeFilter.cs @@ -3,6 +3,7 @@ using NUnit.Framework; using System; using System.Globalization; using System.IO; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Search { diff --git a/src/Lucene.Net.Tests/Search/TestFieldCacheRewriteMethod.cs b/src/Lucene.Net.Tests/Search/TestFieldCacheRewriteMethod.cs index c9c4f16..8590ebf 100644 --- a/src/Lucene.Net.Tests/Search/TestFieldCacheRewriteMethod.cs +++ b/src/Lucene.Net.Tests/Search/TestFieldCacheRewriteMethod.cs @@ -1,11 +1,9 @@ -using Lucene.Net.Attributes; using Lucene.Net.Util.Automaton; using NUnit.Framework; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Search { - using RegExp = Lucene.Net.Util.Automaton.RegExp; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/src/Lucene.Net.Tests/Search/TestFieldCacheTermsFilter.cs b/src/Lucene.Net.Tests/Search/TestFieldCacheTermsFilter.cs index 709388a..66e2f65 100644 --- a/src/Lucene.Net.Tests/Search/TestFieldCacheTermsFilter.cs +++ b/src/Lucene.Net.Tests/Search/TestFieldCacheTermsFilter.cs @@ -1,9 +1,10 @@ -using System.Collections.Generic; using Lucene.Net.Documents; +using NUnit.Framework; +using System.Collections.Generic; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Search { - using NUnit.Framework; using Directory = Lucene.Net.Store.Directory; using Document = Documents.Document; diff --git a/src/Lucene.Net.Tests/Search/TestFieldValueFilter.cs b/src/Lucene.Net.Tests/Search/TestFieldValueFilter.cs index 5254f95..93779f0 100644 --- a/src/Lucene.Net.Tests/Search/TestFieldValueFilter.cs +++ b/src/Lucene.Net.Tests/Search/TestFieldValueFilter.cs @@ -1,9 +1,9 @@ using Lucene.Net.Documents; +using NUnit.Framework; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Search { - using Lucene.Net.Randomized.Generators; - using NUnit.Framework; using Directory = Lucene.Net.Store.Directory; using DirectoryReader = Lucene.Net.Index.DirectoryReader; using Document = Documents.Document; diff --git a/src/Lucene.Net.Tests/Search/TestFilteredQuery.cs b/src/Lucene.Net.Tests/Search/TestFilteredQuery.cs index 82ae64b..c049a55 100644 --- a/src/Lucene.Net.Tests/Search/TestFilteredQuery.cs +++ b/src/Lucene.Net.Tests/Search/TestFilteredQuery.cs @@ -5,6 +5,7 @@ using Lucene.Net.Util; using NUnit.Framework; using System; using System.Collections; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Search { diff --git a/src/Lucene.Net.Tests/Search/TestFilteredSearch.cs b/src/Lucene.Net.Tests/Search/TestFilteredSearch.cs index 0fea9ba..eebb04a 100644 --- a/src/Lucene.Net.Tests/Search/TestFilteredSearch.cs +++ b/src/Lucene.Net.Tests/Search/TestFilteredSearch.cs @@ -18,6 +18,7 @@ using Lucene.Net.Documents; using Lucene.Net.Index.Extensions; using NUnit.Framework; using System; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Search { diff --git a/src/Lucene.Net.Tests/Search/TestFuzzyQuery.cs b/src/Lucene.Net.Tests/Search/TestFuzzyQuery.cs index ef81666..04eb951 100644 --- a/src/Lucene.Net.Tests/Search/TestFuzzyQuery.cs +++ b/src/Lucene.Net.Tests/Search/TestFuzzyQuery.cs @@ -1,11 +1,10 @@ -using System.Collections.Generic; using Lucene.Net.Documents; -using Lucene.Net.Util; +using NUnit.Framework; +using System.Collections.Generic; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Search { - using Lucene.Net.Support; - using NUnit.Framework; using Directory = Lucene.Net.Store.Directory; using Document = Documents.Document; using Field = Field; diff --git a/src/Lucene.Net.Tests/Search/TestLiveFieldValues.cs b/src/Lucene.Net.Tests/Search/TestLiveFieldValues.cs index 9686e1a..29ba0ca 100644 --- a/src/Lucene.Net.Tests/Search/TestLiveFieldValues.cs +++ b/src/Lucene.Net.Tests/Search/TestLiveFieldValues.cs @@ -6,6 +6,7 @@ using System; using System.Collections.Generic; using System.Globalization; using System.Threading; +using Assert = Lucene.Net.TestFramework.Assert; using Console = Lucene.Net.Util.SystemConsole; namespace Lucene.Net.Search diff --git a/src/Lucene.Net.Tests/Search/TestMatchAllDocsQuery.cs b/src/Lucene.Net.Tests/Search/TestMatchAllDocsQuery.cs index 51ee477..86db603 100644 --- a/src/Lucene.Net.Tests/Search/TestMatchAllDocsQuery.cs +++ b/src/Lucene.Net.Tests/Search/TestMatchAllDocsQuery.cs @@ -18,6 +18,7 @@ using Lucene.Net.Documents; using Lucene.Net.Index.Extensions; using NUnit.Framework; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Search { diff --git a/src/Lucene.Net.Tests/Search/TestMinShouldMatch2.cs b/src/Lucene.Net.Tests/Search/TestMinShouldMatch2.cs index 84e92cd..6db5e1b 100644 --- a/src/Lucene.Net.Tests/Search/TestMinShouldMatch2.cs +++ b/src/Lucene.Net.Tests/Search/TestMinShouldMatch2.cs @@ -6,6 +6,7 @@ using Lucene.Net.Util; using NUnit.Framework; using System.Collections.Generic; using System.Diagnostics; +using Assert = Lucene.Net.TestFramework.Assert; using JCG = J2N.Collections.Generic; using J2N.Collections.Generic.Extensions; diff --git a/src/Lucene.Net.Tests/Search/TestMultiPhraseQuery.cs b/src/Lucene.Net.Tests/Search/TestMultiPhraseQuery.cs index 567ef03..ca460c7 100644 --- a/src/Lucene.Net.Tests/Search/TestMultiPhraseQuery.cs +++ b/src/Lucene.Net.Tests/Search/TestMultiPhraseQuery.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using Lucene.Net.Documents; using NUnit.Framework; +using Assert = Lucene.Net.TestFramework.Assert; using Console = Lucene.Net.Util.SystemConsole; namespace Lucene.Net.Search diff --git a/src/Lucene.Net.Tests/Search/TestMultiTermConstantScore.cs b/src/Lucene.Net.Tests/Search/TestMultiTermConstantScore.cs index 3742e07..deaac96 100644 --- a/src/Lucene.Net.Tests/Search/TestMultiTermConstantScore.cs +++ b/src/Lucene.Net.Tests/Search/TestMultiTermConstantScore.cs @@ -2,6 +2,7 @@ using Lucene.Net.Documents; using Lucene.Net.Index.Extensions; using NUnit.Framework; using System; +using Assert = Lucene.Net.TestFramework.Assert; using Console = Lucene.Net.Util.SystemConsole; namespace Lucene.Net.Search @@ -50,11 +51,6 @@ namespace Lucene.Net.Search internal /*static*/ Directory Small; internal /*static*/ IndexReader Reader; - public static void AssertEquals(string m, int e, int a) - { - Assert.AreEqual(e, a, m); - } - /// <summary> /// LUCENENET specific /// Is non-static because NewIndexWriterConfig is no longer static. @@ -167,7 +163,7 @@ namespace Lucene.Net.Search result = search.Search(Csrq("data", "1", "6", T, T), null, 1000).ScoreDocs; int numHits = result.Length; - AssertEquals("wrong number of results", 6, numHits); + assertEquals("wrong number of results", 6, numHits); float score = result[0].Score; for (int i = 1; i < numHits; i++) { @@ -176,7 +172,7 @@ namespace Lucene.Net.Search result = search.Search(Csrq("data", "1", "6", T, T, MultiTermQuery.CONSTANT_SCORE_BOOLEAN_QUERY_REWRITE), null, 1000).ScoreDocs; numHits = result.Length; - AssertEquals("wrong number of results", 6, numHits); + assertEquals("wrong number of results", 6, numHits); for (int i = 0; i < numHits; i++) { Assert.AreEqual(score, result[i].Score, SCORE_COMP_THRESH, "score for " + i + " was not the same"); @@ -184,7 +180,7 @@ namespace Lucene.Net.Search result = search.Search(Csrq("data", "1", "6", T, T, MultiTermQuery.CONSTANT_SCORE_AUTO_REWRITE_DEFAULT), null, 1000).ScoreDocs; numHits = result.Length; - AssertEquals("wrong number of results", 6, numHits); + assertEquals("wrong number of results", 6, numHits); for (int i = 0; i < numHits; i++) { Assert.AreEqual(score, result[i].Score, SCORE_COMP_THRESH, "score for " + i + " was not the same"); @@ -207,7 +203,7 @@ namespace Lucene.Net.Search bq.Add(Csrq("data", "#", "#", T, T), Occur.SHOULD); // hits no docs result = search.Search(bq, null, 1000).ScoreDocs; int numHits = result.Length; - AssertEquals("wrong number of results", 1, numHits); + assertEquals("wrong number of results", 1, numHits); float score = result[0].Score; for (int i = 1; i < numHits; i++) { @@ -219,7 +215,7 @@ namespace Lucene.Net.Search bq.Add(Csrq("data", "#", "#", T, T, MultiTermQuery.CONSTANT_SCORE_BOOLEAN_QUERY_REWRITE), Occur.SHOULD); // hits no docs result = search.Search(bq, null, 1000).ScoreDocs; numHits = result.Length; - AssertEquals("wrong number of results", 1, numHits); + assertEquals("wrong number of results", 1, numHits); for (int i = 0; i < numHits; i++) { Assert.AreEqual(score, result[i].Score, SCORE_COMP_THRESH, "score for " + i + " was not the same"); @@ -230,7 +226,7 @@ namespace Lucene.Net.Search bq.Add(Csrq("data", "#", "#", T, T, MultiTermQuery.CONSTANT_SCORE_AUTO_REWRITE_DEFAULT), Occur.SHOULD); // hits no docs result = search.Search(bq, null, 1000).ScoreDocs; numHits = result.Length; - AssertEquals("wrong number of results", 1, numHits); + assertEquals("wrong number of results", 1, numHits); for (int i = 0; i < numHits; i++) { Assert.AreEqual(score, result[i].Score, SCORE_COMP_THRESH, "score for " + i + " was not the same"); @@ -351,10 +347,10 @@ namespace Lucene.Net.Search ScoreDoc[] actual = search.Search(q, null, 1000).ScoreDocs; - AssertEquals("wrong numebr of hits", numHits, actual.Length); + assertEquals("wrong numebr of hits", numHits, actual.Length); for (int i = 0; i < numHits; i++) { - AssertEquals("mismatch in docid for hit#" + i, expected[i].Doc, actual[i].Doc); + assertEquals("mismatch in docid for hit#" + i, expected[i].Doc, actual[i].Doc); } } @@ -379,117 +375,117 @@ namespace Lucene.Net.Search int numDocs = reader.NumDocs; - AssertEquals("num of docs", numDocs, 1 + MaxId - MinId); + assertEquals("num of docs", numDocs, 1 + MaxId - MinId); ScoreDoc[] result; // test id, bounded on both ends result = search.Search(Csrq("id", minIP, maxIP, T, T), null, numDocs).ScoreDocs; - AssertEquals("find all", numDocs, result.Length); + assertEquals("find all", numDocs, result.Length); result = search.Search(Csrq("id", minIP, maxIP, T, T, MultiTermQuery.CONSTANT_SCORE_AUTO_REWRITE_DEFAULT), null, numDocs).ScoreDocs; - AssertEquals("find all", numDocs, result.Length); + assertEquals("find all", numDocs, result.Length); result = search.Search(Csrq("id", minIP, maxIP, T, F), null, numDocs).ScoreDocs; - AssertEquals("all but last", numDocs - 1, result.Length); + assertEquals("all but last", numDocs - 1, result.Length); result = search.Search(Csrq("id", minIP, maxIP, T, F, MultiTermQuery.CONSTANT_SCORE_AUTO_REWRITE_DEFAULT), null, numDocs).ScoreDocs; - AssertEquals("all but last", numDocs - 1, result.Length); + assertEquals("all but last", numDocs - 1, result.Length); result = search.Search(Csrq("id", minIP, maxIP, F, T), null, numDocs).ScoreDocs; - AssertEquals("all but first", numDocs - 1, result.Length); + assertEquals("all but first", numDocs - 1, result.Length); result = search.Search(Csrq("id", minIP, maxIP, F, T, MultiTermQuery.CONSTANT_SCORE_AUTO_REWRITE_DEFAULT), null, numDocs).ScoreDocs; - AssertEquals("all but first", numDocs - 1, result.Length); + assertEquals("all but first", numDocs - 1, result.Length); result = search.Search(Csrq("id", minIP, maxIP, F, F), null, numDocs).ScoreDocs; - AssertEquals("all but ends", numDocs - 2, result.Length); + assertEquals("all but ends", numDocs - 2, result.Length); result = search.Search(Csrq("id", minIP, maxIP, F, F, MultiTermQuery.CONSTANT_SCORE_AUTO_REWRITE_DEFAULT), null, numDocs).ScoreDocs; - AssertEquals("all but ends", numDocs - 2, result.Length); + assertEquals("all but ends", numDocs - 2, result.Length); result = search.Search(Csrq("id", medIP, maxIP, T, T), null, numDocs).ScoreDocs; - AssertEquals("med and up", 1 + MaxId - medId, result.Length); + assertEquals("med and up", 1 + MaxId - medId, result.Length); result = search.Search(Csrq("id", medIP, maxIP, T, T, MultiTermQuery.CONSTANT_SCORE_AUTO_REWRITE_DEFAULT), null, numDocs).ScoreDocs; - AssertEquals("med and up", 1 + MaxId - medId, result.Length); + assertEquals("med and up", 1 + MaxId - medId, result.Length); result = search.Search(Csrq("id", minIP, medIP, T, T), null, numDocs).ScoreDocs; - AssertEquals("up to med", 1 + medId - MinId, result.Length); + assertEquals("up to med", 1 + medId - MinId, result.Length); result = search.Search(Csrq("id", minIP, medIP, T, T, MultiTermQuery.CONSTANT_SCORE_AUTO_REWRITE_DEFAULT), null, numDocs).ScoreDocs; - AssertEquals("up to med", 1 + medId - MinId, result.Length); + assertEquals("up to med", 1 + medId - MinId, result.Length); // unbounded id result = search.Search(Csrq("id", minIP, null, T, F), null, numDocs).ScoreDocs; - AssertEquals("min and up", numDocs, result.Length); + assertEquals("min and up", numDocs, result.Length); result = search.Search(Csrq("id", null, maxIP, F, T), null, numDocs).ScoreDocs; - AssertEquals("max and down", numDocs, result.Length); + assertEquals("max and down", numDocs, result.Length); result = search.Search(Csrq("id", minIP, null, F, F), null, numDocs).ScoreDocs; - AssertEquals("not min, but up", numDocs - 1, result.Length); + assertEquals("not min, but up", numDocs - 1, result.Length); result = search.Search(Csrq("id", null, maxIP, F, F), null, numDocs).ScoreDocs; - AssertEquals("not max, but down", numDocs - 1, result.Length); + assertEquals("not max, but down", numDocs - 1, result.Length); result = search.Search(Csrq("id", medIP, maxIP, T, F), null, numDocs).ScoreDocs; - AssertEquals("med and up, not max", MaxId - medId, result.Length); + assertEquals("med and up, not max", MaxId - medId, result.Length); result = search.Search(Csrq("id", minIP, medIP, F, T), null, numDocs).ScoreDocs; - AssertEquals("not min, up to med", medId - MinId, result.Length); + assertEquals("not min, up to med", medId - MinId, result.Length); // very small sets result = search.Search(Csrq("id", minIP, minIP, F, F), null, numDocs).ScoreDocs; - AssertEquals("min,min,F,F", 0, result.Length); + assertEquals("min,min,F,F", 0, result.Length); result = search.Search(Csrq("id", minIP, minIP, F, F, MultiTermQuery.CONSTANT_SCORE_AUTO_REWRITE_DEFAULT), null, numDocs).ScoreDocs; - AssertEquals("min,min,F,F", 0, result.Length); + assertEquals("min,min,F,F", 0, result.Length); result = search.Search(Csrq("id", medIP, medIP, F, F), null, numDocs).ScoreDocs; - AssertEquals("med,med,F,F", 0, result.Length); + assertEquals("med,med,F,F", 0, result.Length); result = search.Search(Csrq("id", medIP, medIP, F, F, MultiTermQuery.CONSTANT_SCORE_AUTO_REWRITE_DEFAULT), null, numDocs).ScoreDocs; - AssertEquals("med,med,F,F", 0, result.Length); + assertEquals("med,med,F,F", 0, result.Length); result = search.Search(Csrq("id", maxIP, maxIP, F, F), null, numDocs).ScoreDocs; - AssertEquals("max,max,F,F", 0, result.Length); + assertEquals("max,max,F,F", 0, result.Length); result = search.Search(Csrq("id", maxIP, maxIP, F, F, MultiTermQuery.CONSTANT_SCORE_AUTO_REWRITE_DEFAULT), null, numDocs).ScoreDocs; - AssertEquals("max,max,F,F", 0, result.Length); + assertEquals("max,max,F,F", 0, result.Length); result = search.Search(Csrq("id", minIP, minIP, T, T), null, numDocs).ScoreDocs; - AssertEquals("min,min,T,T", 1, result.Length); + assertEquals("min,min,T,T", 1, result.Length); result = search.Search(Csrq("id", minIP, minIP, T, T, MultiTermQuery.CONSTANT_SCORE_AUTO_REWRITE_DEFAULT), null, numDocs).ScoreDocs; - AssertEquals("min,min,T,T", 1, result.Length); + assertEquals("min,min,T,T", 1, result.Length); result = search.Search(Csrq("id", null, minIP, F, T), null, numDocs).ScoreDocs; - AssertEquals("nul,min,F,T", 1, result.Length); + assertEquals("nul,min,F,T", 1, result.Length); result = search.Search(Csrq("id", null, minIP, F, T, MultiTermQuery.CONSTANT_SCORE_AUTO_REWRITE_DEFAULT), null, numDocs).ScoreDocs; - AssertEquals("nul,min,F,T", 1, result.Length); + assertEquals("nul,min,F,T", 1, result.Length); result = search.Search(Csrq("id", maxIP, maxIP, T, T), null, numDocs).ScoreDocs; - AssertEquals("max,max,T,T", 1, result.Length); + assertEquals("max,max,T,T", 1, result.Length); result = search.Search(Csrq("id", maxIP, maxIP, T, T, MultiTermQuery.CONSTANT_SCORE_AUTO_REWRITE_DEFAULT), null, numDocs).ScoreDocs; - AssertEquals("max,max,T,T", 1, result.Length); + assertEquals("max,max,T,T", 1, result.Length); result = search.Search(Csrq("id", maxIP, null, T, F), null, numDocs).ScoreDocs; - AssertEquals("max,nul,T,T", 1, result.Length); + assertEquals("max,nul,T,T", 1, result.Length); result = search.Search(Csrq("id", maxIP, null, T, F, MultiTermQuery.CONSTANT_SCORE_AUTO_REWRITE_DEFAULT), null, numDocs).ScoreDocs; - AssertEquals("max,nul,T,T", 1, result.Length); + assertEquals("max,nul,T,T", 1, result.Length); result = search.Search(Csrq("id", medIP, medIP, T, T), null, numDocs).ScoreDocs; - AssertEquals("med,med,T,T", 1, result.Length); + assertEquals("med,med,T,T", 1, result.Length); result = search.Search(Csrq("id", medIP, medIP, T, T, MultiTermQuery.CONSTANT_SCORE_AUTO_REWRITE_DEFAULT), null, numDocs).ScoreDocs; - AssertEquals("med,med,T,T", 1, result.Length); + assertEquals("med,med,T,T", 1, result.Length); } [Test] @@ -505,54 +501,54 @@ namespace Lucene.Net.Search int numDocs = reader.NumDocs; - AssertEquals("num of docs", numDocs, 1 + MaxId - MinId); + assertEquals("num of docs", numDocs, 1 + MaxId - MinId); ScoreDoc[] result; // test extremes, bounded on both ends result = search.Search(Csrq("rand", minRP, maxRP, T, T), null, numDocs).ScoreDocs; - AssertEquals("find all", numDocs, result.Length); + assertEquals("find all", numDocs, result.Length); result = search.Search(Csrq("rand", minRP, maxRP, T, F), null, numDocs).ScoreDocs; - AssertEquals("all but biggest", numDocs - 1, result.Length); + assertEquals("all but biggest", numDocs - 1, result.Length); result = search.Search(Csrq("rand", minRP, maxRP, F, T), null, numDocs).ScoreDocs; - AssertEquals("all but smallest", numDocs - 1, result.Length); + assertEquals("all but smallest", numDocs - 1, result.Length); result = search.Search(Csrq("rand", minRP, maxRP, F, F), null, numDocs).ScoreDocs; - AssertEquals("all but extremes", numDocs - 2, result.Length); + assertEquals("all but extremes", numDocs - 2, result.Length); // unbounded result = search.Search(Csrq("rand", minRP, null, T, F), null, numDocs).ScoreDocs; - AssertEquals("smallest and up", numDocs, result.Length); + assertEquals("smallest and up", numDocs, result.Length); result = search.Search(Csrq("rand", null, maxRP, F, T), null, numDocs).ScoreDocs; - AssertEquals("biggest and down", numDocs, result.Length); + assertEquals("biggest and down", numDocs, result.Length); result = search.Search(Csrq("rand", minRP, null, F, F), null, numDocs).ScoreDocs; - AssertEquals("not smallest, but up", numDocs - 1, result.Length); + assertEquals("not smallest, but up", numDocs - 1, result.Length); result = search.Search(Csrq("rand", null, maxRP, F, F), null, numDocs).ScoreDocs; - AssertEquals("not biggest, but down", numDocs - 1, result.Length); + assertEquals("not biggest, but down", numDocs - 1, result.Length); // very small sets result = search.Search(Csrq("rand", minRP, minRP, F, F), null, numDocs).ScoreDocs; - AssertEquals("min,min,F,F", 0, result.Length); + assertEquals("min,min,F,F", 0, result.Length); result = search.Search(Csrq("rand", maxRP, maxRP, F, F), null, numDocs).ScoreDocs; - AssertEquals("max,max,F,F", 0, result.Length); + assertEquals("max,max,F,F", 0, result.Length); result = search.Search(Csrq("rand", minRP, minRP, T, T), null, numDocs).ScoreDocs; - AssertEquals("min,min,T,T", 1, result.Length); + assertEquals("min,min,T,T", 1, result.Length); result = search.Search(Csrq("rand", null, minRP, F, T), null, numDocs).ScoreDocs; - AssertEquals("nul,min,F,T", 1, result.Length); + assertEquals("nul,min,F,T", 1, result.Length); result = search.Search(Csrq("rand", maxRP, maxRP, T, T), null, numDocs).ScoreDocs; - AssertEquals("max,max,T,T", 1, result.Length); + assertEquals("max,max,T,T", 1, result.Length); result = search.Search(Csrq("rand", maxRP, null, T, F), null, numDocs).ScoreDocs; - AssertEquals("max,nul,T,T", 1, result.Length); + assertEquals("max,nul,T,T", 1, result.Length); } } } \ No newline at end of file diff --git a/src/Lucene.Net.Tests/Search/TestMultiTermQueryRewrites.cs b/src/Lucene.Net.Tests/Search/TestMultiTermQueryRewrites.cs index a53b1ce..4ca6a68 100644 --- a/src/Lucene.Net.Tests/Search/TestMultiTermQueryRewrites.cs +++ b/src/Lucene.Net.Tests/Search/TestMultiTermQueryRewrites.cs @@ -1,13 +1,13 @@ +using Lucene.Net.Documents; +using NUnit.Framework; using System; using System.Diagnostics; -using Lucene.Net.Documents; +using System.Runtime.CompilerServices; +using Assert = Lucene.Net.TestFramework.Assert; using Console = Lucene.Net.Util.SystemConsole; namespace Lucene.Net.Search { - using NUnit.Framework; - using System.Runtime.CompilerServices; - using Util; using AttributeSource = Lucene.Net.Util.AttributeSource; using BytesRef = Lucene.Net.Util.BytesRef; using Directory = Lucene.Net.Store.Directory; diff --git a/src/Lucene.Net.Tests/Search/TestMultiValuedNumericRangeQuery.cs b/src/Lucene.Net.Tests/Search/TestMultiValuedNumericRangeQuery.cs index bd1d849..8cc786f 100644 --- a/src/Lucene.Net.Tests/Search/TestMultiValuedNumericRangeQuery.cs +++ b/src/Lucene.Net.Tests/Search/TestMultiValuedNumericRangeQuery.cs @@ -1,6 +1,7 @@ using Lucene.Net.Documents; using Lucene.Net.Index.Extensions; using NUnit.Framework; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Search { diff --git a/src/Lucene.Net.Tests/Search/TestNGramPhraseQuery.cs b/src/Lucene.Net.Tests/Search/TestNGramPhraseQuery.cs index 01275e8..0df327f 100644 --- a/src/Lucene.Net.Tests/Search/TestNGramPhraseQuery.cs +++ b/src/Lucene.Net.Tests/Search/TestNGramPhraseQuery.cs @@ -1,6 +1,8 @@ +using NUnit.Framework; +using Assert = Lucene.Net.TestFramework.Assert; + namespace Lucene.Net.Search { - using NUnit.Framework; using Directory = Lucene.Net.Store.Directory; /* diff --git a/src/Lucene.Net.Tests/Search/TestNot.cs b/src/Lucene.Net.Tests/Search/TestNot.cs index f6a2328..5557433 100644 --- a/src/Lucene.Net.Tests/Search/TestNot.cs +++ b/src/Lucene.Net.Tests/Search/TestNot.cs @@ -1,8 +1,9 @@ using Lucene.Net.Documents; +using NUnit.Framework; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Search { - using NUnit.Framework; using Directory = Lucene.Net.Store.Directory; using Document = Documents.Document; diff --git a/src/Lucene.Net.Tests/Search/TestNumericRangeQuery32.cs b/src/Lucene.Net.Tests/Search/TestNumericRangeQuery32.cs index 4140353..da686d7 100644 --- a/src/Lucene.Net.Tests/Search/TestNumericRangeQuery32.cs +++ b/src/Lucene.Net.Tests/Search/TestNumericRangeQuery32.cs @@ -3,6 +3,7 @@ using Lucene.Net.Index.Extensions; using NUnit.Framework; using System; using System.Diagnostics; +using Assert = Lucene.Net.TestFramework.Assert; using Console = Lucene.Net.Util.SystemConsole; namespace Lucene.Net.Search diff --git a/src/Lucene.Net.Tests/Search/TestNumericRangeQuery64.cs b/src/Lucene.Net.Tests/Search/TestNumericRangeQuery64.cs index c1482e8..750e287 100644 --- a/src/Lucene.Net.Tests/Search/TestNumericRangeQuery64.cs +++ b/src/Lucene.Net.Tests/Search/TestNumericRangeQuery64.cs @@ -3,6 +3,7 @@ using Lucene.Net.Index.Extensions; using NUnit.Framework; using System; using System.Diagnostics; +using Assert = Lucene.Net.TestFramework.Assert; using Console = Lucene.Net.Util.SystemConsole; namespace Lucene.Net.Search diff --git a/src/Lucene.Net.Tests/Search/TestPhrasePrefixQuery.cs b/src/Lucene.Net.Tests/Search/TestPhrasePrefixQuery.cs index 83cfdc1..cd52431 100644 --- a/src/Lucene.Net.Tests/Search/TestPhrasePrefixQuery.cs +++ b/src/Lucene.Net.Tests/Search/TestPhrasePrefixQuery.cs @@ -2,10 +2,11 @@ using System; using System.Collections.Generic; using System.Linq; using Lucene.Net.Documents; +using NUnit.Framework; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Search { - using NUnit.Framework; using BytesRef = Lucene.Net.Util.BytesRef; using Directory = Lucene.Net.Store.Directory; using Document = Documents.Document; diff --git a/src/Lucene.Net.Tests/Search/TestPhraseQuery.cs b/src/Lucene.Net.Tests/Search/TestPhraseQuery.cs index fe8f091..cba997b 100644 --- a/src/Lucene.Net.Tests/Search/TestPhraseQuery.cs +++ b/src/Lucene.Net.Tests/Search/TestPhraseQuery.cs @@ -9,6 +9,7 @@ using System; using System.Collections.Generic; using System.IO; using System.Text; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Search { diff --git a/src/Lucene.Net.Tests/Search/TestPositionIncrement.cs b/src/Lucene.Net.Tests/Search/TestPositionIncrement.cs index ce05331..c1c7c43 100644 --- a/src/Lucene.Net.Tests/Search/TestPositionIncrement.cs +++ b/src/Lucene.Net.Tests/Search/TestPositionIncrement.cs @@ -1,8 +1,7 @@ using Lucene.Net.Analysis.TokenAttributes; +using Lucene.Net.Documents; using System; -using System.Collections.Generic; using System.Text; -using Lucene.Net.Documents; using Console = Lucene.Net.Util.SystemConsole; namespace Lucene.Net.Search diff --git a/src/Lucene.Net.Tests/Search/TestPositiveScoresOnlyCollector.cs b/src/Lucene.Net.Tests/Search/TestPositiveScoresOnlyCollector.cs index bb5a51e..0366104 100644 --- a/src/Lucene.Net.Tests/Search/TestPositiveScoresOnlyCollector.cs +++ b/src/Lucene.Net.Tests/Search/TestPositiveScoresOnlyCollector.cs @@ -1,6 +1,8 @@ +using NUnit.Framework; +using Assert = Lucene.Net.TestFramework.Assert; + namespace Lucene.Net.Search { - using NUnit.Framework; using Directory = Lucene.Net.Store.Directory; /* diff --git a/src/Lucene.Net.Tests/Search/TestPrefixFilter.cs b/src/Lucene.Net.Tests/Search/TestPrefixFilter.cs index 31b2db2..aaabcaa 100644 --- a/src/Lucene.Net.Tests/Search/TestPrefixFilter.cs +++ b/src/Lucene.Net.Tests/Search/TestPrefixFilter.cs @@ -1,8 +1,9 @@ using Lucene.Net.Documents; +using NUnit.Framework; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Search { - using NUnit.Framework; using Directory = Lucene.Net.Store.Directory; using Document = Documents.Document; diff --git a/src/Lucene.Net.Tests/Search/TestPrefixInBooleanQuery.cs b/src/Lucene.Net.Tests/Search/TestPrefixInBooleanQuery.cs index 299878b..cad223a 100644 --- a/src/Lucene.Net.Tests/Search/TestPrefixInBooleanQuery.cs +++ b/src/Lucene.Net.Tests/Search/TestPrefixInBooleanQuery.cs @@ -1,8 +1,9 @@ using Lucene.Net.Documents; +using NUnit.Framework; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Search { - using NUnit.Framework; using Directory = Lucene.Net.Store.Directory; /* diff --git a/src/Lucene.Net.Tests/Search/TestPrefixQuery.cs b/src/Lucene.Net.Tests/Search/TestPrefixQuery.cs index 9b5ecb6..7e26569 100644 --- a/src/Lucene.Net.Tests/Search/TestPrefixQuery.cs +++ b/src/Lucene.Net.Tests/Search/TestPrefixQuery.cs @@ -1,8 +1,9 @@ using Lucene.Net.Documents; +using NUnit.Framework; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Search { - using NUnit.Framework; using Directory = Lucene.Net.Store.Directory; using Document = Documents.Document; diff --git a/src/Lucene.Net.Tests/Search/TestQueryRescorer.cs b/src/Lucene.Net.Tests/Search/TestQueryRescorer.cs index 02a41fa..5818a41 100644 --- a/src/Lucene.Net.Tests/Search/TestQueryRescorer.cs +++ b/src/Lucene.Net.Tests/Search/TestQueryRescorer.cs @@ -1,13 +1,13 @@ using Lucene.Net.Documents; +using Lucene.Net.Support; +using NUnit.Framework; using System; +using System.Collections.Generic; using System.Text; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Search { - using Lucene.Net.Support; - using NUnit.Framework; - using System.Collections.Generic; - using System.IO; using AtomicReaderContext = Lucene.Net.Index.AtomicReaderContext; using DefaultSimilarity = Lucene.Net.Search.Similarities.DefaultSimilarity; using Directory = Lucene.Net.Store.Directory; diff --git a/src/Lucene.Net.Tests/Search/TestQueryWrapperFilter.cs b/src/Lucene.Net.Tests/Search/TestQueryWrapperFilter.cs index 38d9f65..3e79d19 100644 --- a/src/Lucene.Net.Tests/Search/TestQueryWrapperFilter.cs +++ b/src/Lucene.Net.Tests/Search/TestQueryWrapperFilter.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using Lucene.Net.Documents; using Lucene.Net.Index.Extensions; using NUnit.Framework; +using Assert = Lucene.Net.TestFramework.Assert; using JCG = J2N.Collections.Generic; namespace Lucene.Net.Search diff --git a/src/Lucene.Net.Tests/Search/TestRegexpQuery.cs b/src/Lucene.Net.Tests/Search/TestRegexpQuery.cs index b6ff47a..6cac647 100644 --- a/src/Lucene.Net.Tests/Search/TestRegexpQuery.cs +++ b/src/Lucene.Net.Tests/Search/TestRegexpQuery.cs @@ -1,17 +1,15 @@ -using Lucene.Net.Util.Automaton; using Lucene.Net.Documents; -using Lucene.Net.Support; +using Lucene.Net.Util.Automaton; using NUnit.Framework; using System; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Search { using Automaton = Lucene.Net.Util.Automaton.Automaton; - using IAutomatonProvider = Lucene.Net.Util.Automaton.IAutomatonProvider; using BasicAutomata = Lucene.Net.Util.Automaton.BasicAutomata; using BasicOperations = Lucene.Net.Util.Automaton.BasicOperations; using Directory = Lucene.Net.Store.Directory; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -31,10 +29,10 @@ namespace Lucene.Net.Search using Document = Documents.Document; using Field = Field; + using IAutomatonProvider = Lucene.Net.Util.Automaton.IAutomatonProvider; using IndexReader = Lucene.Net.Index.IndexReader; using LuceneTestCase = Lucene.Net.Util.LuceneTestCase; using RandomIndexWriter = Lucene.Net.Index.RandomIndexWriter; - using RegExp = Lucene.Net.Util.Automaton.RegExp; using Term = Lucene.Net.Index.Term; /// <summary> diff --git a/src/Lucene.Net.Tests/Search/TestRegexpRandom.cs b/src/Lucene.Net.Tests/Search/TestRegexpRandom.cs index a9cc994..451e56b 100644 --- a/src/Lucene.Net.Tests/Search/TestRegexpRandom.cs +++ b/src/Lucene.Net.Tests/Search/TestRegexpRandom.cs @@ -2,6 +2,7 @@ using Lucene.Net.Documents; using Lucene.Net.Index.Extensions; using NUnit.Framework; using System.Text; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Search { diff --git a/src/Lucene.Net.Tests/Search/TestSameScoresWithThreads.cs b/src/Lucene.Net.Tests/Search/TestSameScoresWithThreads.cs index 7b2d295..f5fb7de 100644 --- a/src/Lucene.Net.Tests/Search/TestSameScoresWithThreads.cs +++ b/src/Lucene.Net.Tests/Search/TestSameScoresWithThreads.cs @@ -1,10 +1,10 @@ using J2N.Collections.Generic.Extensions; using J2N.Threading; -using Lucene.Net.Support; using NUnit.Framework; using System; using System.Collections.Generic; using System.Threading; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Search { diff --git a/src/Lucene.Net.Tests/Search/TestScoreCachingWrappingScorer.cs b/src/Lucene.Net.Tests/Search/TestScoreCachingWrappingScorer.cs index 5512723..39ba796 100644 --- a/src/Lucene.Net.Tests/Search/TestScoreCachingWrappingScorer.cs +++ b/src/Lucene.Net.Tests/Search/TestScoreCachingWrappingScorer.cs @@ -1,7 +1,8 @@ +using NUnit.Framework; +using Assert = Lucene.Net.TestFramework.Assert; + namespace Lucene.Net.Search { - using NUnit.Framework; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/src/Lucene.Net.Tests/Search/TestScorerPerf.cs b/src/Lucene.Net.Tests/Search/TestScorerPerf.cs index 347fc86..86361c2 100644 --- a/src/Lucene.Net.Tests/Search/TestScorerPerf.cs +++ b/src/Lucene.Net.Tests/Search/TestScorerPerf.cs @@ -1,21 +1,21 @@ -using Lucene.Net.Attributes; using Lucene.Net.Documents; using Lucene.Net.Index.Extensions; using Lucene.Net.Support; +using NUnit.Framework; using System; using System.Collections; +using Assert = Lucene.Net.TestFramework.Assert; using Console = Lucene.Net.Util.SystemConsole; namespace Lucene.Net.Search { - using NUnit.Framework; using AtomicReaderContext = Lucene.Net.Index.AtomicReaderContext; - using IBits = Lucene.Net.Util.IBits; using Directory = Lucene.Net.Store.Directory; using DirectoryReader = Lucene.Net.Index.DirectoryReader; using DocIdBitSet = Lucene.Net.Util.DocIdBitSet; using Document = Documents.Document; using Field = Field; + using IBits = Lucene.Net.Util.IBits; using IndexReader = Lucene.Net.Index.IndexReader; using IndexWriter = Lucene.Net.Index.IndexWriter; using LuceneTestCase = Lucene.Net.Util.LuceneTestCase; diff --git a/src/Lucene.Net.Tests/Search/TestSearchAfter.cs b/src/Lucene.Net.Tests/Search/TestSearchAfter.cs index 630c173..1a0a953 100644 --- a/src/Lucene.Net.Tests/Search/TestSearchAfter.cs +++ b/src/Lucene.Net.Tests/Search/TestSearchAfter.cs @@ -7,6 +7,7 @@ using Lucene.Net.Randomized.Generators; using Lucene.Net.Support; using Lucene.Net.Util; using NUnit.Framework; +using Assert = Lucene.Net.TestFramework.Assert; using Console = Lucene.Net.Util.SystemConsole; namespace Lucene.Net.Search diff --git a/src/Lucene.Net.Tests/Search/TestShardSearching.cs b/src/Lucene.Net.Tests/Search/TestShardSearching.cs index df881d2..f89d9c3 100644 --- a/src/Lucene.Net.Tests/Search/TestShardSearching.cs +++ b/src/Lucene.Net.Tests/Search/TestShardSearching.cs @@ -1,9 +1,9 @@ using J2N.Collections.Generic.Extensions; -using Lucene.Net.Randomized.Generators; using Lucene.Net.Support; using NUnit.Framework; using System; using System.Collections.Generic; +using Assert = Lucene.Net.TestFramework.Assert; using Console = Lucene.Net.Util.SystemConsole; namespace Lucene.Net.Search diff --git a/src/Lucene.Net.Tests/Search/TestSimilarity.cs b/src/Lucene.Net.Tests/Search/TestSimilarity.cs index 8f79484..33ee7c4 100644 --- a/src/Lucene.Net.Tests/Search/TestSimilarity.cs +++ b/src/Lucene.Net.Tests/Search/TestSimilarity.cs @@ -1,6 +1,7 @@ using Lucene.Net.Documents; using Lucene.Net.Index.Extensions; using NUnit.Framework; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Search { diff --git a/src/Lucene.Net.Tests/Search/TestSloppyPhraseQuery.cs b/src/Lucene.Net.Tests/Search/TestSloppyPhraseQuery.cs index e9ffbc8..4159f08 100644 --- a/src/Lucene.Net.Tests/Search/TestSloppyPhraseQuery.cs +++ b/src/Lucene.Net.Tests/Search/TestSloppyPhraseQuery.cs @@ -3,6 +3,7 @@ using Lucene.Net.Documents; using NUnit.Framework; using System; using System.Text.RegularExpressions; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Search { diff --git a/src/Lucene.Net.Tests/Search/TestSort.cs b/src/Lucene.Net.Tests/Search/TestSort.cs index a47b7bd..11d53f1 100644 --- a/src/Lucene.Net.Tests/Search/TestSort.cs +++ b/src/Lucene.Net.Tests/Search/TestSort.cs @@ -7,6 +7,7 @@ using System; using System.Collections.Generic; using System.IO; using System.Text; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Search { diff --git a/src/Lucene.Net.Tests/Search/TestSortDocValues.cs b/src/Lucene.Net.Tests/Search/TestSortDocValues.cs index b8b5e62..da69e3e 100644 --- a/src/Lucene.Net.Tests/Search/TestSortDocValues.cs +++ b/src/Lucene.Net.Tests/Search/TestSortDocValues.cs @@ -1,10 +1,10 @@ using Lucene.Net.Attributes; using Lucene.Net.Documents; +using NUnit.Framework; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Search { - using NUnit.Framework; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/src/Lucene.Net.Tests/Search/TestSortRandom.cs b/src/Lucene.Net.Tests/Search/TestSortRandom.cs index 56314a9..26b526f 100644 --- a/src/Lucene.Net.Tests/Search/TestSortRandom.cs +++ b/src/Lucene.Net.Tests/Search/TestSortRandom.cs @@ -5,6 +5,7 @@ using System; using System.Collections.Generic; using System.Linq; using JCG = J2N.Collections.Generic; +using Assert = Lucene.Net.TestFramework.Assert; using Console = Lucene.Net.Util.SystemConsole; namespace Lucene.Net.Search diff --git a/src/Lucene.Net.Tests/Search/TestSortRescorer.cs b/src/Lucene.Net.Tests/Search/TestSortRescorer.cs index 2e5532c..f75ee70 100644 --- a/src/Lucene.Net.Tests/Search/TestSortRescorer.cs +++ b/src/Lucene.Net.Tests/Search/TestSortRescorer.cs @@ -1,13 +1,12 @@ +using Lucene.Net.Documents; +using NUnit.Framework; using System; +using System.Collections.Generic; using System.Text; -using Lucene.Net.Documents; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Search { - using Lucene.Net.Randomized.Generators; - using NUnit.Framework; - using System.Collections.Generic; - using System.IO; using Directory = Lucene.Net.Store.Directory; using DirectoryReader = Lucene.Net.Index.DirectoryReader; diff --git a/src/Lucene.Net.Tests/Search/TestSubScorerFreqs.cs b/src/Lucene.Net.Tests/Search/TestSubScorerFreqs.cs index c921684..760eb76 100644 --- a/src/Lucene.Net.Tests/Search/TestSubScorerFreqs.cs +++ b/src/Lucene.Net.Tests/Search/TestSubScorerFreqs.cs @@ -2,10 +2,10 @@ using Lucene.Net.Documents; using Lucene.Net.Index; using Lucene.Net.Index.Extensions; using Lucene.Net.Store; -using Lucene.Net.Support; using Lucene.Net.Util; using NUnit.Framework; using System.Collections.Generic; +using Assert = Lucene.Net.TestFramework.Assert; using JCG = J2N.Collections.Generic; namespace Lucene.Net.Search @@ -151,11 +151,11 @@ namespace Lucene.Net.Search { IDictionary<Query, float?> doc0 = c.DocCounts[i]; Assert.AreEqual(1, doc0.Count); - Assert.AreEqual(4.0F, doc0[q], FLOAT_TOLERANCE); + Assert.AreEqual(4.0F, doc0[q].GetValueOrDefault(), FLOAT_TOLERANCE); IDictionary<Query, float?> doc1 = c.DocCounts[++i]; Assert.AreEqual(1, doc1.Count); - Assert.AreEqual(1.0F, doc1[q], FLOAT_TOLERANCE); + Assert.AreEqual(1.0F, doc1[q].GetValueOrDefault(), FLOAT_TOLERANCE); } } @@ -191,20 +191,20 @@ namespace Lucene.Net.Search { IDictionary<Query, float?> doc0 = c.DocCounts[i]; Assert.AreEqual(includeOptional ? 5 : 4, doc0.Count); - Assert.AreEqual(1.0F, doc0[aQuery], FLOAT_TOLERANCE); - Assert.AreEqual(4.0F, doc0[dQuery], FLOAT_TOLERANCE); + Assert.AreEqual(1.0F, doc0[aQuery].GetValueOrDefault(), FLOAT_TOLERANCE); + Assert.AreEqual(4.0F, doc0[dQuery].GetValueOrDefault(), FLOAT_TOLERANCE); if (includeOptional) { - Assert.AreEqual(3.0F, doc0[cQuery], FLOAT_TOLERANCE); + Assert.AreEqual(3.0F, doc0[cQuery].GetValueOrDefault(), FLOAT_TOLERANCE); } IDictionary<Query, float?> doc1 = c.DocCounts[++i]; Assert.AreEqual(includeOptional ? 5 : 4, doc1.Count); - Assert.AreEqual(1.0F, doc1[aQuery], FLOAT_TOLERANCE); - Assert.AreEqual(1.0F, doc1[dQuery], FLOAT_TOLERANCE); + Assert.AreEqual(1.0F, doc1[aQuery].GetValueOrDefault(), FLOAT_TOLERANCE); + Assert.AreEqual(1.0F, doc1[dQuery].GetValueOrDefault(), FLOAT_TOLERANCE); if (includeOptional) { - Assert.AreEqual(1.0F, doc1[cQuery], FLOAT_TOLERANCE); + Assert.AreEqual(1.0F, doc1[cQuery].GetValueOrDefault(), FLOAT_TOLERANCE); } } } @@ -224,11 +224,11 @@ namespace Lucene.Net.Search { IDictionary<Query, float?> doc0 = c.DocCounts[i]; Assert.AreEqual(1, doc0.Count); - Assert.AreEqual(2.0F, doc0[q], FLOAT_TOLERANCE); + Assert.AreEqual(2.0F, doc0[q].GetValueOrDefault(), FLOAT_TOLERANCE); IDictionary<Query, float?> doc1 = c.DocCounts[++i]; Assert.AreEqual(1, doc1.Count); - Assert.AreEqual(1.0F, doc1[q], FLOAT_TOLERANCE); + Assert.AreEqual(1.0F, doc1[q].GetValueOrDefault(), FLOAT_TOLERANCE); } } } diff --git a/src/Lucene.Net.Tests/Search/TestTermRangeFilter.cs b/src/Lucene.Net.Tests/Search/TestTermRangeFilter.cs index bb1c4d0..c44d7e0 100644 --- a/src/Lucene.Net.Tests/Search/TestTermRangeFilter.cs +++ b/src/Lucene.Net.Tests/Search/TestTermRangeFilter.cs @@ -1,7 +1,8 @@ +using NUnit.Framework; +using Assert = Lucene.Net.TestFramework.Assert; + namespace Lucene.Net.Search { - using NUnit.Framework; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/src/Lucene.Net.Tests/Search/TestTermRangeQuery.cs b/src/Lucene.Net.Tests/Search/TestTermRangeQuery.cs index 107acbf..0a7573d 100644 --- a/src/Lucene.Net.Tests/Search/TestTermRangeQuery.cs +++ b/src/Lucene.Net.Tests/Search/TestTermRangeQuery.cs @@ -4,6 +4,7 @@ using Lucene.Net.Documents; using Lucene.Net.Index.Extensions; using NUnit.Framework; using System.IO; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Search { diff --git a/src/Lucene.Net.Tests/Search/TestTermVectors.cs b/src/Lucene.Net.Tests/Search/TestTermVectors.cs index 30e0fa1..39864fb 100644 --- a/src/Lucene.Net.Tests/Search/TestTermVectors.cs +++ b/src/Lucene.Net.Tests/Search/TestTermVectors.cs @@ -1,6 +1,7 @@ using Lucene.Net.Documents; using Lucene.Net.Index.Extensions; using NUnit.Framework; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Search { diff --git a/src/Lucene.Net.Tests/Search/TestTopDocsCollector.cs b/src/Lucene.Net.Tests/Search/TestTopDocsCollector.cs index fd2fad0..e05d523 100644 --- a/src/Lucene.Net.Tests/Search/TestTopDocsCollector.cs +++ b/src/Lucene.Net.Tests/Search/TestTopDocsCollector.cs @@ -1,6 +1,8 @@ +using NUnit.Framework; +using Assert = Lucene.Net.TestFramework.Assert; + namespace Lucene.Net.Search { - using NUnit.Framework; using AtomicReaderContext = Lucene.Net.Index.AtomicReaderContext; using Directory = Lucene.Net.Store.Directory; diff --git a/src/Lucene.Net.Tests/Search/TestTopDocsMerge.cs b/src/Lucene.Net.Tests/Search/TestTopDocsMerge.cs index e39a948..fb83394 100644 --- a/src/Lucene.Net.Tests/Search/TestTopDocsMerge.cs +++ b/src/Lucene.Net.Tests/Search/TestTopDocsMerge.cs @@ -1,18 +1,16 @@ +using Lucene.Net.Documents; +using NUnit.Framework; using System; using System.Collections.Generic; using System.Text; -using Lucene.Net.Documents; -using Lucene.Net.Util; +using Assert = Lucene.Net.TestFramework.Assert; using Console = Lucene.Net.Util.SystemConsole; namespace Lucene.Net.Search { - using Lucene.Net.Randomized.Generators; - using NUnit.Framework; using AtomicReaderContext = Lucene.Net.Index.AtomicReaderContext; using CompositeReaderContext = Lucene.Net.Index.CompositeReaderContext; using Directory = Lucene.Net.Store.Directory; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -32,13 +30,13 @@ namespace Lucene.Net.Search using Document = Documents.Document; using Field = Field; - using SingleField = SingleField; using IndexReader = Lucene.Net.Index.IndexReader; using IndexReaderContext = Lucene.Net.Index.IndexReaderContext; using Int32Field = Int32Field; using LuceneTestCase = Lucene.Net.Util.LuceneTestCase; using RandomIndexWriter = Lucene.Net.Index.RandomIndexWriter; using ReaderUtil = Lucene.Net.Index.ReaderUtil; + using SingleField = SingleField; using Term = Lucene.Net.Index.Term; using TestUtil = Lucene.Net.Util.TestUtil; diff --git a/src/Lucene.Net.Tests/Search/TestTopFieldCollector.cs b/src/Lucene.Net.Tests/Search/TestTopFieldCollector.cs index 85fe125..93bf452 100644 --- a/src/Lucene.Net.Tests/Search/TestTopFieldCollector.cs +++ b/src/Lucene.Net.Tests/Search/TestTopFieldCollector.cs @@ -1,8 +1,9 @@ using System; +using NUnit.Framework; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Search { - using NUnit.Framework; using Directory = Lucene.Net.Store.Directory; /* diff --git a/src/Lucene.Net.Tests/Search/TestTopScoreDocCollector.cs b/src/Lucene.Net.Tests/Search/TestTopScoreDocCollector.cs index 620611b..7718e0c 100644 --- a/src/Lucene.Net.Tests/Search/TestTopScoreDocCollector.cs +++ b/src/Lucene.Net.Tests/Search/TestTopScoreDocCollector.cs @@ -1,6 +1,8 @@ +using NUnit.Framework; +using Assert = Lucene.Net.TestFramework.Assert; + namespace Lucene.Net.Search { - using NUnit.Framework; using Directory = Lucene.Net.Store.Directory; /* diff --git a/src/Lucene.Net.Tests/Search/TestTotalHitCountCollector.cs b/src/Lucene.Net.Tests/Search/TestTotalHitCountCollector.cs index 8b76a38..f621e11 100644 --- a/src/Lucene.Net.Tests/Search/TestTotalHitCountCollector.cs +++ b/src/Lucene.Net.Tests/Search/TestTotalHitCountCollector.cs @@ -1,8 +1,9 @@ using Lucene.Net.Documents; +using NUnit.Framework; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Search { - using NUnit.Framework; using Directory = Lucene.Net.Store.Directory; /* diff --git a/src/Lucene.Net.Tests/Search/TestWildcard.cs b/src/Lucene.Net.Tests/Search/TestWildcard.cs index b5ed723..359068a 100644 --- a/src/Lucene.Net.Tests/Search/TestWildcard.cs +++ b/src/Lucene.Net.Tests/Search/TestWildcard.cs @@ -1,6 +1,7 @@ using Lucene.Net.Documents; using Lucene.Net.Index.Extensions; using NUnit.Framework; +using Assert = Lucene.Net.TestFramework.Assert; using Console = Lucene.Net.Util.SystemConsole; namespace Lucene.Net.Search diff --git a/src/Lucene.Net.Tests/Search/TestWildcardRandom.cs b/src/Lucene.Net.Tests/Search/TestWildcardRandom.cs index 4080e15..a7c91cb 100644 --- a/src/Lucene.Net.Tests/Search/TestWildcardRandom.cs +++ b/src/Lucene.Net.Tests/Search/TestWildcardRandom.cs @@ -3,6 +3,7 @@ using Lucene.Net.Index.Extensions; using NUnit.Framework; using System; using System.Text; +using Assert = Lucene.Net.TestFramework.Assert; using Console = Lucene.Net.Util.SystemConsole; namespace Lucene.Net.Search diff --git a/src/Lucene.Net.Tests/Store/TestBufferedChecksum.cs b/src/Lucene.Net.Tests/Store/TestBufferedChecksum.cs index 54c2dc6..2dbd1e3 100644 --- a/src/Lucene.Net.Tests/Store/TestBufferedChecksum.cs +++ b/src/Lucene.Net.Tests/Store/TestBufferedChecksum.cs @@ -1,5 +1,6 @@ using Lucene.Net.Support; using NUnit.Framework; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Store { diff --git a/src/Lucene.Net.Tests/Store/TestBufferedIndexInput.cs b/src/Lucene.Net.Tests/Store/TestBufferedIndexInput.cs index decee7f..a1cf7a4 100644 --- a/src/Lucene.Net.Tests/Store/TestBufferedIndexInput.cs +++ b/src/Lucene.Net.Tests/Store/TestBufferedIndexInput.cs @@ -4,6 +4,7 @@ using NUnit.Framework; using System; using System.Collections.Generic; using System.IO; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Store { diff --git a/src/Lucene.Net.Tests/Store/TestByteArrayDataInput.cs b/src/Lucene.Net.Tests/Store/TestByteArrayDataInput.cs index a581828..6ca0c68 100644 --- a/src/Lucene.Net.Tests/Store/TestByteArrayDataInput.cs +++ b/src/Lucene.Net.Tests/Store/TestByteArrayDataInput.cs @@ -1,4 +1,5 @@ using NUnit.Framework; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Store { diff --git a/src/Lucene.Net.Tests/Store/TestCopyBytes.cs b/src/Lucene.Net.Tests/Store/TestCopyBytes.cs index c538c50..24f1e66 100644 --- a/src/Lucene.Net.Tests/Store/TestCopyBytes.cs +++ b/src/Lucene.Net.Tests/Store/TestCopyBytes.cs @@ -3,6 +3,7 @@ using Lucene.Net.Attributes; using NUnit.Framework; using System; using System.IO; +using Assert = Lucene.Net.TestFramework.Assert; using Console = Lucene.Net.Util.SystemConsole; namespace Lucene.Net.Store diff --git a/src/Lucene.Net.Tests/Store/TestDirectory.cs b/src/Lucene.Net.Tests/Store/TestDirectory.cs index 3127296..c0cc24c 100644 --- a/src/Lucene.Net.Tests/Store/TestDirectory.cs +++ b/src/Lucene.Net.Tests/Store/TestDirectory.cs @@ -7,6 +7,7 @@ using NUnit.Framework; using System; using System.IO; using System.Threading; +using Assert = Lucene.Net.TestFramework.Assert; using Console = Lucene.Net.Util.SystemConsole; namespace Lucene.Net.Store diff --git a/src/Lucene.Net.Tests/Store/TestFileSwitchDirectory.cs b/src/Lucene.Net.Tests/Store/TestFileSwitchDirectory.cs index fd7a458..11cbcb9 100644 --- a/src/Lucene.Net.Tests/Store/TestFileSwitchDirectory.cs +++ b/src/Lucene.Net.Tests/Store/TestFileSwitchDirectory.cs @@ -1,9 +1,9 @@ using Lucene.Net.Index.Extensions; -using Lucene.Net.Support; using NUnit.Framework; using System; using System.Collections.Generic; using System.IO; +using Assert = Lucene.Net.TestFramework.Assert; using JCG = J2N.Collections.Generic; namespace Lucene.Net.Store @@ -35,7 +35,6 @@ namespace Lucene.Net.Store using MockAnalyzer = Lucene.Net.Analysis.MockAnalyzer; using TestIndexWriterReader = Lucene.Net.Index.TestIndexWriterReader; - using TestUtil = Lucene.Net.Util.TestUtil; [TestFixture] public class TestFileSwitchDirectory : LuceneTestCase diff --git a/src/Lucene.Net.Tests/Store/TestHugeRamFile.cs b/src/Lucene.Net.Tests/Store/TestHugeRamFile.cs index 002a473..881a8d3 100644 --- a/src/Lucene.Net.Tests/Store/TestHugeRamFile.cs +++ b/src/Lucene.Net.Tests/Store/TestHugeRamFile.cs @@ -2,6 +2,7 @@ using Lucene.Net.Attributes; using NUnit.Framework; using System; using System.Collections.Generic; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Store { diff --git a/src/Lucene.Net.Tests/Store/TestLock.cs b/src/Lucene.Net.Tests/Store/TestLock.cs index 2941dbd..7bb47dc 100644 --- a/src/Lucene.Net.Tests/Store/TestLock.cs +++ b/src/Lucene.Net.Tests/Store/TestLock.cs @@ -1,5 +1,6 @@ using NUnit.Framework; using System.IO; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Store { diff --git a/src/Lucene.Net.Tests/Store/TestLockFactory.cs b/src/Lucene.Net.Tests/Store/TestLockFactory.cs index 6b01ab9..8d819be 100644 --- a/src/Lucene.Net.Tests/Store/TestLockFactory.cs +++ b/src/Lucene.Net.Tests/Store/TestLockFactory.cs @@ -7,6 +7,7 @@ using System; using System.Collections.Generic; using System.IO; using System.Threading; +using Assert = Lucene.Net.TestFramework.Assert; using Console = Lucene.Net.Util.SystemConsole; namespace Lucene.Net.Store diff --git a/src/Lucene.Net.Tests/Store/TestMultiMMap.cs b/src/Lucene.Net.Tests/Store/TestMultiMMap.cs index 153f017..a8bf773 100644 --- a/src/Lucene.Net.Tests/Store/TestMultiMMap.cs +++ b/src/Lucene.Net.Tests/Store/TestMultiMMap.cs @@ -5,6 +5,7 @@ using NUnit.Framework; using System; using System.IO; using System.Text; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Store { diff --git a/src/Lucene.Net.Tests/Store/TestNRTCachingDirectory.cs b/src/Lucene.Net.Tests/Store/TestNRTCachingDirectory.cs index b72fc69..7272dbe 100644 --- a/src/Lucene.Net.Tests/Store/TestNRTCachingDirectory.cs +++ b/src/Lucene.Net.Tests/Store/TestNRTCachingDirectory.cs @@ -1,8 +1,8 @@ -using Lucene.Net.Support; using NUnit.Framework; using System; using System.Collections.Generic; using System.IO; +using Assert = Lucene.Net.TestFramework.Assert; using Console = Lucene.Net.Util.SystemConsole; namespace Lucene.Net.Store diff --git a/src/Lucene.Net.Tests/Store/TestRAMDirectory.cs b/src/Lucene.Net.Tests/Store/TestRAMDirectory.cs index 16ddd64..ab1d7fc 100644 --- a/src/Lucene.Net.Tests/Store/TestRAMDirectory.cs +++ b/src/Lucene.Net.Tests/Store/TestRAMDirectory.cs @@ -4,6 +4,7 @@ using Lucene.Net.Index.Extensions; using NUnit.Framework; using System; using System.IO; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Store { diff --git a/src/Lucene.Net.Tests/Support/TestCRC32.cs b/src/Lucene.Net.Tests/Support/TestCRC32.cs index ce75bbb..b0e3526 100644 --- a/src/Lucene.Net.Tests/Support/TestCRC32.cs +++ b/src/Lucene.Net.Tests/Support/TestCRC32.cs @@ -1,6 +1,7 @@ using Lucene.Net.Attributes; using NUnit.Framework; using System; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Support { diff --git a/src/Lucene.Net.Tests/Support/TestOldPatches.cs b/src/Lucene.Net.Tests/Support/TestOldPatches.cs index bc781cd..9b7bac0 100644 --- a/src/Lucene.Net.Tests/Support/TestOldPatches.cs +++ b/src/Lucene.Net.Tests/Support/TestOldPatches.cs @@ -19,17 +19,14 @@ * */ -using System; -using System.IO; using Lucene.Net.Analysis; -using Lucene.Net.Documents; using Lucene.Net.Index; using Lucene.Net.Search; -using Lucene.Net.Store; +using Lucene.Net.Util; using NUnit.Framework; +using System.IO; +using Assert = Lucene.Net.TestFramework.Assert; using Version = Lucene.Net.Util.LuceneVersion; -using Lucene.Net.Codecs; -using Lucene.Net.Util; #pragma warning disable 612, 618 namespace Lucene.Net.Support diff --git a/src/Lucene.Net.Tests/Support/TestSerialization.cs b/src/Lucene.Net.Tests/Support/TestSerialization.cs index 1086947..c6434df 100644 --- a/src/Lucene.Net.Tests/Support/TestSerialization.cs +++ b/src/Lucene.Net.Tests/Support/TestSerialization.cs @@ -20,14 +20,12 @@ * */ -using System; -using System.Linq; -using System.Reflection; -using Lucene.Net.Search; -using NUnit.Framework; +using Lucene.Net.Attributes; using Lucene.Net.Index; +using Lucene.Net.Search; using Lucene.Net.Util; -using Lucene.Net.Attributes; +using NUnit.Framework; +using Assert = Lucene.Net.TestFramework.Assert; #pragma warning disable 612, 618 namespace Lucene.Net.Support diff --git a/src/Lucene.Net.Tests/Support/TestWeakDictionary.cs b/src/Lucene.Net.Tests/Support/TestWeakDictionary.cs index 5643601..9af83f6 100644 --- a/src/Lucene.Net.Tests/Support/TestWeakDictionary.cs +++ b/src/Lucene.Net.Tests/Support/TestWeakDictionary.cs @@ -4,6 +4,7 @@ using NUnit.Framework; using System; using System.Collections; using System.Collections.Generic; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Support { diff --git a/src/Lucene.Net.Tests/Support/TestWeakDictionaryBehavior.cs b/src/Lucene.Net.Tests/Support/TestWeakDictionaryBehavior.cs index a127d51..5a7b247 100644 --- a/src/Lucene.Net.Tests/Support/TestWeakDictionaryBehavior.cs +++ b/src/Lucene.Net.Tests/Support/TestWeakDictionaryBehavior.cs @@ -3,6 +3,7 @@ using Lucene.Net.Attributes; using NUnit.Framework; using System; using System.Collections.Generic; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Support {
