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 751766e0dc69709d6901bf1f3a5639ca7a90c1bd Author: Shad Storhaug <[email protected]> AuthorDate: Sat Jul 18 07:35:53 2020 +0700 Added using directives to import the Assert class from the test framework instead of using NUnit's slow one --- .../Support/TestFramework/Assert.cs | 67 ++++++++++++++++++++++ .../Lucene.Net.TestFramework.csproj | 1 + .../Collation/TestCollationKeyFilterFactory.cs | 1 + .../TestOpenNLPSentenceBreakIterator.cs | 1 + .../Language/Bm/LanguageGuessingTest.cs | 1 + .../Language/Caverphone1Test.cs | 1 + .../Language/Caverphone2Test .cs | 1 + .../Support/TestEnglishNumberFormatExtensions.cs | 1 + .../ClassificationTestBase.cs | 35 ++++++----- .../Utils/DataSplitterTest.cs | 36 ++++++------ .../JS/TestCustomFunctions.cs | 1 + .../JS/TestJavascriptCompiler.cs | 1 + .../JS/TestJavascriptFunction.cs | 1 + .../JS/TestJavascriptOperations.cs | 1 + .../TestDemoExpressions.cs | 1 + .../TestExpressionRescorer.cs | 1 + .../TestExpressionSortField.cs | 1 + .../TestExpressionValidation.cs | 1 + .../TestExpressionValueSource.cs | 7 ++- .../Taxonomy/TestTaxonomyFacetSumValueSource.cs | 6 +- .../Surround/Query/BooleanQueryTst.cs | 1 + .../Codecs/TestCodecServices.cs | 1 + .../Configuration/TestConfigurationService.cs | 1 + .../Custom/TestCustomConfigurationFactory.cs | 1 + .../Configuration/TestConfigurationSettings.cs | 1 + .../Configuration/TestSystemProperties.cs | 1 + .../Store/TestMockDirectoryWrapper.cs | 2 +- .../Analysis/TestGraphTokenizers.cs | 1 + .../Compressing/TestFastDecompressionMode.cs | 1 + .../Codecs/Lucene3x/TestImpersonation.cs | 1 + src/Lucene.Net.Tests/Index/Test2BTerms.cs | 1 + .../Index/TestDocInverterPerFieldErrorInfo.cs | 1 + .../Index/TestDocumentsWriterStallControl.cs | 1 + .../Index/TestExceedMaxTermLength.cs | 1 + .../Index/TestForTooMuchCloning.cs | 1 + .../Index/TestForceMergeForever.cs | 1 + src/Lucene.Net.Tests/Index/TestIndexFileDeleter.cs | 1 + .../Index/TestIndexWriterNRTIsCurrent.cs | 1 + .../Index/TestIndexWriterOutOfFileDescriptors.cs | 1 + src/Lucene.Net.Tests/Index/TestNeverDelete.cs | 1 + src/Lucene.Net.Tests/Index/TestNoMergePolicy.cs | 1 + src/Lucene.Net.Tests/Index/TestNoMergeScheduler.cs | 1 + src/Lucene.Net.Tests/Index/TestReaderClosed.cs | 1 + src/Lucene.Net.Tests/Index/TestStressIndexing.cs | 1 + src/Lucene.Net.Tests/Index/TestTransactions.cs | 1 + .../Index/TestTwoPhaseCommitTool.cs | 1 + src/Lucene.Net.Tests/Search/MultiCollectorTest.cs | 1 + .../Search/Payloads/TestPayloadTermQuery.cs | 1 + .../Search/TestControlledRealTimeReopenThread.cs | 1 + src/Lucene.Net.Tests/Search/TestDocBoost.cs | 1 + .../Search/TestEarlyTermination.cs | 1 + .../Search/TestPositionIncrement.cs | 1 + .../Search/TestSearchWithThreads.cs | 1 + .../Search/TestSimilarityProvider.cs | 1 + src/Lucene.Net.Tests/Search/TestTermScorer.cs | 1 + src/Lucene.Net.Tests/Store/TestFilterDirectory.cs | 1 + .../Store/TestMockDirectoryWrapper.cs | 1 + src/Lucene.Net.Tests/Store/TestRateLimiter.cs | 1 + .../Support/TestEnumerableExtensions.cs | 1 + src/Lucene.Net.Tests/Support/TestIDisposable.cs | 1 + src/Lucene.Net.Tests/TestMergeSchedulerExternal.cs | 1 + src/Lucene.Net.Tests/Util/TestWeakIdentityMap.cs | 1 + .../Commands/CommandTestCase.cs | 3 +- .../Commands/Index/IndexUpgradeCommandTest.cs | 1 + .../Configuration/TestConfigurationSettings.cs | 1 + .../SourceCode/SourceCodeParserTest.cs | 1 + 66 files changed, 171 insertions(+), 44 deletions(-) diff --git a/src/Lucene.Net.TestFramework.NUnit/Support/TestFramework/Assert.cs b/src/Lucene.Net.TestFramework.NUnit/Support/TestFramework/Assert.cs index cbf4e13..a38454a 100644 --- a/src/Lucene.Net.TestFramework.NUnit/Support/TestFramework/Assert.cs +++ b/src/Lucene.Net.TestFramework.NUnit/Support/TestFramework/Assert.cs @@ -877,6 +877,73 @@ namespace Lucene.Net.TestFramework } + // + // Summary: + // Verifies that the object that is passed in is not equal to null If the object + // is null then an NUnit.Framework.AssertionException is thrown. + // + // Parameters: + // anObject: + // The object that is to be tested + // + // message: + // The message to display in case of failure + // + // args: + // Array of objects to be used in formatting the message + public static void IsNotEmpty(string aString, string message, params object[] args) + { + if (string.Empty.Equals(aString)) + _NUnit.Assert.IsNotEmpty(aString, message, args); + } + // + // Summary: + // Verifies that the object that is passed in is not equal to null If the object + // is null then an NUnit.Framework.AssertionException is thrown. + // + // Parameters: + // anObject: + // The object that is to be tested + public static void IsNotEmpty(string aString) + { + if (string.Empty.Equals(aString)) + _NUnit.Assert.IsNotEmpty(aString); + } + + + // + // Summary: + // Verifies that the object that is passed in is not equal to null If the object + // is null then an NUnit.Framework.AssertionException is thrown. + // + // Parameters: + // anObject: + // The object that is to be tested + // + // message: + // The message to display in case of failure + // + // args: + // Array of objects to be used in formatting the message + public static void IsEmpty(string aString, string message, params object[] args) + { + if (!string.Empty.Equals(aString)) + _NUnit.Assert.IsEmpty(aString, message, args); + } + // + // Summary: + // Verifies that the object that is passed in is not equal to null If the object + // is null then an NUnit.Framework.AssertionException is thrown. + // + // Parameters: + // anObject: + // The object that is to be tested + public static void IsEmpty(string aString) + { + if (!string.Empty.Equals(aString)) + _NUnit.Assert.IsEmpty(aString); + } + public static void LessOrEqual(int arg1, int arg2) { _NUnit.Assert.LessOrEqual(arg1, arg2); diff --git a/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj b/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj index 8f5e854..ffe9890 100644 --- a/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj +++ b/src/Lucene.Net.TestFramework/Lucene.Net.TestFramework.csproj @@ -126,6 +126,7 @@ <InternalsVisibleTo Include="Lucene.Net.Tests.Spatial" /> <InternalsVisibleTo Include="Lucene.Net.Tests.Suggest" /> <InternalsVisibleTo Include="Lucene.Net.Tests.TestFramework" /> + <InternalsVisibleTo Include="Lucene.Net.Tests.TestFramework.DependencyInjection" /> </ItemGroup> </Project> diff --git a/src/Lucene.Net.Tests.Analysis.Common/Collation/TestCollationKeyFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Collation/TestCollationKeyFilterFactory.cs index c09cf97..f952e95 100644 --- a/src/Lucene.Net.Tests.Analysis.Common/Collation/TestCollationKeyFilterFactory.cs +++ b/src/Lucene.Net.Tests.Analysis.Common/Collation/TestCollationKeyFilterFactory.cs @@ -8,6 +8,7 @@ using Lucene.Net.Analysis; using Lucene.Net.Analysis.TokenAttributes; using Lucene.Net.Analysis.Util; using NUnit.Framework; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Collation { diff --git a/src/Lucene.Net.Tests.Analysis.OpenNLP/TestOpenNLPSentenceBreakIterator.cs b/src/Lucene.Net.Tests.Analysis.OpenNLP/TestOpenNLPSentenceBreakIterator.cs index 1b2bf4d..2d168f9 100644 --- a/src/Lucene.Net.Tests.Analysis.OpenNLP/TestOpenNLPSentenceBreakIterator.cs +++ b/src/Lucene.Net.Tests.Analysis.OpenNLP/TestOpenNLPSentenceBreakIterator.cs @@ -6,6 +6,7 @@ using Lucene.Net.Analysis.Util; using Lucene.Net.Util; using NUnit.Framework; using System; +//using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Analysis.OpenNlp { diff --git a/src/Lucene.Net.Tests.Analysis.Phonetic/Language/Bm/LanguageGuessingTest.cs b/src/Lucene.Net.Tests.Analysis.Phonetic/Language/Bm/LanguageGuessingTest.cs index e83a6d5..bf21961 100644 --- a/src/Lucene.Net.Tests.Analysis.Phonetic/Language/Bm/LanguageGuessingTest.cs +++ b/src/Lucene.Net.Tests.Analysis.Phonetic/Language/Bm/LanguageGuessingTest.cs @@ -1,6 +1,7 @@ using NUnit.Framework; using System; using System.Collections.Generic; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Analysis.Phonetic.Language.Bm { diff --git a/src/Lucene.Net.Tests.Analysis.Phonetic/Language/Caverphone1Test.cs b/src/Lucene.Net.Tests.Analysis.Phonetic/Language/Caverphone1Test.cs index 9112ed4..77d7d59 100644 --- a/src/Lucene.Net.Tests.Analysis.Phonetic/Language/Caverphone1Test.cs +++ b/src/Lucene.Net.Tests.Analysis.Phonetic/Language/Caverphone1Test.cs @@ -1,5 +1,6 @@ using NUnit.Framework; using System; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Analysis.Phonetic.Language { diff --git a/src/Lucene.Net.Tests.Analysis.Phonetic/Language/Caverphone2Test .cs b/src/Lucene.Net.Tests.Analysis.Phonetic/Language/Caverphone2Test .cs index 4ec1daa..ee82bc6 100644 --- a/src/Lucene.Net.Tests.Analysis.Phonetic/Language/Caverphone2Test .cs +++ b/src/Lucene.Net.Tests.Analysis.Phonetic/Language/Caverphone2Test .cs @@ -1,5 +1,6 @@ using NUnit.Framework; using System; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Analysis.Phonetic.Language { diff --git a/src/Lucene.Net.Tests.Benchmark/Support/TestEnglishNumberFormatExtensions.cs b/src/Lucene.Net.Tests.Benchmark/Support/TestEnglishNumberFormatExtensions.cs index ac1bdff..1f7ecf2 100644 --- a/src/Lucene.Net.Tests.Benchmark/Support/TestEnglishNumberFormatExtensions.cs +++ b/src/Lucene.Net.Tests.Benchmark/Support/TestEnglishNumberFormatExtensions.cs @@ -1,6 +1,7 @@ using Lucene.Net.Attributes; using Lucene.Net.Util; using NUnit.Framework; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Support { diff --git a/src/Lucene.Net.Tests.Classification/ClassificationTestBase.cs b/src/Lucene.Net.Tests.Classification/ClassificationTestBase.cs index 83a1dd3..b27b8ee 100644 --- a/src/Lucene.Net.Tests.Classification/ClassificationTestBase.cs +++ b/src/Lucene.Net.Tests.Classification/ClassificationTestBase.cs @@ -1,34 +1,33 @@ -/* - * 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 System; using System.Diagnostics; using System.Text; using Lucene.Net.Analysis; using Lucene.Net.Documents; using Lucene.Net.Index; -using Lucene.Net.Randomized.Generators; using Lucene.Net.Search; using Lucene.Net.Store; using Lucene.Net.Util; using NUnit.Framework; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Classification { + /* + * 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. + */ /** * Base class for testing <see cref="IClassifier{T}"/>s diff --git a/src/Lucene.Net.Tests.Classification/Utils/DataSplitterTest.cs b/src/Lucene.Net.Tests.Classification/Utils/DataSplitterTest.cs index 460aa78..0f7d9ec 100644 --- a/src/Lucene.Net.Tests.Classification/Utils/DataSplitterTest.cs +++ b/src/Lucene.Net.Tests.Classification/Utils/DataSplitterTest.cs @@ -1,21 +1,3 @@ - -/* - * 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 System; using System.Text; using Lucene.Net.Analysis; @@ -24,9 +6,27 @@ using Lucene.Net.Documents; using Lucene.Net.Index; using Lucene.Net.Store; using NUnit.Framework; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Classification { + /* + * 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. + */ + /** * Testcase for <see cref="DatasetSplitter"/> */ diff --git a/src/Lucene.Net.Tests.Expressions/JS/TestCustomFunctions.cs b/src/Lucene.Net.Tests.Expressions/JS/TestCustomFunctions.cs index 254309a..547b32a 100644 --- a/src/Lucene.Net.Tests.Expressions/JS/TestCustomFunctions.cs +++ b/src/Lucene.Net.Tests.Expressions/JS/TestCustomFunctions.cs @@ -5,6 +5,7 @@ using System; using System.Collections.Generic; using System.IO; using System.Reflection; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Expressions.JS { diff --git a/src/Lucene.Net.Tests.Expressions/JS/TestJavascriptCompiler.cs b/src/Lucene.Net.Tests.Expressions/JS/TestJavascriptCompiler.cs index 31cd1d7..a133d58 100644 --- a/src/Lucene.Net.Tests.Expressions/JS/TestJavascriptCompiler.cs +++ b/src/Lucene.Net.Tests.Expressions/JS/TestJavascriptCompiler.cs @@ -1,6 +1,7 @@ using Lucene.Net.Util; using NUnit.Framework; using System; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Expressions.JS { diff --git a/src/Lucene.Net.Tests.Expressions/JS/TestJavascriptFunction.cs b/src/Lucene.Net.Tests.Expressions/JS/TestJavascriptFunction.cs index 64f8cbd..4f16799 100644 --- a/src/Lucene.Net.Tests.Expressions/JS/TestJavascriptFunction.cs +++ b/src/Lucene.Net.Tests.Expressions/JS/TestJavascriptFunction.cs @@ -2,6 +2,7 @@ using Lucene.Net.Util; using NUnit.Framework; using System; using System.Globalization; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Expressions.JS { diff --git a/src/Lucene.Net.Tests.Expressions/JS/TestJavascriptOperations.cs b/src/Lucene.Net.Tests.Expressions/JS/TestJavascriptOperations.cs index e64aa0a..520a627 100644 --- a/src/Lucene.Net.Tests.Expressions/JS/TestJavascriptOperations.cs +++ b/src/Lucene.Net.Tests.Expressions/JS/TestJavascriptOperations.cs @@ -1,5 +1,6 @@ using Lucene.Net.Util; using NUnit.Framework; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Expressions.JS { diff --git a/src/Lucene.Net.Tests.Expressions/TestDemoExpressions.cs b/src/Lucene.Net.Tests.Expressions/TestDemoExpressions.cs index c3d167f..958b557 100644 --- a/src/Lucene.Net.Tests.Expressions/TestDemoExpressions.cs +++ b/src/Lucene.Net.Tests.Expressions/TestDemoExpressions.cs @@ -7,6 +7,7 @@ using Lucene.Net.Util; using NUnit.Framework; using System; using System.Text; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Expressions { diff --git a/src/Lucene.Net.Tests.Expressions/TestExpressionRescorer.cs b/src/Lucene.Net.Tests.Expressions/TestExpressionRescorer.cs index 8ba97d3..c1c43f4 100644 --- a/src/Lucene.Net.Tests.Expressions/TestExpressionRescorer.cs +++ b/src/Lucene.Net.Tests.Expressions/TestExpressionRescorer.cs @@ -5,6 +5,7 @@ using Lucene.Net.Search; using Lucene.Net.Store; using Lucene.Net.Util; using NUnit.Framework; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Expressions { diff --git a/src/Lucene.Net.Tests.Expressions/TestExpressionSortField.cs b/src/Lucene.Net.Tests.Expressions/TestExpressionSortField.cs index 4d0ded1..8bcf0b0 100644 --- a/src/Lucene.Net.Tests.Expressions/TestExpressionSortField.cs +++ b/src/Lucene.Net.Tests.Expressions/TestExpressionSortField.cs @@ -2,6 +2,7 @@ using Lucene.Net.Expressions.JS; using Lucene.Net.Search; using Lucene.Net.Util; using NUnit.Framework; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Expressions { diff --git a/src/Lucene.Net.Tests.Expressions/TestExpressionValidation.cs b/src/Lucene.Net.Tests.Expressions/TestExpressionValidation.cs index 42727af..bf3330b 100644 --- a/src/Lucene.Net.Tests.Expressions/TestExpressionValidation.cs +++ b/src/Lucene.Net.Tests.Expressions/TestExpressionValidation.cs @@ -3,6 +3,7 @@ using Lucene.Net.Search; using Lucene.Net.Util; using NUnit.Framework; using System; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Expressions { diff --git a/src/Lucene.Net.Tests.Expressions/TestExpressionValueSource.cs b/src/Lucene.Net.Tests.Expressions/TestExpressionValueSource.cs index 13547f3..bdf7788 100644 --- a/src/Lucene.Net.Tests.Expressions/TestExpressionValueSource.cs +++ b/src/Lucene.Net.Tests.Expressions/TestExpressionValueSource.cs @@ -9,6 +9,7 @@ using Lucene.Net.Store; using Lucene.Net.Util; using NUnit.Framework; using System.Collections.Generic; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Expressions { @@ -95,7 +96,7 @@ namespace Lucene.Net.Expressions Assert.AreEqual(10, values.Int64Val(0)); Assert.AreEqual(10, values.Int32Val(0)); Assert.AreEqual(10, values.Int16Val(0)); - Assert.AreEqual(10, values.ByteVal(0)); + Assert.AreEqual((byte)10, values.ByteVal(0)); Assert.AreEqual("10", values.StrVal(0)); Assert.AreEqual(System.Convert.ToDouble(10), values.ObjectVal(0)); Assert.AreEqual(40, values.DoubleVal(1), 0); @@ -103,7 +104,7 @@ namespace Lucene.Net.Expressions Assert.AreEqual(40, values.Int64Val(1)); Assert.AreEqual(40, values.Int32Val(1)); Assert.AreEqual(40, values.Int16Val(1)); - Assert.AreEqual(40, values.ByteVal(1)); + Assert.AreEqual((byte)40, values.ByteVal(1)); Assert.AreEqual("40", values.StrVal(1)); Assert.AreEqual(System.Convert.ToDouble(40), values.ObjectVal(1)); Assert.AreEqual(4, values.DoubleVal(2), 0); @@ -111,7 +112,7 @@ namespace Lucene.Net.Expressions Assert.AreEqual(4, values.Int64Val(2)); Assert.AreEqual(4, values.Int32Val(2)); Assert.AreEqual(4, values.Int16Val(2)); - Assert.AreEqual(4, values.ByteVal(2)); + Assert.AreEqual((byte)4, values.ByteVal(2)); Assert.AreEqual("4", values.StrVal(2)); Assert.AreEqual(System.Convert.ToDouble(4), values.ObjectVal(2)); } diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetSumValueSource.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetSumValueSource.cs index 0a65b7c..35aa203 100644 --- a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetSumValueSource.cs +++ b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetSumValueSource.cs @@ -1,4 +1,5 @@ -using System; +using NUnit.Framework; +using System; using System.Collections; using System.Collections.Generic; using System.Diagnostics; @@ -8,7 +9,6 @@ using Console = Lucene.Net.Util.SystemConsole; namespace Lucene.Net.Facet.Taxonomy { - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -27,7 +27,6 @@ namespace Lucene.Net.Facet.Taxonomy */ - using NUnit.Framework; using AtomicReaderContext = Lucene.Net.Index.AtomicReaderContext; using ConstantScoreQuery = Lucene.Net.Search.ConstantScoreQuery; using DirectoryReader = Lucene.Net.Index.DirectoryReader; @@ -59,6 +58,7 @@ namespace Lucene.Net.Facet.Taxonomy using TestUtil = Lucene.Net.Util.TestUtil; 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.QueryParser/Surround/Query/BooleanQueryTst.cs b/src/Lucene.Net.Tests.QueryParser/Surround/Query/BooleanQueryTst.cs index a9e7c78..6e6042e 100644 --- a/src/Lucene.Net.Tests.QueryParser/Surround/Query/BooleanQueryTst.cs +++ b/src/Lucene.Net.Tests.QueryParser/Surround/Query/BooleanQueryTst.cs @@ -2,6 +2,7 @@ using Lucene.Net.Search; using NUnit.Framework; using System; +using Assert = Lucene.Net.TestFramework.Assert; using Console = Lucene.Net.Util.SystemConsole; namespace Lucene.Net.QueryParsers.Surround.Query diff --git a/src/Lucene.Net.Tests.TestFramework.DependencyInjection/Codecs/TestCodecServices.cs b/src/Lucene.Net.Tests.TestFramework.DependencyInjection/Codecs/TestCodecServices.cs index 23f473d..6061ec2 100644 --- a/src/Lucene.Net.Tests.TestFramework.DependencyInjection/Codecs/TestCodecServices.cs +++ b/src/Lucene.Net.Tests.TestFramework.DependencyInjection/Codecs/TestCodecServices.cs @@ -1,6 +1,7 @@ using Lucene.Net.Codecs.Lucene46; using Lucene.Net.Util; using NUnit.Framework; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Codecs { diff --git a/src/Lucene.Net.Tests.TestFramework.DependencyInjection/Configuration/TestConfigurationService.cs b/src/Lucene.Net.Tests.TestFramework.DependencyInjection/Configuration/TestConfigurationService.cs index d4c1db1..7c5496c 100644 --- a/src/Lucene.Net.Tests.TestFramework.DependencyInjection/Configuration/TestConfigurationService.cs +++ b/src/Lucene.Net.Tests.TestFramework.DependencyInjection/Configuration/TestConfigurationService.cs @@ -1,5 +1,6 @@ using Lucene.Net.Util; using NUnit.Framework; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Configuration { diff --git a/src/Lucene.Net.Tests.TestFramework/Configuration/Custom/TestCustomConfigurationFactory.cs b/src/Lucene.Net.Tests.TestFramework/Configuration/Custom/TestCustomConfigurationFactory.cs index 5af5d21..5cbe7bb 100644 --- a/src/Lucene.Net.Tests.TestFramework/Configuration/Custom/TestCustomConfigurationFactory.cs +++ b/src/Lucene.Net.Tests.TestFramework/Configuration/Custom/TestCustomConfigurationFactory.cs @@ -1,5 +1,6 @@ using Lucene.Net.Util; using NUnit.Framework; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Configuration.Custom { diff --git a/src/Lucene.Net.Tests.TestFramework/Configuration/TestConfigurationSettings.cs b/src/Lucene.Net.Tests.TestFramework/Configuration/TestConfigurationSettings.cs index ac3b7ca..9fa28e6 100644 --- a/src/Lucene.Net.Tests.TestFramework/Configuration/TestConfigurationSettings.cs +++ b/src/Lucene.Net.Tests.TestFramework/Configuration/TestConfigurationSettings.cs @@ -3,6 +3,7 @@ using Microsoft.Extensions.Configuration; using NUnit.Framework; using System; using System.IO; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Configuration { diff --git a/src/Lucene.Net.Tests.TestFramework/Configuration/TestSystemProperties.cs b/src/Lucene.Net.Tests.TestFramework/Configuration/TestSystemProperties.cs index f212385..5cb2122 100644 --- a/src/Lucene.Net.Tests.TestFramework/Configuration/TestSystemProperties.cs +++ b/src/Lucene.Net.Tests.TestFramework/Configuration/TestSystemProperties.cs @@ -4,6 +4,7 @@ using Microsoft.Extensions.Configuration; using NUnit.Framework; using System; using System.IO; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Configuration { diff --git a/src/Lucene.Net.Tests.TestFramework/Store/TestMockDirectoryWrapper.cs b/src/Lucene.Net.Tests.TestFramework/Store/TestMockDirectoryWrapper.cs index f5bac3d..5310866 100644 --- a/src/Lucene.Net.Tests.TestFramework/Store/TestMockDirectoryWrapper.cs +++ b/src/Lucene.Net.Tests.TestFramework/Store/TestMockDirectoryWrapper.cs @@ -14,7 +14,7 @@ using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute; using Assert = Lucene.Net.TestFramework.Assert; #elif TESTFRAMEWORK_NUNIT using Test = NUnit.Framework.TestAttribute; -using Assert = NUnit.Framework.Assert; +using Assert = Lucene.Net.TestFramework.Assert; #elif TESTFRAMEWORK_XUNIT using Test = Lucene.Net.TestFramework.SkippableFactAttribute; using Assert = Lucene.Net.TestFramework.Assert; diff --git a/src/Lucene.Net.Tests/Analysis/TestGraphTokenizers.cs b/src/Lucene.Net.Tests/Analysis/TestGraphTokenizers.cs index cfbc957..8f912d2 100644 --- a/src/Lucene.Net.Tests/Analysis/TestGraphTokenizers.cs +++ b/src/Lucene.Net.Tests/Analysis/TestGraphTokenizers.cs @@ -6,6 +6,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.IO; using System.Text; +using Assert = Lucene.Net.TestFramework.Assert; using Console = Lucene.Net.Util.SystemConsole; namespace Lucene.Net.Analysis diff --git a/src/Lucene.Net.Tests/Codecs/Compressing/TestFastDecompressionMode.cs b/src/Lucene.Net.Tests/Codecs/Compressing/TestFastDecompressionMode.cs index fcffb0b..0ee2b7e 100644 --- a/src/Lucene.Net.Tests/Codecs/Compressing/TestFastDecompressionMode.cs +++ b/src/Lucene.Net.Tests/Codecs/Compressing/TestFastDecompressionMode.cs @@ -1,4 +1,5 @@ using NUnit.Framework; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Codecs.Compressing { diff --git a/src/Lucene.Net.Tests/Codecs/Lucene3x/TestImpersonation.cs b/src/Lucene.Net.Tests/Codecs/Lucene3x/TestImpersonation.cs index 76a5496..3d608e1 100644 --- a/src/Lucene.Net.Tests/Codecs/Lucene3x/TestImpersonation.cs +++ b/src/Lucene.Net.Tests/Codecs/Lucene3x/TestImpersonation.cs @@ -1,4 +1,5 @@ using NUnit.Framework; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Codecs.Lucene3x { diff --git a/src/Lucene.Net.Tests/Index/Test2BTerms.cs b/src/Lucene.Net.Tests/Index/Test2BTerms.cs index d248bdf..67258a8 100644 --- a/src/Lucene.Net.Tests/Index/Test2BTerms.cs +++ b/src/Lucene.Net.Tests/Index/Test2BTerms.cs @@ -11,6 +11,7 @@ using NUnit.Framework; using System; using System.Collections.Generic; using System.Runtime.CompilerServices; +using Assert = Lucene.Net.TestFramework.Assert; using Console = Lucene.Net.Util.SystemConsole; namespace Lucene.Net.Index diff --git a/src/Lucene.Net.Tests/Index/TestDocInverterPerFieldErrorInfo.cs b/src/Lucene.Net.Tests/Index/TestDocInverterPerFieldErrorInfo.cs index f2f2406..68b9738 100644 --- a/src/Lucene.Net.Tests/Index/TestDocInverterPerFieldErrorInfo.cs +++ b/src/Lucene.Net.Tests/Index/TestDocInverterPerFieldErrorInfo.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.Index { diff --git a/src/Lucene.Net.Tests/Index/TestDocumentsWriterStallControl.cs b/src/Lucene.Net.Tests/Index/TestDocumentsWriterStallControl.cs index 61eccf8..1df52c6 100644 --- a/src/Lucene.Net.Tests/Index/TestDocumentsWriterStallControl.cs +++ b/src/Lucene.Net.Tests/Index/TestDocumentsWriterStallControl.cs @@ -4,6 +4,7 @@ using NUnit.Framework; using System; using System.Collections.Generic; using System.Threading; +using Assert = Lucene.Net.TestFramework.Assert; using Console = Lucene.Net.Util.SystemConsole; namespace Lucene.Net.Index diff --git a/src/Lucene.Net.Tests/Index/TestExceedMaxTermLength.cs b/src/Lucene.Net.Tests/Index/TestExceedMaxTermLength.cs index 01fdf2d..5f9c534 100644 --- a/src/Lucene.Net.Tests/Index/TestExceedMaxTermLength.cs +++ b/src/Lucene.Net.Tests/Index/TestExceedMaxTermLength.cs @@ -1,6 +1,7 @@ using Lucene.Net.Documents; using NUnit.Framework; using System; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Index { diff --git a/src/Lucene.Net.Tests/Index/TestForTooMuchCloning.cs b/src/Lucene.Net.Tests/Index/TestForTooMuchCloning.cs index 4000d46..9249831 100644 --- a/src/Lucene.Net.Tests/Index/TestForTooMuchCloning.cs +++ b/src/Lucene.Net.Tests/Index/TestForTooMuchCloning.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.Index { diff --git a/src/Lucene.Net.Tests/Index/TestForceMergeForever.cs b/src/Lucene.Net.Tests/Index/TestForceMergeForever.cs index c78ce68..84cb2e2 100644 --- a/src/Lucene.Net.Tests/Index/TestForceMergeForever.cs +++ b/src/Lucene.Net.Tests/Index/TestForceMergeForever.cs @@ -3,6 +3,7 @@ using J2N.Threading.Atomic; using Lucene.Net.Index.Extensions; using NUnit.Framework; using System; +using Assert = Lucene.Net.TestFramework.Assert; using Console = Lucene.Net.Util.SystemConsole; namespace Lucene.Net.Index diff --git a/src/Lucene.Net.Tests/Index/TestIndexFileDeleter.cs b/src/Lucene.Net.Tests/Index/TestIndexFileDeleter.cs index 8a7ee61..673476d 100644 --- a/src/Lucene.Net.Tests/Index/TestIndexFileDeleter.cs +++ b/src/Lucene.Net.Tests/Index/TestIndexFileDeleter.cs @@ -4,6 +4,7 @@ using Lucene.Net.Support; using NUnit.Framework; using System; using System.Collections.Generic; +using Assert = Lucene.Net.TestFramework.Assert; using JCG = J2N.Collections.Generic; namespace Lucene.Net.Index diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterNRTIsCurrent.cs b/src/Lucene.Net.Tests/Index/TestIndexWriterNRTIsCurrent.cs index 6ac70cb..e60a3f2 100644 --- a/src/Lucene.Net.Tests/Index/TestIndexWriterNRTIsCurrent.cs +++ b/src/Lucene.Net.Tests/Index/TestIndexWriterNRTIsCurrent.cs @@ -4,6 +4,7 @@ using NUnit.Framework; using System; using System.IO; using System.Threading; +using Assert = Lucene.Net.TestFramework.Assert; using Console = Lucene.Net.Util.SystemConsole; namespace Lucene.Net.Index diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterOutOfFileDescriptors.cs b/src/Lucene.Net.Tests/Index/TestIndexWriterOutOfFileDescriptors.cs index 85a67c2..441a468 100644 --- a/src/Lucene.Net.Tests/Index/TestIndexWriterOutOfFileDescriptors.cs +++ b/src/Lucene.Net.Tests/Index/TestIndexWriterOutOfFileDescriptors.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.IO; using NUnit.Framework; using JCG = J2N.Collections.Generic; +using Assert = Lucene.Net.TestFramework.Assert; using Console = Lucene.Net.Util.SystemConsole; namespace Lucene.Net.Index diff --git a/src/Lucene.Net.Tests/Index/TestNeverDelete.cs b/src/Lucene.Net.Tests/Index/TestNeverDelete.cs index 3fdbef5..8842b34 100644 --- a/src/Lucene.Net.Tests/Index/TestNeverDelete.cs +++ b/src/Lucene.Net.Tests/Index/TestNeverDelete.cs @@ -7,6 +7,7 @@ using System.Collections.Generic; using System.IO; using System.Threading; using JCG = J2N.Collections.Generic; +using Assert = Lucene.Net.TestFramework.Assert; using Console = Lucene.Net.Util.SystemConsole; namespace Lucene.Net.Index diff --git a/src/Lucene.Net.Tests/Index/TestNoMergePolicy.cs b/src/Lucene.Net.Tests/Index/TestNoMergePolicy.cs index 175cd8b..49b1b55 100644 --- a/src/Lucene.Net.Tests/Index/TestNoMergePolicy.cs +++ b/src/Lucene.Net.Tests/Index/TestNoMergePolicy.cs @@ -2,6 +2,7 @@ using Lucene.Net.Support; using NUnit.Framework; using System; using System.Reflection; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Index { diff --git a/src/Lucene.Net.Tests/Index/TestNoMergeScheduler.cs b/src/Lucene.Net.Tests/Index/TestNoMergeScheduler.cs index aefca86..e49e65b 100644 --- a/src/Lucene.Net.Tests/Index/TestNoMergeScheduler.cs +++ b/src/Lucene.Net.Tests/Index/TestNoMergeScheduler.cs @@ -3,6 +3,7 @@ using Lucene.Net.Support; using NUnit.Framework; using System; using System.Reflection; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Index { diff --git a/src/Lucene.Net.Tests/Index/TestReaderClosed.cs b/src/Lucene.Net.Tests/Index/TestReaderClosed.cs index c95cbb1..3e1295b 100644 --- a/src/Lucene.Net.Tests/Index/TestReaderClosed.cs +++ b/src/Lucene.Net.Tests/Index/TestReaderClosed.cs @@ -2,6 +2,7 @@ using Lucene.Net.Documents; using Lucene.Net.Index.Extensions; using NUnit.Framework; using System; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Index { diff --git a/src/Lucene.Net.Tests/Index/TestStressIndexing.cs b/src/Lucene.Net.Tests/Index/TestStressIndexing.cs index c14a702..fb35c63 100644 --- a/src/Lucene.Net.Tests/Index/TestStressIndexing.cs +++ b/src/Lucene.Net.Tests/Index/TestStressIndexing.cs @@ -7,6 +7,7 @@ using Lucene.Net.Util; using NUnit.Framework; using System; using System.Threading; +using Assert = Lucene.Net.TestFramework.Assert; using Console = Lucene.Net.Util.SystemConsole; namespace Lucene.Net.Index diff --git a/src/Lucene.Net.Tests/Index/TestTransactions.cs b/src/Lucene.Net.Tests/Index/TestTransactions.cs index f4b6bef..de42270 100644 --- a/src/Lucene.Net.Tests/Index/TestTransactions.cs +++ b/src/Lucene.Net.Tests/Index/TestTransactions.cs @@ -6,6 +6,7 @@ using NUnit.Framework; using System; using System.IO; using System.Threading; +using Assert = Lucene.Net.TestFramework.Assert; using Console = Lucene.Net.Util.SystemConsole; namespace Lucene.Net.Index diff --git a/src/Lucene.Net.Tests/Index/TestTwoPhaseCommitTool.cs b/src/Lucene.Net.Tests/Index/TestTwoPhaseCommitTool.cs index fd3aee2..6e45989 100644 --- a/src/Lucene.Net.Tests/Index/TestTwoPhaseCommitTool.cs +++ b/src/Lucene.Net.Tests/Index/TestTwoPhaseCommitTool.cs @@ -2,6 +2,7 @@ using NUnit.Framework; using System; using System.Collections.Generic; using System.IO; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Index { diff --git a/src/Lucene.Net.Tests/Search/MultiCollectorTest.cs b/src/Lucene.Net.Tests/Search/MultiCollectorTest.cs index 1013b58..5c5f7c9 100644 --- a/src/Lucene.Net.Tests/Search/MultiCollectorTest.cs +++ b/src/Lucene.Net.Tests/Search/MultiCollectorTest.cs @@ -1,5 +1,6 @@ using NUnit.Framework; using System; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Search { diff --git a/src/Lucene.Net.Tests/Search/Payloads/TestPayloadTermQuery.cs b/src/Lucene.Net.Tests/Search/Payloads/TestPayloadTermQuery.cs index 5d48fd1..a99acf2 100644 --- a/src/Lucene.Net.Tests/Search/Payloads/TestPayloadTermQuery.cs +++ b/src/Lucene.Net.Tests/Search/Payloads/TestPayloadTermQuery.cs @@ -5,6 +5,7 @@ using Lucene.Net.Index.Extensions; using NUnit.Framework; using System; using System.IO; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Search.Payloads { diff --git a/src/Lucene.Net.Tests/Search/TestControlledRealTimeReopenThread.cs b/src/Lucene.Net.Tests/Search/TestControlledRealTimeReopenThread.cs index a6414c5..4e380f6 100644 --- a/src/Lucene.Net.Tests/Search/TestControlledRealTimeReopenThread.cs +++ b/src/Lucene.Net.Tests/Search/TestControlledRealTimeReopenThread.cs @@ -8,6 +8,7 @@ using System.Linq; using System.Text; using System.Threading; using System.Threading.Tasks; +using Assert = Lucene.Net.TestFramework.Assert; using Console = Lucene.Net.Util.SystemConsole; namespace Lucene.Net.Search diff --git a/src/Lucene.Net.Tests/Search/TestDocBoost.cs b/src/Lucene.Net.Tests/Search/TestDocBoost.cs index 2c2559d..89de72d 100644 --- a/src/Lucene.Net.Tests/Search/TestDocBoost.cs +++ b/src/Lucene.Net.Tests/Search/TestDocBoost.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/TestEarlyTermination.cs b/src/Lucene.Net.Tests/Search/TestEarlyTermination.cs index c9c4f61..8b43018 100644 --- a/src/Lucene.Net.Tests/Search/TestEarlyTermination.cs +++ b/src/Lucene.Net.Tests/Search/TestEarlyTermination.cs @@ -1,4 +1,5 @@ using NUnit.Framework; +using 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 bb95f18..cb540ca 100644 --- a/src/Lucene.Net.Tests/Search/TestPositionIncrement.cs +++ b/src/Lucene.Net.Tests/Search/TestPositionIncrement.cs @@ -5,6 +5,7 @@ using NUnit.Framework; using System; using System.IO; 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/Search/TestSearchWithThreads.cs b/src/Lucene.Net.Tests/Search/TestSearchWithThreads.cs index 54cdb86..f57843d 100644 --- a/src/Lucene.Net.Tests/Search/TestSearchWithThreads.cs +++ b/src/Lucene.Net.Tests/Search/TestSearchWithThreads.cs @@ -4,6 +4,7 @@ using Lucene.Net.Documents; 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/Search/TestSimilarityProvider.cs b/src/Lucene.Net.Tests/Search/TestSimilarityProvider.cs index 5f52b12..5df7c9f 100644 --- a/src/Lucene.Net.Tests/Search/TestSimilarityProvider.cs +++ b/src/Lucene.Net.Tests/Search/TestSimilarityProvider.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/TestTermScorer.cs b/src/Lucene.Net.Tests/Search/TestTermScorer.cs index 577c72f..6a1d8ba 100644 --- a/src/Lucene.Net.Tests/Search/TestTermScorer.cs +++ b/src/Lucene.Net.Tests/Search/TestTermScorer.cs @@ -2,6 +2,7 @@ using Lucene.Net.Documents; using Lucene.Net.Index.Extensions; using NUnit.Framework; using System.Collections.Generic; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Search { diff --git a/src/Lucene.Net.Tests/Store/TestFilterDirectory.cs b/src/Lucene.Net.Tests/Store/TestFilterDirectory.cs index 9343263..64ed452 100644 --- a/src/Lucene.Net.Tests/Store/TestFilterDirectory.cs +++ b/src/Lucene.Net.Tests/Store/TestFilterDirectory.cs @@ -2,6 +2,7 @@ using NUnit.Framework; using System; using System.Collections.Generic; using System.Reflection; +using Assert = Lucene.Net.TestFramework.Assert; using JCG = J2N.Collections.Generic; namespace Lucene.Net.Store diff --git a/src/Lucene.Net.Tests/Store/TestMockDirectoryWrapper.cs b/src/Lucene.Net.Tests/Store/TestMockDirectoryWrapper.cs index b14ccfb..14c610d 100644 --- a/src/Lucene.Net.Tests/Store/TestMockDirectoryWrapper.cs +++ b/src/Lucene.Net.Tests/Store/TestMockDirectoryWrapper.cs @@ -1,6 +1,7 @@ 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/Store/TestRateLimiter.cs b/src/Lucene.Net.Tests/Store/TestRateLimiter.cs index 12fa6d7..3853dd3 100644 --- a/src/Lucene.Net.Tests/Store/TestRateLimiter.cs +++ b/src/Lucene.Net.Tests/Store/TestRateLimiter.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/Support/TestEnumerableExtensions.cs b/src/Lucene.Net.Tests/Support/TestEnumerableExtensions.cs index c31c7ee..dd99e5f 100644 --- a/src/Lucene.Net.Tests/Support/TestEnumerableExtensions.cs +++ b/src/Lucene.Net.Tests/Support/TestEnumerableExtensions.cs @@ -5,6 +5,7 @@ using System; using System.Collections; using System.Collections.Generic; using System.Linq; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Support { diff --git a/src/Lucene.Net.Tests/Support/TestIDisposable.cs b/src/Lucene.Net.Tests/Support/TestIDisposable.cs index 30d08ef..10ca6f5 100644 --- a/src/Lucene.Net.Tests/Support/TestIDisposable.cs +++ b/src/Lucene.Net.Tests/Support/TestIDisposable.cs @@ -6,6 +6,7 @@ using Lucene.Net.Store; using Lucene.Net.Util; using NUnit.Framework; using System; +using Assert = Lucene.Net.TestFramework.Assert; #pragma warning disable 612, 618 namespace Lucene.Net.Support diff --git a/src/Lucene.Net.Tests/TestMergeSchedulerExternal.cs b/src/Lucene.Net.Tests/TestMergeSchedulerExternal.cs index 4c8f54e..e33adcc 100644 --- a/src/Lucene.Net.Tests/TestMergeSchedulerExternal.cs +++ b/src/Lucene.Net.Tests/TestMergeSchedulerExternal.cs @@ -6,6 +6,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 diff --git a/src/Lucene.Net.Tests/Util/TestWeakIdentityMap.cs b/src/Lucene.Net.Tests/Util/TestWeakIdentityMap.cs index 06bd66e..34b4db2 100644 --- a/src/Lucene.Net.Tests/Util/TestWeakIdentityMap.cs +++ b/src/Lucene.Net.Tests/Util/TestWeakIdentityMap.cs @@ -11,6 +11,7 @@ //using System.Collections.Generic; //using System.Globalization; //using System.Threading; +//using Assert = Lucene.Net.TestFramework.Assert; //namespace Lucene.Net.Util //{ diff --git a/src/dotnet/tools/Lucene.Net.Tests.Cli/Commands/CommandTestCase.cs b/src/dotnet/tools/Lucene.Net.Tests.Cli/Commands/CommandTestCase.cs index 65fc14b..1221377 100644 --- a/src/dotnet/tools/Lucene.Net.Tests.Cli/Commands/CommandTestCase.cs +++ b/src/dotnet/tools/Lucene.Net.Tests.Cli/Commands/CommandTestCase.cs @@ -4,6 +4,7 @@ using NUnit.Framework; using System.Collections.Generic; using System.IO; using System.Linq; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Cli.Commands { @@ -111,7 +112,7 @@ namespace Lucene.Net.Cli.Commands var output = new MockConsoleApp(); var cmd = CreateConfiguration(output); Assert.IsNotNull(cmd.Description); - Assert.IsNotEmpty(cmd.Description); + NUnit.Framework.Assert.IsNotEmpty(cmd.Description); } [Test] diff --git a/src/dotnet/tools/Lucene.Net.Tests.Cli/Commands/Index/IndexUpgradeCommandTest.cs b/src/dotnet/tools/Lucene.Net.Tests.Cli/Commands/Index/IndexUpgradeCommandTest.cs index 6a442d7..6d20dd4 100644 --- a/src/dotnet/tools/Lucene.Net.Tests.Cli/Commands/Index/IndexUpgradeCommandTest.cs +++ b/src/dotnet/tools/Lucene.Net.Tests.Cli/Commands/Index/IndexUpgradeCommandTest.cs @@ -4,6 +4,7 @@ using Lucene.Net.Index; using Lucene.Net.Store; using NUnit.Framework; using System.Collections.Generic; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Cli.Commands { diff --git a/src/dotnet/tools/Lucene.Net.Tests.Cli/Configuration/TestConfigurationSettings.cs b/src/dotnet/tools/Lucene.Net.Tests.Cli/Configuration/TestConfigurationSettings.cs index cbed8a2..267b344 100644 --- a/src/dotnet/tools/Lucene.Net.Tests.Cli/Configuration/TestConfigurationSettings.cs +++ b/src/dotnet/tools/Lucene.Net.Tests.Cli/Configuration/TestConfigurationSettings.cs @@ -4,6 +4,7 @@ using Microsoft.Extensions.Configuration; using NUnit.Framework; using System; using System.IO; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Cli.Configuration { diff --git a/src/dotnet/tools/Lucene.Net.Tests.Cli/SourceCode/SourceCodeParserTest.cs b/src/dotnet/tools/Lucene.Net.Tests.Cli/SourceCode/SourceCodeParserTest.cs index 0cbba61..edf0703 100644 --- a/src/dotnet/tools/Lucene.Net.Tests.Cli/SourceCode/SourceCodeParserTest.cs +++ b/src/dotnet/tools/Lucene.Net.Tests.Cli/SourceCode/SourceCodeParserTest.cs @@ -3,6 +3,7 @@ using Lucene.Net.Attributes; using NUnit.Framework; using System.IO; using System.Reflection; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Cli.SourceCode {
