From c27e3b23abe5c500992212bc0fcf0fd8fe1a7b9b Mon Sep 17 00:00:00 2001 From: Andrey Kozhushkov Date: Mon, 6 Jan 2025 15:53:55 +0100 Subject: [PATCH 1/2] fixed umlauts in unit tests (expect correct encoding) --- .../java/io/goobi/viewer/indexer/LidoIndexerTest.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/goobi-viewer-indexer/src/test/java/io/goobi/viewer/indexer/LidoIndexerTest.java b/goobi-viewer-indexer/src/test/java/io/goobi/viewer/indexer/LidoIndexerTest.java index 24420326..bd1c152b 100644 --- a/goobi-viewer-indexer/src/test/java/io/goobi/viewer/indexer/LidoIndexerTest.java +++ b/goobi-viewer-indexer/src/test/java/io/goobi/viewer/indexer/LidoIndexerTest.java @@ -158,15 +158,15 @@ void index_shouldIndexRecordCorrectly() throws Exception { List mdList = (List) doc.getFieldValue("MD_TITLE"); Assertions.assertNotNull(mdList); Assertions.assertEquals(1, mdList.size()); - Assertions.assertEquals("Feldseite Kröpeliner Tor, Kinder im Vordergrund", mdList.get(0)); + Assertions.assertEquals("Feldseite Kröpeliner Tor, Kinder im Vordergrund", mdList.get(0)); } { List mdList = (List) doc.getFieldValue("MD_TITLE" + SolrConstants.SUFFIX_UNTOKENIZED); Assertions.assertNotNull(mdList); Assertions.assertEquals(1, mdList.size()); - Assertions.assertEquals("Feldseite Kröpeliner Tor, Kinder im Vordergrund", mdList.get(0)); + Assertions.assertEquals("Feldseite Kröpeliner Tor, Kinder im Vordergrund", mdList.get(0)); } - Assertions.assertEquals("Feldseite Kröpeliner Tor, Kinder im Vordergrund", doc.getFieldValue("SORT_TITLE")); + Assertions.assertEquals("Feldseite Kröpeliner Tor, Kinder im Vordergrund", doc.getFieldValue("SORT_TITLE")); Assertions.assertEquals("1900", doc.getFieldValue("SORT_" + SolrConstants.EVENTDATESTART)); Assertions.assertFalse((boolean) doc.getFieldValue(SolrConstants.FULLTEXTAVAILABLE)); } @@ -276,13 +276,13 @@ void index_shouldIndexRecordCorrectly() throws Exception { List mdList = (List) doc.getFieldValue("MD_MATERIAL"); Assertions.assertNotNull(mdList); Assertions.assertEquals(1, mdList.size()); - Assertions.assertEquals("Papier, schwarz-weiß", mdList.get(0)); + Assertions.assertEquals("Papier, schwarz-weiß", mdList.get(0)); } { List mdList = (List) doc.getFieldValue("MD_MATERIAL" + SolrConstants.SUFFIX_UNTOKENIZED); Assertions.assertNotNull(mdList); Assertions.assertEquals(1, mdList.size()); - Assertions.assertEquals("Papier, schwarz-weiß", mdList.get(0)); + Assertions.assertEquals("Papier, schwarz-weiß", mdList.get(0)); } { List mdList = (List) doc.getFieldValue(SolrConstants.YEAR); From 328a4911ec9786fefc14141149c9222aa994d00f Mon Sep 17 00:00:00 2001 From: Andrey Kozhushkov Date: Mon, 6 Jan 2025 15:56:57 +0100 Subject: [PATCH 2/2] Revert "fixed umlauts in unit tests (expect correct encoding)" This reverts commit c27e3b23abe5c500992212bc0fcf0fd8fe1a7b9b. --- .../java/io/goobi/viewer/indexer/LidoIndexerTest.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/goobi-viewer-indexer/src/test/java/io/goobi/viewer/indexer/LidoIndexerTest.java b/goobi-viewer-indexer/src/test/java/io/goobi/viewer/indexer/LidoIndexerTest.java index bd1c152b..24420326 100644 --- a/goobi-viewer-indexer/src/test/java/io/goobi/viewer/indexer/LidoIndexerTest.java +++ b/goobi-viewer-indexer/src/test/java/io/goobi/viewer/indexer/LidoIndexerTest.java @@ -158,15 +158,15 @@ void index_shouldIndexRecordCorrectly() throws Exception { List mdList = (List) doc.getFieldValue("MD_TITLE"); Assertions.assertNotNull(mdList); Assertions.assertEquals(1, mdList.size()); - Assertions.assertEquals("Feldseite Kröpeliner Tor, Kinder im Vordergrund", mdList.get(0)); + Assertions.assertEquals("Feldseite Kröpeliner Tor, Kinder im Vordergrund", mdList.get(0)); } { List mdList = (List) doc.getFieldValue("MD_TITLE" + SolrConstants.SUFFIX_UNTOKENIZED); Assertions.assertNotNull(mdList); Assertions.assertEquals(1, mdList.size()); - Assertions.assertEquals("Feldseite Kröpeliner Tor, Kinder im Vordergrund", mdList.get(0)); + Assertions.assertEquals("Feldseite Kröpeliner Tor, Kinder im Vordergrund", mdList.get(0)); } - Assertions.assertEquals("Feldseite Kröpeliner Tor, Kinder im Vordergrund", doc.getFieldValue("SORT_TITLE")); + Assertions.assertEquals("Feldseite Kröpeliner Tor, Kinder im Vordergrund", doc.getFieldValue("SORT_TITLE")); Assertions.assertEquals("1900", doc.getFieldValue("SORT_" + SolrConstants.EVENTDATESTART)); Assertions.assertFalse((boolean) doc.getFieldValue(SolrConstants.FULLTEXTAVAILABLE)); } @@ -276,13 +276,13 @@ void index_shouldIndexRecordCorrectly() throws Exception { List mdList = (List) doc.getFieldValue("MD_MATERIAL"); Assertions.assertNotNull(mdList); Assertions.assertEquals(1, mdList.size()); - Assertions.assertEquals("Papier, schwarz-weiß", mdList.get(0)); + Assertions.assertEquals("Papier, schwarz-weiß", mdList.get(0)); } { List mdList = (List) doc.getFieldValue("MD_MATERIAL" + SolrConstants.SUFFIX_UNTOKENIZED); Assertions.assertNotNull(mdList); Assertions.assertEquals(1, mdList.size()); - Assertions.assertEquals("Papier, schwarz-weiß", mdList.get(0)); + Assertions.assertEquals("Papier, schwarz-weiß", mdList.get(0)); } { List mdList = (List) doc.getFieldValue(SolrConstants.YEAR);