From d9df917ce89194c64171b3db74f56424d081daff Mon Sep 17 00:00:00 2001 From: Michael Folz Date: Wed, 15 Jan 2025 07:30:48 +0100 Subject: [PATCH] #382 - Change display and translations structure for criteria and concepts - fix return type in TerminologyEsServiceTest --- .../terminology/es/TerminologyEsServiceTest.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/test/java/de/numcodex/feasibility_gui_backend/terminology/es/TerminologyEsServiceTest.java b/src/test/java/de/numcodex/feasibility_gui_backend/terminology/es/TerminologyEsServiceTest.java index 6d23eef2..98482be4 100644 --- a/src/test/java/de/numcodex/feasibility_gui_backend/terminology/es/TerminologyEsServiceTest.java +++ b/src/test/java/de/numcodex/feasibility_gui_backend/terminology/es/TerminologyEsServiceTest.java @@ -1,6 +1,7 @@ package de.numcodex.feasibility_gui_backend.terminology.es; import co.elastic.clients.elasticsearch._types.aggregations.StringTermsBucket; +import de.numcodex.feasibility_gui_backend.common.api.DisplayEntry; import de.numcodex.feasibility_gui_backend.common.api.TermCode; import de.numcodex.feasibility_gui_backend.terminology.api.EsSearchResultEntry; import de.numcodex.feasibility_gui_backend.terminology.es.model.*; @@ -177,15 +178,15 @@ void testPerformOntologySearchWithRepoAndPaging_throwsOnInvalidPageSize() { @Test void testGetRelationEntryByHash_succeeds() { String id = UUID.randomUUID().toString(); - OntologyItemDocument dummyOntologyItem = createDummyOntologyItem(id); + var dummyOntologyItem = createDummyOntologyItem(id); doReturn(Optional.of(dummyOntologyItem)).when(ontologyItemEsRepository).findById(any(String.class)); - var ontologyItemRelationsDocument = assertDoesNotThrow(() -> terminologyEsService.getRelationEntryByHash(id)); - assertThat(ontologyItemRelationsDocument).isNotNull(); - assertThat(ontologyItemRelationsDocument.relatedTerms()).isEqualTo(dummyOntologyItem.relatedTerms()); - assertThat(ontologyItemRelationsDocument.children()).isEqualTo(dummyOntologyItem.children()); - assertThat(ontologyItemRelationsDocument.parents()).isEqualTo(dummyOntologyItem.parents()); - assertThat(ontologyItemRelationsDocument.display()).isEqualTo(dummyOntologyItem.display()); + var relationEntry = assertDoesNotThrow(() -> terminologyEsService.getRelationEntryByHash(id)); + assertThat(relationEntry).isNotNull(); + assertThat(relationEntry.relatedTerms()).isEqualTo(dummyOntologyItem.relatedTerms()); + assertThat(relationEntry.children()).isEqualTo(dummyOntologyItem.children()); + assertThat(relationEntry.parents()).isEqualTo(dummyOntologyItem.parents()); + assertThat(relationEntry.display()).isEqualTo(DisplayEntry.of(dummyOntologyItem.display())); } @Test