Fix master build (#599)

* Fixing mutation tests * Fixing sonar issues
hmcts · Dec 4, 2024 · 327c334 · 327c334
1 parent dc77383
commit 327c334
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 4 deletions.
diff --git a/src/test/java/uk/gov/hmcts/reform/cdapi/helper/CrdTestSupport.java b/src/test/java/uk/gov/hmcts/reform/cdapi/helper/CrdTestSupport.java
@@ -33,8 +33,7 @@ public static ListOfValueDto createListOfCategoriesDtoMock(String categoryId, St
     }
 
     public static ListOfValueDto createListOfCategoriesDtoWithExternalReferenceMock(String categoryId, String serviceId,
-                                                               String parentCategory, String parentKey, String key,
-                                                               Long lovOrder) {
+                                                               String parentCategory, String parentKey, String key) {
         CategoryKey categoryKey = new CategoryKey();
         categoryKey.setCategoryKey(categoryId);
         categoryKey.setKey(key);
@@ -45,7 +44,7 @@ public static ListOfValueDto createListOfCategoriesDtoWithExternalReferenceMock(
         listOfValueDtoMock.setParentCategory(parentCategory);
         listOfValueDtoMock.setParentKey(parentKey);
         listOfValueDtoMock.setValueEn("Judicial office holder");
-        listOfValueDtoMock.setLovOrder(lovOrder);
+        listOfValueDtoMock.setLovOrder(null);
         listOfValueDtoMock.setExternalReferenceType("74");
         listOfValueDtoMock.setExternalReference("JudicialRole");
         return listOfValueDtoMock;

diff --git a/src/test/java/uk/gov/hmcts/reform/cdapi/service/impl/CrdServiceImplTest.java b/src/test/java/uk/gov/hmcts/reform/cdapi/service/impl/CrdServiceImplTest.java
@@ -67,10 +67,35 @@ void retrieveCategoriesByCategoryId() {
         assertNull(actualCategory.getChildNodes());
     }
 
+    @Test
+    void retrieveCategoriesByAllExternalReference() {
+        List<ListOfValueDto> listOfValueDtos = new ArrayList<>();
+        listOfValueDtos.add(CrdTestSupport.createListOfCategoriesDtoWithExternalReferenceMock("panelCategoryMember",
+                                                                         "BBA3","panelCategory",
+                                                                         "BBA3-panelCategory-001",
+                                                                         "BBA3-panelCategory-001-74"));
+        doReturn(listOfValueDtos).when(listOfValuesRepository)
+            .findAll(ArgumentMatchers.<Specification<ListOfValueDto>>any());
+
+        CategoryRequest request = CategoryRequest.builder()
+            .categoryId("panelCategoryMember")
+            .externalReference("JudicialRole")
+            .externalReferenceType("74")
+            .build();
+
+        List<Category> result = crdServiceImpl.retrieveListOfValuesByCategory(request);
+
+        assertNotNull(result);
+        assertEquals(listOfValueDtos.get(0).getCategoryKey().getKey(), result.get(0).getKey());
+        assertEquals(listOfValueDtos.get(0).getCategoryKey().getCategoryKey(), result.get(0).getCategoryKey());
+        assertEquals(listOfValueDtos.get(0).getExternalReference(), result.get(0).getExternalReference());
+        assertEquals(listOfValueDtos.get(0).getExternalReferenceType(), result.get(0).getExternalReferenceType());
+    }
+
     @Test
     void retrieveCategoriesWithExternalReferenceByCategoryId() {
         List<ListOfValueDto> listOfValueDtos = new ArrayList<>();
-        listOfValueDtos.add(CrdTestSupport.createListOfCategoriesDtoMock("panelCategoryMember",
+        listOfValueDtos.add(CrdTestSupport.createListOfCategoriesDtoWithExternalReferenceMock("panelCategoryMember",
                                                                          "BBA3","panelCategory",
                                                                          "BBA3-panelCategory-001",
                                                                          "BBA3-panelCategory-001-74"));
@@ -124,6 +149,7 @@ void retrieveCategoriesByAllParams() {
 
 
 
+
     @NotNull
     private List<ListOfValueDto> buildListOfValuesDtos() {
         List<ListOfValueDto> listOfValueDtos = new ArrayList<>();