You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucenenet.apache.org by ni...@apache.org on 2020/06/24 18:12:03 UTC
[lucenenet] 09/26: Lucene.Net.TestFramework: Added overloads for
int to Assert.AreEqual (addresses #295, #261)
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 6f504d239f740c2a5a1ed5f1b991e3b6bf8cf451
Author: Shad Storhaug <sh...@shadstorhaug.com>
AuthorDate: Tue Jun 23 18:33:04 2020 +0700
Lucene.Net.TestFramework: Added overloads for int to Assert.AreEqual (addresses #295, #261)
---
.../Support/TestFramework/Assert.cs | 72 ++++++++++++++++++++--
.../Index/BaseStoredFieldsFormatTestCase.cs | 2 +-
.../Support/JavaCompatibility/LuceneTestCase.cs | 20 ++++++
src/Lucene.Net.Tests/Util/Fst/TestFSTs.cs | 2 +-
4 files changed, 88 insertions(+), 8 deletions(-)
diff --git a/src/Lucene.Net.TestFramework.NUnit/Support/TestFramework/Assert.cs b/src/Lucene.Net.TestFramework.NUnit/Support/TestFramework/Assert.cs
index 91546a7..c4286c3 100644
--- a/src/Lucene.Net.TestFramework.NUnit/Support/TestFramework/Assert.cs
+++ b/src/Lucene.Net.TestFramework.NUnit/Support/TestFramework/Assert.cs
@@ -177,9 +177,48 @@ namespace Lucene.Net.TestFramework
//
// actual:
// The actual value
+ public static void AreEqual(int expected, int actual)
+ {
+ _NUnit.Assert.True(expected.Equals(actual));
+ }
+
+ //
+ // Summary:
+ // Verifies that two objects are equal. Two objects are considered equal if both
+ // are null, or if both have the same value. NUnit has special semantics for some
+ // object types. If they are not equal an NUnit.Framework.AssertionException is
+ // thrown.
+ //
+ // Parameters:
+ // expected:
+ // The value that is expected
+ //
+ // message:
+ // The message to display in case of failure
+ //
+ // actual:
+ // The actual value
+ public static void AreEqual(int expected, int actual, string message)
+ {
+ _NUnit.Assert.True(expected.Equals(actual), message);
+ }
+
+ //
+ // Summary:
+ // Verifies that two objects are equal. Two objects are considered equal if both
+ // are null, or if both have the same value. NUnit has special semantics for some
+ // object types. If they are not equal an NUnit.Framework.AssertionException is
+ // thrown.
+ //
+ // Parameters:
+ // expected:
+ // The value that is expected
+ //
+ // actual:
+ // The actual value
public static void AreEqual(long expected, long actual)
{
- _NUnit.Assert.True(expected == actual);
+ _NUnit.Assert.True(expected.Equals(actual));
}
//
@@ -200,7 +239,25 @@ namespace Lucene.Net.TestFramework
// The actual value
public static void AreEqual(long expected, long actual, string message)
{
- _NUnit.Assert.True(expected == actual, message);
+ _NUnit.Assert.True(expected.Equals(actual), message);
+ }
+
+ //
+ // Summary:
+ // Verifies that two objects are equal. Two objects are considered equal if both
+ // are null, or if both have the same value. NUnit has special semantics for some
+ // object types. If they are not equal an NUnit.Framework.AssertionException is
+ // thrown.
+ //
+ // Parameters:
+ // expected:
+ // The value that is expected
+ //
+ // actual:
+ // The actual value
+ public static void AreEqual(byte expected, byte actual)
+ {
+ _NUnit.Assert.True(expected.Equals(actual));
}
//
@@ -214,12 +271,15 @@ namespace Lucene.Net.TestFramework
// expected:
// The value that is expected
//
+ // message:
+ // The message to display in case of failure
+ //
// 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, string message)
+ {
+ _NUnit.Assert.True(expected.Equals(actual), message);
+ }
// From CollectionAssert
public static void AreEqual<T>(T[] expected, T[] actual)
diff --git a/src/Lucene.Net.TestFramework/Index/BaseStoredFieldsFormatTestCase.cs b/src/Lucene.Net.TestFramework/Index/BaseStoredFieldsFormatTestCase.cs
index da7f856..5300826 100644
--- a/src/Lucene.Net.TestFramework/Index/BaseStoredFieldsFormatTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Index/BaseStoredFieldsFormatTestCase.cs
@@ -266,7 +266,7 @@ namespace Lucene.Net.Index
b = f2.GetBinaryValue().Bytes;
Assert.IsTrue(b != null);
Assert.AreEqual(17, b.Length, 17);
- Assert.AreEqual(87, b[0]);
+ Assert.AreEqual((byte)87, b[0]);
} // ir.Dispose();
} // dir.Dispose();
}
diff --git a/src/Lucene.Net.TestFramework/Support/JavaCompatibility/LuceneTestCase.cs b/src/Lucene.Net.TestFramework/Support/JavaCompatibility/LuceneTestCase.cs
index 20e1815..c14960d 100644
--- a/src/Lucene.Net.TestFramework/Support/JavaCompatibility/LuceneTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Support/JavaCompatibility/LuceneTestCase.cs
@@ -102,6 +102,26 @@ namespace Lucene.Net.Util
//Assert.AreEqual(expected, actual, message);
}
+ internal static void assertEquals(int expected, int actual)
+ {
+ Assert.AreEqual(expected, actual);
+ }
+
+ internal static void assertEquals(string message, int expected, int actual)
+ {
+ Assert.AreEqual(expected, actual, message);
+ }
+
+ internal static void assertEquals(byte expected, byte actual)
+ {
+ Assert.AreEqual(expected, actual);
+ }
+
+ internal static void assertEquals(string message, byte expected, byte actual)
+ {
+ Assert.AreEqual(expected, actual, message);
+ }
+
internal static void assertEquals<T>(ISet<T> expected, ISet<T> actual)
{
Assert.True(JCG.SetEqualityComparer<T>.Default.Equals(expected, actual));
diff --git a/src/Lucene.Net.Tests/Util/Fst/TestFSTs.cs b/src/Lucene.Net.Tests/Util/Fst/TestFSTs.cs
index dbce10d..2868051 100644
--- a/src/Lucene.Net.Tests/Util/Fst/TestFSTs.cs
+++ b/src/Lucene.Net.Tests/Util/Fst/TestFSTs.cs
@@ -1882,7 +1882,7 @@ namespace Lucene.Net.Util.Fst
Assert.AreEqual(result.Bytes[result.Offset], arc);
for (int byteIDX = 1; byteIDX < result.Length; byteIDX++)
{
- Assert.AreEqual(0, result.Bytes[result.Offset + byteIDX]);
+ Assert.AreEqual((byte)0, result.Bytes[result.Offset + byteIDX]);
}
}
}