From efe6dd5930b05a5d10b74a4f254dcd33ee1298e9 Mon Sep 17 00:00:00 2001 From: Corina Olariu Date: Mon, 30 Oct 2023 14:58:48 +0200 Subject: [PATCH] RED-7848 - Sorting in merged dictionary differs from template dictionary in terms of capitalization - correct junit assertions --- .../v1/server/integration/tests/DictionaryTest.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DictionaryTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DictionaryTest.java index cfc3af608..8325fe108 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DictionaryTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DictionaryTest.java @@ -527,9 +527,9 @@ public class DictionaryTest extends AbstractPersistenceServerServiceTest { assertThat(entries.get(1)).isEqualTo("carlsen"); assertThat(entries.get(2)).isEqualTo("Charalampos"); assertThat(entries.get(3)).isEqualTo("PATRICIA A. SHEEHY"); - assertThat(entries.get(3)).isEqualTo("Patricia A. Sheehy"); - assertThat(entries.get(3)).isEqualTo("William C. Spare"); - assertThat(entries.get(4)).isEqualTo("William c. Spare"); + assertThat(entries.get(4)).isEqualTo("Patricia A. Sheehy"); + assertThat(entries.get(5)).isEqualTo("William C. Spare"); + assertThat(entries.get(6)).isEqualTo("William c. Spare"); // assertThat(entries).isEqualTo(loadedType1.getFalsePositiveEntries()); var falsePositives = loadedType1.getEntries(); @@ -538,9 +538,9 @@ public class DictionaryTest extends AbstractPersistenceServerServiceTest { assertThat(falsePositives.get(1)).isEqualTo("carlsen"); assertThat(falsePositives.get(2)).isEqualTo("Charalampos"); assertThat(falsePositives.get(3)).isEqualTo("PATRICIA A. SHEEHY"); - assertThat(falsePositives.get(3)).isEqualTo("Patricia A. Sheehy"); - assertThat(falsePositives.get(3)).isEqualTo("William C. Spare"); - assertThat(falsePositives.get(4)).isEqualTo("William c. Spare"); + assertThat(falsePositives.get(4)).isEqualTo("Patricia A. Sheehy"); + assertThat(falsePositives.get(5)).isEqualTo("William C. Spare"); + assertThat(falsePositives.get(6)).isEqualTo("William c. Spare"); assertThat(loadedType1.getFalseRecommendationEntries()).hasSize(2); assertThat(loadedType1.getFalseRecommendationEntries().get(0)).isEqualTo("afalse_recommendation2"); assertThat(loadedType1.getFalseRecommendationEntries().get(1)).isEqualTo("false_recommendation1"); @@ -561,7 +561,6 @@ public class DictionaryTest extends AbstractPersistenceServerServiceTest { var sortedList22 = testList2.stream().sorted().toList(); var sortedList21 = testList2.stream().sorted(String::compareToIgnoreCase).toList(); var sortedList23 = testList2.stream().sorted(DictionaryService.entryComparator).toList(); -// var sortedList23 = testList2.stream().sorted(Comparator.naturalOrder().thenComparing((a,b) -> a.(b))).toList(); System.out.println("Test list 2: " + testList2); System.out.println("With sorted()sorted(Comparator.comparing(String::toLowerCase)): " + sortedList1); System.out.println("With sorted()sorted(Comparator.comparing(String::toLowerCase)): " + sortedList2);