This is an automated email from the ASF dual-hosted git repository. nightowl888 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/lucenenet.git
commit 666c9bbd0c9a555f2735a7d52640b29f0552a4e7 Author: Shad Storhaug <[email protected]> AuthorDate: Tue Jun 23 20:59:08 2020 +0700 SWEEP: Lucene.Net.Util: Added using for Assert class to ensure our strongly-typed overloads are being called to reduce boxing. (addresses #295, #261) --- src/Lucene.Net.Tests/Util/BaseSortTestCase.cs | 1 + src/Lucene.Net.Tests/Util/TestArrayUtil.cs | 2 +- src/Lucene.Net.Tests/Util/TestAttributeSource.cs | 6 +++--- src/Lucene.Net.Tests/Util/TestBroadWord.cs | 1 - src/Lucene.Net.Tests/Util/TestByteBlockPool.cs | 1 - src/Lucene.Net.Tests/Util/TestBytesRef.cs | 1 + src/Lucene.Net.Tests/Util/TestBytesRefArray.cs | 4 ++-- src/Lucene.Net.Tests/Util/TestBytesRefHash.cs | 1 + src/Lucene.Net.Tests/Util/TestCharsRef.cs | 2 +- src/Lucene.Net.Tests/Util/TestCollectionUtil.cs | 16 +++++++--------- src/Lucene.Net.Tests/Util/TestFieldCacheSanityChecker.cs | 1 + src/Lucene.Net.Tests/Util/TestFilterIterator.cs | 4 ++-- src/Lucene.Net.Tests/Util/TestFixedBitSet.cs | 8 +++----- .../Util/TestIndexableBinaryStringTools.cs | 1 + src/Lucene.Net.Tests/Util/TestIntsRef.cs | 1 + src/Lucene.Net.Tests/Util/TestLongBitSet.cs | 2 +- src/Lucene.Net.Tests/Util/TestMathUtil.cs | 1 + src/Lucene.Net.Tests/Util/TestMergedIterator.cs | 1 + src/Lucene.Net.Tests/Util/TestPForDeltaDocIdSet.cs | 1 + src/Lucene.Net.Tests/Util/TestPriorityQueue.cs | 1 + src/Lucene.Net.Tests/Util/TestQueryBuilder.cs | 1 + .../Util/TestRecyclingByteBlockAllocator.cs | 1 + .../Util/TestRecyclingIntBlockAllocator.cs | 1 + src/Lucene.Net.Tests/Util/TestRollingBuffer.cs | 1 + src/Lucene.Net.Tests/Util/TestSentinelIntSet.cs | 1 + src/Lucene.Net.Tests/Util/TestSetOnce.cs | 1 + src/Lucene.Net.Tests/Util/TestSloppyMath.cs | 1 + src/Lucene.Net.Tests/Util/TestSmallFloat.cs | 1 + src/Lucene.Net.Tests/Util/TestStringHelper.cs | 1 + src/Lucene.Net.Tests/Util/TestUnicodeUtil.cs | 1 + src/Lucene.Net.Tests/Util/TestVersion.cs | 1 + src/Lucene.Net.Tests/Util/TestVirtualMethod.cs | 1 + 32 files changed, 42 insertions(+), 26 deletions(-) diff --git a/src/Lucene.Net.Tests/Util/BaseSortTestCase.cs b/src/Lucene.Net.Tests/Util/BaseSortTestCase.cs index 6b51f11..3a5cc46 100644 --- a/src/Lucene.Net.Tests/Util/BaseSortTestCase.cs +++ b/src/Lucene.Net.Tests/Util/BaseSortTestCase.cs @@ -3,6 +3,7 @@ using System.Linq; using Lucene.Net.Support; using NUnit.Framework; using System; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Util { diff --git a/src/Lucene.Net.Tests/Util/TestArrayUtil.cs b/src/Lucene.Net.Tests/Util/TestArrayUtil.cs index 6e7e9cd..fbac806 100644 --- a/src/Lucene.Net.Tests/Util/TestArrayUtil.cs +++ b/src/Lucene.Net.Tests/Util/TestArrayUtil.cs @@ -1,7 +1,7 @@ -using Lucene.Net.Randomized.Generators; using Lucene.Net.Support; using NUnit.Framework; using System; +using Assert = Lucene.Net.TestFramework.Assert; using Console = Lucene.Net.Util.SystemConsole; namespace Lucene.Net.Util diff --git a/src/Lucene.Net.Tests/Util/TestAttributeSource.cs b/src/Lucene.Net.Tests/Util/TestAttributeSource.cs index 71aeb7d..5088985 100644 --- a/src/Lucene.Net.Tests/Util/TestAttributeSource.cs +++ b/src/Lucene.Net.Tests/Util/TestAttributeSource.cs @@ -1,12 +1,12 @@ +using Lucene.Net.Analysis.TokenAttributes; using NUnit.Framework; using System; -using System.Collections; using System.Collections.Generic; +using Assert = Lucene.Net.TestFramework.Assert; +using FlagsAttribute = Lucene.Net.Analysis.TokenAttributes.FlagsAttribute; namespace Lucene.Net.Util { - using Lucene.Net.Analysis.TokenAttributes; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/src/Lucene.Net.Tests/Util/TestBroadWord.cs b/src/Lucene.Net.Tests/Util/TestBroadWord.cs index b1ed9a2..28cda94 100644 --- a/src/Lucene.Net.Tests/Util/TestBroadWord.cs +++ b/src/Lucene.Net.Tests/Util/TestBroadWord.cs @@ -1,6 +1,5 @@ using J2N.Numerics; using Lucene.Net.Attributes; -using Lucene.Net.Support; using NUnit.Framework; using Assert = Lucene.Net.TestFramework.Assert; diff --git a/src/Lucene.Net.Tests/Util/TestByteBlockPool.cs b/src/Lucene.Net.Tests/Util/TestByteBlockPool.cs index b5e30e9..ce1b1df 100644 --- a/src/Lucene.Net.Tests/Util/TestByteBlockPool.cs +++ b/src/Lucene.Net.Tests/Util/TestByteBlockPool.cs @@ -1,4 +1,3 @@ -using Lucene.Net.Randomized.Generators; using NUnit.Framework; using System.Collections.Generic; using Assert = Lucene.Net.TestFramework.Assert; diff --git a/src/Lucene.Net.Tests/Util/TestBytesRef.cs b/src/Lucene.Net.Tests/Util/TestBytesRef.cs index 21ab6f4..93b9ba3 100644 --- a/src/Lucene.Net.Tests/Util/TestBytesRef.cs +++ b/src/Lucene.Net.Tests/Util/TestBytesRef.cs @@ -1,6 +1,7 @@ using J2N.Text; using Lucene.Net.Attributes; using NUnit.Framework; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Util { diff --git a/src/Lucene.Net.Tests/Util/TestBytesRefArray.cs b/src/Lucene.Net.Tests/Util/TestBytesRefArray.cs index e267b6e..3dedead 100644 --- a/src/Lucene.Net.Tests/Util/TestBytesRefArray.cs +++ b/src/Lucene.Net.Tests/Util/TestBytesRefArray.cs @@ -1,7 +1,7 @@ -using Lucene.Net.Randomized.Generators; -using NUnit.Framework; +using NUnit.Framework; using System; using System.Collections.Generic; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Util { diff --git a/src/Lucene.Net.Tests/Util/TestBytesRefHash.cs b/src/Lucene.Net.Tests/Util/TestBytesRefHash.cs index eda3b9e..f9ae531 100644 --- a/src/Lucene.Net.Tests/Util/TestBytesRefHash.cs +++ b/src/Lucene.Net.Tests/Util/TestBytesRefHash.cs @@ -4,6 +4,7 @@ using System; using System.Collections; using System.Collections.Generic; using JCG = J2N.Collections.Generic; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Util { diff --git a/src/Lucene.Net.Tests/Util/TestCharsRef.cs b/src/Lucene.Net.Tests/Util/TestCharsRef.cs index 5e1ed36..a815a9d 100644 --- a/src/Lucene.Net.Tests/Util/TestCharsRef.cs +++ b/src/Lucene.Net.Tests/Util/TestCharsRef.cs @@ -1,9 +1,9 @@ using J2N.Text; using Lucene.Net.Attributes; -//using Lucene.Net.Support; using NUnit.Framework; using System; using System.Text; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Util { diff --git a/src/Lucene.Net.Tests/Util/TestCollectionUtil.cs b/src/Lucene.Net.Tests/Util/TestCollectionUtil.cs index a707fd5..b19a4a2 100644 --- a/src/Lucene.Net.Tests/Util/TestCollectionUtil.cs +++ b/src/Lucene.Net.Tests/Util/TestCollectionUtil.cs @@ -1,8 +1,6 @@ -using Lucene.Net.Attributes; using Lucene.Net.Support; using NUnit.Framework; using System; -using System.Collections; using System.Collections.Generic; namespace Lucene.Net.Util @@ -46,21 +44,21 @@ namespace Lucene.Net.Util IList<int> list1 = CreateRandomList(2000), list2 = new List<int>(list1); CollectionUtil.IntroSort(list1); list2.Sort(); - Assert.AreEqual(list2, list1); + assertEquals(list2, list1); list1 = CreateRandomList(2000); list2 = new List<int>(list1); CollectionUtil.IntroSort(list1, Collections.ReverseOrder<int>()); list2.Sort(Collections.ReverseOrder<int>()); - Assert.AreEqual(list2, list1); + assertEquals(list2, list1); // reverse back, so we can test that completely backwards sorted array (worst case) is working: CollectionUtil.IntroSort(list1); list2.Sort(); - Assert.AreEqual(list2, list1); + assertEquals(list2, list1); } } - [Test, LongRunningTest] + [Test] public virtual void TestTimSort() { for (int i = 0, c = AtLeast(500); i < c; i++) @@ -68,17 +66,17 @@ namespace Lucene.Net.Util IList<int> list1 = CreateRandomList(2000), list2 = new List<int>(list1); CollectionUtil.TimSort(list1); list2.Sort(); - Assert.AreEqual(list2, list1); + assertEquals(list2, list1); list1 = CreateRandomList(2000); list2 = new List<int>(list1); CollectionUtil.TimSort(list1, Collections.ReverseOrder<int>()); list2.Sort(Collections.ReverseOrder<int>()); - Assert.AreEqual(list2, list1); + assertEquals(list2, list1); // reverse back, so we can test that completely backwards sorted array (worst case) is working: CollectionUtil.TimSort(list1); list2.Sort(); - Assert.AreEqual(list2, list1); + assertEquals(list2, list1); } } diff --git a/src/Lucene.Net.Tests/Util/TestFieldCacheSanityChecker.cs b/src/Lucene.Net.Tests/Util/TestFieldCacheSanityChecker.cs index 0222663..58d1743 100644 --- a/src/Lucene.Net.Tests/Util/TestFieldCacheSanityChecker.cs +++ b/src/Lucene.Net.Tests/Util/TestFieldCacheSanityChecker.cs @@ -4,6 +4,7 @@ using NUnit.Framework; using System; using System.Globalization; using System.IO; +using Assert = Lucene.Net.TestFramework.Assert; using Console = Lucene.Net.Util.SystemConsole; namespace Lucene.Net.Util diff --git a/src/Lucene.Net.Tests/Util/TestFilterIterator.cs b/src/Lucene.Net.Tests/Util/TestFilterIterator.cs index a302793..c0eaa34 100644 --- a/src/Lucene.Net.Tests/Util/TestFilterIterator.cs +++ b/src/Lucene.Net.Tests/Util/TestFilterIterator.cs @@ -15,10 +15,10 @@ * limitations under the License. */ -using Lucene.Net.Support; using NUnit.Framework; using System; using System.Collections.Generic; +using Assert = Lucene.Net.TestFramework.Assert; using JCG = J2N.Collections.Generic; namespace Lucene.Net.Util @@ -26,7 +26,7 @@ namespace Lucene.Net.Util [TestFixture] public class TestFilterIterator : LuceneTestCase { - private static readonly ISet<string> set = new JCG.SortedSet<string> { "a", "b", "c" }; + private static readonly ISet<string> set = new JCG.SortedSet<string>(StringComparer.Ordinal) { "a", "b", "c" }; private static void AssertNoMore<T1>(IEnumerator<T1> it) { diff --git a/src/Lucene.Net.Tests/Util/TestFixedBitSet.cs b/src/Lucene.Net.Tests/Util/TestFixedBitSet.cs index 278058d..8ffcc72 100644 --- a/src/Lucene.Net.Tests/Util/TestFixedBitSet.cs +++ b/src/Lucene.Net.Tests/Util/TestFixedBitSet.cs @@ -1,9 +1,10 @@ -using System; using Lucene.Net.Attributes; -using Lucene.Net.Randomized.Generators; using Lucene.Net.Support; using NUnit.Framework; +using System; using System.Collections; +using System.Linq; +using Assert = Lucene.Net.TestFramework.Assert; /* * Licensed to the Apache Software Foundation (ASF) under one or more @@ -22,9 +23,6 @@ using System.Collections; * limitations under the License. */ -using System.Linq; -using Assert = Lucene.Net.TestFramework.Assert; - namespace Lucene.Net.Util { using DocIdSetIterator = Lucene.Net.Search.DocIdSetIterator; diff --git a/src/Lucene.Net.Tests/Util/TestIndexableBinaryStringTools.cs b/src/Lucene.Net.Tests/Util/TestIndexableBinaryStringTools.cs index e8d19c7..2831585 100644 --- a/src/Lucene.Net.Tests/Util/TestIndexableBinaryStringTools.cs +++ b/src/Lucene.Net.Tests/Util/TestIndexableBinaryStringTools.cs @@ -2,6 +2,7 @@ using NUnit.Framework; using System; using System.Globalization; using System.Text; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Util { diff --git a/src/Lucene.Net.Tests/Util/TestIntsRef.cs b/src/Lucene.Net.Tests/Util/TestIntsRef.cs index 053a9b4..6e79c59 100644 --- a/src/Lucene.Net.Tests/Util/TestIntsRef.cs +++ b/src/Lucene.Net.Tests/Util/TestIntsRef.cs @@ -1,4 +1,5 @@ using NUnit.Framework; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Util { diff --git a/src/Lucene.Net.Tests/Util/TestLongBitSet.cs b/src/Lucene.Net.Tests/Util/TestLongBitSet.cs index dd146c6..c148b47 100644 --- a/src/Lucene.Net.Tests/Util/TestLongBitSet.cs +++ b/src/Lucene.Net.Tests/Util/TestLongBitSet.cs @@ -17,10 +17,10 @@ using System; using Lucene.Net.Attributes; -using Lucene.Net.Randomized.Generators; using Lucene.Net.Support; using NUnit.Framework; using System.Collections; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Util { diff --git a/src/Lucene.Net.Tests/Util/TestMathUtil.cs b/src/Lucene.Net.Tests/Util/TestMathUtil.cs index 2f439b9..15a1e29 100644 --- a/src/Lucene.Net.Tests/Util/TestMathUtil.cs +++ b/src/Lucene.Net.Tests/Util/TestMathUtil.cs @@ -3,6 +3,7 @@ using Lucene.Net.Support; using NUnit.Framework; using System; using System.Linq; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Util { diff --git a/src/Lucene.Net.Tests/Util/TestMergedIterator.cs b/src/Lucene.Net.Tests/Util/TestMergedIterator.cs index 2ef8413..810e086 100644 --- a/src/Lucene.Net.Tests/Util/TestMergedIterator.cs +++ b/src/Lucene.Net.Tests/Util/TestMergedIterator.cs @@ -2,6 +2,7 @@ using NUnit.Framework; using System; using System.Collections; using System.Collections.Generic; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Util { diff --git a/src/Lucene.Net.Tests/Util/TestPForDeltaDocIdSet.cs b/src/Lucene.Net.Tests/Util/TestPForDeltaDocIdSet.cs index 6b02ea0..5fa5db8 100644 --- a/src/Lucene.Net.Tests/Util/TestPForDeltaDocIdSet.cs +++ b/src/Lucene.Net.Tests/Util/TestPForDeltaDocIdSet.cs @@ -1,6 +1,7 @@ using Lucene.Net.Support; using NUnit.Framework; using System.Collections; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Util { diff --git a/src/Lucene.Net.Tests/Util/TestPriorityQueue.cs b/src/Lucene.Net.Tests/Util/TestPriorityQueue.cs index 7a5c69c..461a15f 100644 --- a/src/Lucene.Net.Tests/Util/TestPriorityQueue.cs +++ b/src/Lucene.Net.Tests/Util/TestPriorityQueue.cs @@ -2,6 +2,7 @@ using Lucene.Net.Attributes; using NUnit.Framework; using System; using System.Collections.Generic; +using Assert = Lucene.Net.TestFramework.Assert; using Console = Lucene.Net.Util.SystemConsole; namespace Lucene.Net.Util diff --git a/src/Lucene.Net.Tests/Util/TestQueryBuilder.cs b/src/Lucene.Net.Tests/Util/TestQueryBuilder.cs index d014af1..6a35164 100644 --- a/src/Lucene.Net.Tests/Util/TestQueryBuilder.cs +++ b/src/Lucene.Net.Tests/Util/TestQueryBuilder.cs @@ -3,6 +3,7 @@ using Lucene.Net.Analysis.TokenAttributes; using NUnit.Framework; using System; using System.IO; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Util { diff --git a/src/Lucene.Net.Tests/Util/TestRecyclingByteBlockAllocator.cs b/src/Lucene.Net.Tests/Util/TestRecyclingByteBlockAllocator.cs index 2e58497..ea4c360 100644 --- a/src/Lucene.Net.Tests/Util/TestRecyclingByteBlockAllocator.cs +++ b/src/Lucene.Net.Tests/Util/TestRecyclingByteBlockAllocator.cs @@ -2,6 +2,7 @@ using NUnit.Framework; using System; using System.Collections.Generic; using System.Linq; +using Assert = Lucene.Net.TestFramework.Assert; using JCG = J2N.Collections.Generic; namespace Lucene.Net.Util diff --git a/src/Lucene.Net.Tests/Util/TestRecyclingIntBlockAllocator.cs b/src/Lucene.Net.Tests/Util/TestRecyclingIntBlockAllocator.cs index 6ee5bd5..f1c5b12 100644 --- a/src/Lucene.Net.Tests/Util/TestRecyclingIntBlockAllocator.cs +++ b/src/Lucene.Net.Tests/Util/TestRecyclingIntBlockAllocator.cs @@ -2,6 +2,7 @@ using NUnit.Framework; using System; using System.Collections.Generic; using System.Linq; +using Assert = Lucene.Net.TestFramework.Assert; using JCG = J2N.Collections.Generic; namespace Lucene.Net.Util diff --git a/src/Lucene.Net.Tests/Util/TestRollingBuffer.cs b/src/Lucene.Net.Tests/Util/TestRollingBuffer.cs index 05d7ebb..9e7bc74 100644 --- a/src/Lucene.Net.Tests/Util/TestRollingBuffer.cs +++ b/src/Lucene.Net.Tests/Util/TestRollingBuffer.cs @@ -1,5 +1,6 @@ using NUnit.Framework; using System; +using Assert = Lucene.Net.TestFramework.Assert; using Console = Lucene.Net.Util.SystemConsole; namespace Lucene.Net.Util diff --git a/src/Lucene.Net.Tests/Util/TestSentinelIntSet.cs b/src/Lucene.Net.Tests/Util/TestSentinelIntSet.cs index 6ec5f97..215d65c 100644 --- a/src/Lucene.Net.Tests/Util/TestSentinelIntSet.cs +++ b/src/Lucene.Net.Tests/Util/TestSentinelIntSet.cs @@ -1,5 +1,6 @@ using NUnit.Framework; using System.Collections.Generic; +using Assert = Lucene.Net.TestFramework.Assert; using JCG = J2N.Collections.Generic; namespace Lucene.Net.Util diff --git a/src/Lucene.Net.Tests/Util/TestSetOnce.cs b/src/Lucene.Net.Tests/Util/TestSetOnce.cs index 9de0200..b5b8213 100644 --- a/src/Lucene.Net.Tests/Util/TestSetOnce.cs +++ b/src/Lucene.Net.Tests/Util/TestSetOnce.cs @@ -3,6 +3,7 @@ using NUnit.Framework; using System; using System.Globalization; using System.Threading; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Util { diff --git a/src/Lucene.Net.Tests/Util/TestSloppyMath.cs b/src/Lucene.Net.Tests/Util/TestSloppyMath.cs index 86f7108..ad14929 100644 --- a/src/Lucene.Net.Tests/Util/TestSloppyMath.cs +++ b/src/Lucene.Net.Tests/Util/TestSloppyMath.cs @@ -1,6 +1,7 @@ using Lucene.Net.Randomized.Generators; using NUnit.Framework; using System; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Util { diff --git a/src/Lucene.Net.Tests/Util/TestSmallFloat.cs b/src/Lucene.Net.Tests/Util/TestSmallFloat.cs index 519fd91..8958453 100644 --- a/src/Lucene.Net.Tests/Util/TestSmallFloat.cs +++ b/src/Lucene.Net.Tests/Util/TestSmallFloat.cs @@ -1,5 +1,6 @@ using Lucene.Net.Support; using NUnit.Framework; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Util { diff --git a/src/Lucene.Net.Tests/Util/TestStringHelper.cs b/src/Lucene.Net.Tests/Util/TestStringHelper.cs index 3d76817..396d3e4 100644 --- a/src/Lucene.Net.Tests/Util/TestStringHelper.cs +++ b/src/Lucene.Net.Tests/Util/TestStringHelper.cs @@ -1,4 +1,5 @@ using NUnit.Framework; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Util { diff --git a/src/Lucene.Net.Tests/Util/TestUnicodeUtil.cs b/src/Lucene.Net.Tests/Util/TestUnicodeUtil.cs index 849f60d..3475c66 100644 --- a/src/Lucene.Net.Tests/Util/TestUnicodeUtil.cs +++ b/src/Lucene.Net.Tests/Util/TestUnicodeUtil.cs @@ -1,6 +1,7 @@ using J2N; using NUnit.Framework; using System; +using Assert = Lucene.Net.TestFramework.Assert; using Console = Lucene.Net.Util.SystemConsole; namespace Lucene.Net.Util diff --git a/src/Lucene.Net.Tests/Util/TestVersion.cs b/src/Lucene.Net.Tests/Util/TestVersion.cs index bff6757..e5978f2 100644 --- a/src/Lucene.Net.Tests/Util/TestVersion.cs +++ b/src/Lucene.Net.Tests/Util/TestVersion.cs @@ -19,6 +19,7 @@ using NUnit.Framework; using System; using System.Linq; using System.Reflection; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Util { diff --git a/src/Lucene.Net.Tests/Util/TestVirtualMethod.cs b/src/Lucene.Net.Tests/Util/TestVirtualMethod.cs index 81c8325..8087667 100644 --- a/src/Lucene.Net.Tests/Util/TestVirtualMethod.cs +++ b/src/Lucene.Net.Tests/Util/TestVirtualMethod.cs @@ -1,5 +1,6 @@ using NUnit.Framework; using System; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Util {
