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 55a55958047a1980a2b92e96b808ad9841a2127c Author: Shad Storhaug <[email protected]> AuthorDate: Mon Jun 29 13:55:09 2020 +0700 Updated assertEquals and Assert.AreEqual to specify aggressive: false when it doesn't apply to the test --- .../Analysis/CharFilters/TestMappingCharFilter.cs | 2 +- .../Analysis/Core/TestStopFilterFactory.cs | 2 +- .../Morfologik/TestMorfologikAnalyzer.cs | 17 +++++++++-------- .../Taxonomy/TestTaxonomyFacetCounts.cs | 2 +- src/Lucene.Net.Tests.Queries/CommonTermsQueryTest.cs | 10 ++++++++-- src/Lucene.Net.Tests.Replicator/SessionTokenTest.cs | 2 +- .../Suggest/TestInputIterator.cs | 4 ++-- src/Lucene.Net.Tests/Util/TestCollectionUtil.cs | 12 ++++++------ 8 files changed, 29 insertions(+), 22 deletions(-) diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/CharFilters/TestMappingCharFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/CharFilters/TestMappingCharFilter.cs index 97aa117..f8e77f3 100644 --- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/CharFilters/TestMappingCharFilter.cs +++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/CharFilters/TestMappingCharFilter.cs @@ -550,7 +550,7 @@ namespace Lucene.Net.Analysis.CharFilters // Verify: assertEquals(expected, actual); - assertEquals(inputOffsets, actualInputOffsets); + assertEquals(inputOffsets, actualInputOffsets, aggressive: false); } } } diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestStopFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestStopFilterFactory.cs index 346daa0..c15985e 100644 --- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestStopFilterFactory.cs +++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestStopFilterFactory.cs @@ -53,7 +53,7 @@ namespace Lucene.Net.Analysis.Core // defaults factory = (StopFilterFactory)TokenFilterFactory("Stop"); - assertEquals(StopAnalyzer.ENGLISH_STOP_WORDS_SET, factory.StopWords); + assertEquals(StopAnalyzer.ENGLISH_STOP_WORDS_SET, factory.StopWords, aggressive: false); assertEquals(false, factory.IgnoreCase); } diff --git a/src/Lucene.Net.Tests.Analysis.Morfologik/Morfologik/TestMorfologikAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Morfologik/Morfologik/TestMorfologikAnalyzer.cs index e44b1ca..9a81d70 100644 --- a/src/Lucene.Net.Tests.Analysis.Morfologik/Morfologik/TestMorfologikAnalyzer.cs +++ b/src/Lucene.Net.Tests.Analysis.Morfologik/Morfologik/TestMorfologikAnalyzer.cs @@ -147,19 +147,20 @@ namespace Lucene.Net.Analysis.Morfologik SCG.ISet<String> expected = new JCG.SortedSet<String>(StringComparer.Ordinal); foreach (StringBuilder b in ts.GetAttribute<IMorphosyntacticTagsAttribute>().Tags) { - actual.add(b.toString()); + actual.Add(b.ToString()); } foreach (String s in tags) { - expected.add(s); + expected.Add(s); } - if (!expected.equals(actual)) - { - Console.WriteLine("Expected:\n" + expected); - Console.WriteLine("Actual:\n" + actual); - assertEquals(expected, actual); - } + // LUCENENET: Commented out unnecessary extra check + //if (!expected.Equals(actual)) + //{ + // Console.WriteLine("Expected:\n" + expected); + // Console.WriteLine("Actual:\n" + actual); + assertEquals(expected, actual, aggressive: false); + //} } /** Test morphosyntactic annotations. */ diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts.cs index aeeee70..850cca0 100644 --- a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts.cs +++ b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts.cs @@ -883,7 +883,7 @@ namespace Lucene.Net.Facet.Taxonomy // Messy: fixup ties SortTies(actual); - Assert.AreEqual(expected, actual); + Assert.AreEqual(expected, actual, aggressive: false); } IOUtils.Dispose(w, tw, searcher.IndexReader, tr, indexDir, taxoDir); diff --git a/src/Lucene.Net.Tests.Queries/CommonTermsQueryTest.cs b/src/Lucene.Net.Tests.Queries/CommonTermsQueryTest.cs index d705ff5..90aed36 100644 --- a/src/Lucene.Net.Tests.Queries/CommonTermsQueryTest.cs +++ b/src/Lucene.Net.Tests.Queries/CommonTermsQueryTest.cs @@ -275,7 +275,10 @@ namespace Lucene.Net.Tests.Queries assertEquals(search.TotalHits, 3); assertEquals(search.ScoreDocs[1].Score, search.ScoreDocs[2].Score, 0F); assertEquals(@"0", r.Document(search.ScoreDocs[0].Doc).Get(@"id")); - assertEquals(new JCG.HashSet<string> { @"2", @"3" }, new JCG.HashSet<string> { r.Document(search.ScoreDocs[1].Doc).Get(@"id"), r.Document(search.ScoreDocs[2].Doc).Get(@"id") }); + assertEquals( + new JCG.HashSet<string> { @"2", @"3" }, + new JCG.HashSet<string> { r.Document(search.ScoreDocs[1].Doc).Get(@"id"), r.Document(search.ScoreDocs[2].Doc).Get(@"id") }, + aggressive: false); } { @@ -298,7 +301,10 @@ namespace Lucene.Net.Tests.Queries query.HighFreqMinimumNumberShouldMatch = 2F; TopDocs search = s.Search(query, 10); assertEquals(search.TotalHits, 2); - assertEquals(new JCG.HashSet<string> { @"0", @"2" }, new JCG.HashSet<string> { r.Document(search.ScoreDocs[0].Doc).Get(@"id"), r.Document(search.ScoreDocs[1].Doc).Get(@"id") }); + assertEquals( + new JCG.HashSet<string> { @"0", @"2" }, + new JCG.HashSet<string> { r.Document(search.ScoreDocs[0].Doc).Get(@"id"), r.Document(search.ScoreDocs[1].Doc).Get(@"id") }, + aggressive: false); } r.Dispose(); diff --git a/src/Lucene.Net.Tests.Replicator/SessionTokenTest.cs b/src/Lucene.Net.Tests.Replicator/SessionTokenTest.cs index 937d381..e785952 100644 --- a/src/Lucene.Net.Tests.Replicator/SessionTokenTest.cs +++ b/src/Lucene.Net.Tests.Replicator/SessionTokenTest.cs @@ -54,7 +54,7 @@ namespace Lucene.Net.Replicator assertEquals(session1.SourceFiles.Keys, session2.SourceFiles.Keys); IList<RevisionFile> files1 = session1.SourceFiles.Values.First(); IList<RevisionFile> files2 = session2.SourceFiles.Values.First(); - assertEquals(files1, files2); + assertEquals(files1, files2, aggressive: false); IOUtils.Dispose(writer, directory); } diff --git a/src/Lucene.Net.Tests.Suggest/Suggest/TestInputIterator.cs b/src/Lucene.Net.Tests.Suggest/Suggest/TestInputIterator.cs index efcae89..cf81c43 100644 --- a/src/Lucene.Net.Tests.Suggest/Suggest/TestInputIterator.cs +++ b/src/Lucene.Net.Tests.Suggest/Suggest/TestInputIterator.cs @@ -130,7 +130,7 @@ namespace Lucene.Net.Search.Suggest BytesRef payload = wrapper.Payload; actual.Put(BytesRef.DeepCopyOf(key), new KeyValuePair<long, BytesRef>(value, BytesRef.DeepCopyOf(payload))); } - assertEquals(sorted, actual); + assertEquals(sorted, actual, aggressive: false); // test the sorted iterator wrapper without payloads IInputIterator wrapperWithoutPayload = new SortedInputIterator(new InputArrayIterator(unsortedWithoutPayload), comparer); @@ -155,7 +155,7 @@ namespace Lucene.Net.Search.Suggest assertNull(wrapperWithoutPayload.Payload); actualWithoutPayload.Put(BytesRef.DeepCopyOf(key), value); } - assertEquals(sortedWithoutPayload, actualWithoutPayload); + assertEquals(sortedWithoutPayload, actualWithoutPayload, aggressive: false); } public static long AsLong(BytesRef b) diff --git a/src/Lucene.Net.Tests/Util/TestCollectionUtil.cs b/src/Lucene.Net.Tests/Util/TestCollectionUtil.cs index b19a4a2..75c6562 100644 --- a/src/Lucene.Net.Tests/Util/TestCollectionUtil.cs +++ b/src/Lucene.Net.Tests/Util/TestCollectionUtil.cs @@ -44,17 +44,17 @@ namespace Lucene.Net.Util IList<int> list1 = CreateRandomList(2000), list2 = new List<int>(list1); CollectionUtil.IntroSort(list1); list2.Sort(); - assertEquals(list2, list1); + assertEquals(list2, list1, aggressive: false); list1 = CreateRandomList(2000); list2 = new List<int>(list1); CollectionUtil.IntroSort(list1, Collections.ReverseOrder<int>()); list2.Sort(Collections.ReverseOrder<int>()); - assertEquals(list2, list1); + assertEquals(list2, list1, aggressive: false); // reverse back, so we can test that completely backwards sorted array (worst case) is working: CollectionUtil.IntroSort(list1); list2.Sort(); - assertEquals(list2, list1); + assertEquals(list2, list1, aggressive: false); } } @@ -66,17 +66,17 @@ namespace Lucene.Net.Util IList<int> list1 = CreateRandomList(2000), list2 = new List<int>(list1); CollectionUtil.TimSort(list1); list2.Sort(); - assertEquals(list2, list1); + assertEquals(list2, list1, aggressive: false); list1 = CreateRandomList(2000); list2 = new List<int>(list1); CollectionUtil.TimSort(list1, Collections.ReverseOrder<int>()); list2.Sort(Collections.ReverseOrder<int>()); - assertEquals(list2, list1); + assertEquals(list2, list1, aggressive: false); // reverse back, so we can test that completely backwards sorted array (worst case) is working: CollectionUtil.TimSort(list1); list2.Sort(); - assertEquals(list2, list1); + assertEquals(list2, list1, aggressive: false); } }
