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 124decc2e9c2376835a9b8e2ea0a304715f489e0 Author: Shad Storhaug <[email protected]> AuthorDate: Wed Jun 24 12:45:37 2020 +0700 Lucene.Net.TestFramework: Added assert overloads for float (#295, #261) --- .../Support/TestFramework/Assert.cs | 51 +++++++++++++++++++++- .../Support/JavaCompatibility/LuceneTestCase.cs | 30 ++++++++----- 2 files changed, 70 insertions(+), 11 deletions(-) diff --git a/src/Lucene.Net.TestFramework.NUnit/Support/TestFramework/Assert.cs b/src/Lucene.Net.TestFramework.NUnit/Support/TestFramework/Assert.cs index a3fd36c..b03a80b 100644 --- a/src/Lucene.Net.TestFramework.NUnit/Support/TestFramework/Assert.cs +++ b/src/Lucene.Net.TestFramework.NUnit/Support/TestFramework/Assert.cs @@ -163,7 +163,56 @@ namespace Lucene.Net.TestFramework { _NUnit.Assert.AreEqual(expected, actual, delta); } - + // + // Summary: + // Verifies that two doubles are equal considering a delta. If the expected value + // is infinity then the delta value is ignored. If they are not equal then an NUnit.Framework.AssertionException + // is thrown. + // + // Parameters: + // expected: + // The expected value + // + // actual: + // The actual value + // + // delta: + // The maximum acceptable difference between the the expected and the actual + // + // message: + // The message to display in case of failure + // + // args: + // Array of objects to be used in formatting the message + public static void AreEqual(float expected, float actual, float delta, string message, params object[] args) + { + if (Math.Abs(expected - actual) > delta) + { + _NUnit.Assert.AreEqual(expected, actual, delta, message, args); + } + } + // + // Summary: + // Verifies that two doubles are equal considering a delta. If the expected value + // is infinity then the delta value is ignored. If they are not equal then an NUnit.Framework.AssertionException + // is thrown. + // + // Parameters: + // expected: + // The expected value + // + // actual: + // The actual value + // + // delta: + // The maximum acceptable difference between the the expected and the actual + public static void AreEqual(float expected, float actual, float delta) + { + if (Math.Abs(expected - actual) > delta) + { + _NUnit.Assert.AreEqual(expected, actual, delta); + } + } // // Summary: // Verifies that two objects are equal. Two objects are considered equal if both diff --git a/src/Lucene.Net.TestFramework/Support/JavaCompatibility/LuceneTestCase.cs b/src/Lucene.Net.TestFramework/Support/JavaCompatibility/LuceneTestCase.cs index 0c067b0..3e36f90 100644 --- a/src/Lucene.Net.TestFramework/Support/JavaCompatibility/LuceneTestCase.cs +++ b/src/Lucene.Net.TestFramework/Support/JavaCompatibility/LuceneTestCase.cs @@ -118,6 +118,26 @@ namespace Lucene.Net.Util Assert.AreEqual(expected, actual, message); } + internal static void assertEquals(double d1, double d2, double delta) + { + Assert.AreEqual(d1, d2, delta); + } + + internal static void assertEquals(string msg, float d1, float d2, float delta) + { + Assert.AreEqual(d1, d2, delta, msg); + } + + internal static void assertEquals(float d1, float d2, float delta) + { + Assert.AreEqual(d1, d2, delta); + } + + internal static void assertEquals(string msg, double d1, double d2, double delta) + { + Assert.AreEqual(d1, d2, delta, msg); + } + internal static void assertEquals<T>(ISet<T> expected, ISet<T> actual) { Assert.True(JCG.SetEqualityComparer<T>.Default.Equals(expected, actual)); @@ -163,16 +183,6 @@ namespace Lucene.Net.Util Assert.AreNotSame(unexpected, actual, message); } - internal static void assertEquals(double d1, double d2, double delta) - { - Assert.AreEqual(d1, d2, delta); - } - - internal static void assertEquals(string msg, double d1, double d2, double delta) - { - Assert.AreEqual(d1, d2, delta, msg); - } - internal static void assertNotNull(object o) { Assert.NotNull(o);
