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 528dfa471fffb19a4f85580e83336747612b5f1e Author: Shad Storhaug <[email protected]> AuthorDate: Mon Jun 29 13:51:20 2020 +0700 Lucene.Net.TestFramework: Added some overloads with Func<string>, since some of the messages are expensive to build and only apply to the failure case --- .../Support/TestFramework/Assert.cs | 25 +++++++++++++++++++++- src/Lucene.Net.TestFramework/Search/CheckHits.cs | 6 +++--- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/src/Lucene.Net.TestFramework.NUnit/Support/TestFramework/Assert.cs b/src/Lucene.Net.TestFramework.NUnit/Support/TestFramework/Assert.cs index 2e42805..9e01972 100644 --- a/src/Lucene.Net.TestFramework.NUnit/Support/TestFramework/Assert.cs +++ b/src/Lucene.Net.TestFramework.NUnit/Support/TestFramework/Assert.cs @@ -373,6 +373,14 @@ namespace Lucene.Net.TestFramework } } + public static void AreEqual<T>(ISet<T> expected, ISet<T> actual, bool aggressive, Func<string> getMessage) + { + if (!GetSetComparer<T>(aggressive).Equals(expected, actual)) + { + _NUnit.Assert.Fail(getMessage()); + } + } + public static void AreEqual<T>(IList<T> expected, IList<T> actual, bool aggressive = true) { if (!GetListComparer<T>(aggressive).Equals(expected, actual)) @@ -390,13 +398,20 @@ namespace Lucene.Net.TestFramework } } + public static void AreEqual<T>(IList<T> expected, IList<T> actual, bool aggressive, Func<string> getMessage) + { + if (!GetListComparer<T>(aggressive).Equals(expected, actual)) + { + _NUnit.Assert.Fail(getMessage()); + } + } + public static void AreEqual<TKey, TValue>(IDictionary<TKey, TValue> expected, IDictionary<TKey, TValue> actual, bool aggressive = true) { if (!GetDictionaryComparer<TKey, TValue>(aggressive).Equals(expected, actual)) { _NUnit.Assert.Fail("Expected: '{0}', Actual: '{1}'", FormatCollection(expected), FormatCollection(actual)); } - } public static void AreEqual<TKey, TValue>(IDictionary<TKey, TValue> expected, IDictionary<TKey, TValue> actual, bool aggressive, string message, params object[] args) @@ -407,6 +422,14 @@ namespace Lucene.Net.TestFramework } } + public static void AreEqual<TKey, TValue>(IDictionary<TKey, TValue> expected, IDictionary<TKey, TValue> actual, bool aggressive, Func<string> getMessage) + { + if (!GetDictionaryComparer<TKey, TValue>(aggressive).Equals(expected, actual)) + { + _NUnit.Assert.Fail(getMessage()); + } + } + // From CollectionAssert public static void AreEqual<T>(T[] expected, T[] actual) diff --git a/src/Lucene.Net.TestFramework/Search/CheckHits.cs b/src/Lucene.Net.TestFramework/Search/CheckHits.cs index ff9b103..24bf5f1 100644 --- a/src/Lucene.Net.TestFramework/Search/CheckHits.cs +++ b/src/Lucene.Net.TestFramework/Search/CheckHits.cs @@ -129,7 +129,7 @@ namespace Lucene.Net.Search searcher.Search(query, c); - Assert.AreEqual(correct, actual, aggressive: false, "Simple: " + query.ToString(defaultFieldName)); + Assert.AreEqual(correct, actual, aggressive: false, () => "Simple: " + query.ToString(defaultFieldName)); for (int i = -1; i < 2; i++) { @@ -140,7 +140,7 @@ namespace Lucene.Net.Search #endif random, searcher, i); s.Search(query, c); - Assert.AreEqual(correct, actual, aggressive: false, "Wrap Reader " + i + ": " + query.ToString(defaultFieldName)); + Assert.AreEqual(correct, actual, aggressive: false, () => "Wrap Reader " + i + ": " + query.ToString(defaultFieldName)); } } @@ -193,7 +193,7 @@ namespace Lucene.Net.Search actual.Add(Convert.ToInt32(hits[i].Doc, CultureInfo.InvariantCulture)); } - Assert.AreEqual(correct, actual, aggressive: false, query.ToString(defaultFieldName)); + Assert.AreEqual(correct, actual, aggressive: false, () => query.ToString(defaultFieldName)); QueryUtils.Check( #if FEATURE_INSTANCE_TESTDATA_INITIALIZATION
