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 e91e086e43f2433fcecc7e5577ae5a2817f3fa68 Author: Michael <[email protected]> AuthorDate: Tue Jun 23 17:05:08 2020 +0700 addresses #295 updated lucene test case asserts and modified IEnumerable to IList to take advantage of indexing --- .../Support/TestFramework/Assert.cs | 8 ++++---- .../Support/JavaCompatibility/LuceneTestCase.cs | 12 ++++++++---- src/Lucene.Net.Tests/Util/TestFixedBitSet.cs | 1 + src/Lucene.Net.Tests/Util/TestOfflineSorter.cs | 11 +++++++---- src/Lucene.Net/Util/OfflineSorter.cs | 4 ++-- 5 files changed, 22 insertions(+), 14 deletions(-) diff --git a/src/Lucene.Net.TestFramework.NUnit/Support/TestFramework/Assert.cs b/src/Lucene.Net.TestFramework.NUnit/Support/TestFramework/Assert.cs index 2c0af47..91546a7 100644 --- a/src/Lucene.Net.TestFramework.NUnit/Support/TestFramework/Assert.cs +++ b/src/Lucene.Net.TestFramework.NUnit/Support/TestFramework/Assert.cs @@ -216,10 +216,10 @@ namespace Lucene.Net.TestFramework // // actual: // The actual value - public static void AreEqual(byte expected, byte actual) - { - _NUnit.Assert.True(expected == actual); - } + //public static void AreEqual(byte expected, byte actual) + //{ + // _NUnit.Assert.True(expected == actual); + //} // From CollectionAssert public static void AreEqual<T>(T[] expected, T[] actual) diff --git a/src/Lucene.Net.TestFramework/Support/JavaCompatibility/LuceneTestCase.cs b/src/Lucene.Net.TestFramework/Support/JavaCompatibility/LuceneTestCase.cs index aaca9df..2bd29bc 100644 --- a/src/Lucene.Net.TestFramework/Support/JavaCompatibility/LuceneTestCase.cs +++ b/src/Lucene.Net.TestFramework/Support/JavaCompatibility/LuceneTestCase.cs @@ -80,22 +80,26 @@ namespace Lucene.Net.Util internal static void assertEquals(bool expected, bool actual) { - Assert.AreEqual(expected, actual); + Assert.IsTrue(expected.Equals(actual)); + //Assert.AreEqual(expected, actual); } internal static void assertEquals(string message, bool expected, bool actual) { - Assert.AreEqual(expected, actual, message); + Assert.IsTrue(expected.Equals(actual), message); + //Assert.AreEqual(expected, actual, message); } internal static void assertEquals(long expected, long actual) { - Assert.AreEqual(expected, actual); + Assert.True(expected == actual); + //Assert.AreEqual(expected, actual); } internal static void assertEquals(string message, long expected, long actual) { - Assert.AreEqual(expected, actual, message); + Assert.True(expected == actual, message); + //Assert.AreEqual(expected, actual, message); } internal static void assertEquals<T>(ISet<T> expected, ISet<T> actual) diff --git a/src/Lucene.Net.Tests/Util/TestFixedBitSet.cs b/src/Lucene.Net.Tests/Util/TestFixedBitSet.cs index faafdb4..278058d 100644 --- a/src/Lucene.Net.Tests/Util/TestFixedBitSet.cs +++ b/src/Lucene.Net.Tests/Util/TestFixedBitSet.cs @@ -23,6 +23,7 @@ using System.Collections; */ using System.Linq; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Util { diff --git a/src/Lucene.Net.Tests/Util/TestOfflineSorter.cs b/src/Lucene.Net.Tests/Util/TestOfflineSorter.cs index b3b7325..34c4a13 100644 --- a/src/Lucene.Net.Tests/Util/TestOfflineSorter.cs +++ b/src/Lucene.Net.Tests/Util/TestOfflineSorter.cs @@ -4,6 +4,7 @@ using System.IO; using NUnit.Framework; using Lucene.Net.Attributes; using J2N.Text; +using Assert = Lucene.Net.TestFramework.Assert; namespace Lucene.Net.Util { @@ -165,10 +166,12 @@ namespace Lucene.Net.Util while ((len = is1.Read(buf1, 0, buf1.Length)) > 0) { is2.Read(buf2, 0, len); - for (int i = 0; i < len; i++) - { - Assert.AreEqual(buf1[i], buf2[i]); - } + // Refactored test to let NUnit test the byte array rather than iterate each byte + //for (int i = 0; i < len; i++) + //{ + // Assert.AreEqual(buf1[i], buf2[i]); + //} + Assert.AreEqual(buf1, buf2); } //IOUtils.Close(is1, is2); } diff --git a/src/Lucene.Net/Util/OfflineSorter.cs b/src/Lucene.Net/Util/OfflineSorter.cs index 7c8953b..07910f2 100644 --- a/src/Lucene.Net/Util/OfflineSorter.cs +++ b/src/Lucene.Net/Util/OfflineSorter.cs @@ -390,7 +390,7 @@ namespace Lucene.Net.Util /// <summary> /// Merge a list of sorted temporary files (partitions) into an output file. </summary> - internal void MergePartitions(IEnumerable<FileInfo> merges, FileInfo outputFile) + internal void MergePartitions(IList<FileInfo> merges, FileInfo outputFile) { long start = Environment.TickCount; @@ -404,7 +404,7 @@ namespace Lucene.Net.Util // Open streams and read the top for each file for (int i = 0; i < merges.Count(); i++) { - streams[i] = new ByteSequencesReader(merges.ElementAt(i)); + streams[i] = new ByteSequencesReader(merges[i]); byte[] line = streams[i].Read(); if (line != null) {
