RED-7848 - Sorting in merged dictionary differs from template dictionary in terms of capitalization #202

Merged
corina.olariu.ext1 merged 4 commits from RED-7848 into master 2023-10-31 08:36:05 +01:00
Showing only changes of commit efe6dd5930 - Show all commits

View File

@ -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);