Add appendixImage Bootstrap test

src/main/java/scot/carricksoftware/grants/bootstrap/DataLoadImages.java

@@ -14,7 +14,6 @@ import scot.carricksoftware.grants.services.images.appendiximage.AppendixImageSe
 import scot.carricksoftware.grants.services.images.image.ImageService;
 import scot.carricksoftware.grants.services.images.personimage.PersonImageService;
 import scot.carricksoftware.grants.services.images.placeimage.PlaceImageService;
-import scot.carricksoftware.grants.services.people.PersonService;
 import scot.carricksoftware.grants.services.places.places.PlaceService;
 
 @Component
@@ -29,7 +28,6 @@ public class DataLoadImages {
     private final PersonImageService personImageService;
     private final PlaceImageService placeImageService;
     private final AppendixImageService appendixImageService;
-    private final PersonService personService;
     private final PlaceService placeService;
 
 
@@ -38,13 +36,11 @@ public class DataLoadImages {
                           PersonImageService personImageService,
                           PlaceImageService placeImageService,
                           AppendixImageService appendixImageService,
-                          PersonService personService,
                           PlaceService placeService) {
         this.imageService = imageService;
         this.personImageService = personImageService;
         this.placeImageService = placeImageService;
         this.appendixImageService = appendixImageService;
-        this.personService = personService;
         this.placeService = placeService;
     }
 
@@ -67,15 +63,15 @@ public class DataLoadImages {
 
     private void loadPersonImage() {
         logger.debug("DataLoadCensus::loadPersonImage");
-        PersonImageCommand imageCommand = new PersonImageCommandImpl();
-        imageCommand.setPerson(personService.findById(1L));
+        PersonImageCommand command = new PersonImageCommandImpl();
+        command.setImage(imageService.findById(1L));
 
-
-        personImageService.savePersonImageCommand(imageCommand);
+        personImageService.savePersonImageCommand(command);
     }
 
     private void loadPlaceImage() {
         logger.debug("DataLoadCensus::loadPlaceImage");
+
         PlaceImageCommand imageCommand = new PlaceImageCommandImpl();
         imageCommand.setPlace(placeService.findById(1L));
 

src/test/java/scot/carricksoftware/grants/bootstrap/DataLoadImagesImageAppendixTest.java

@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) Andrew Grant of Carrick Software 28/03/2025, 16:14. All rights reserved.
+ *
+ */
+
+package scot.carricksoftware.grants.bootstrap;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import scot.carricksoftware.grants.commands.images.AppendixImageCommand;
+import scot.carricksoftware.grants.domains.images.Image;
+import scot.carricksoftware.grants.services.images.appendiximage.AppendixImageService;
+import scot.carricksoftware.grants.services.images.image.ImageService;
+import scot.carricksoftware.grants.services.images.personimage.PersonImageService;
+import scot.carricksoftware.grants.services.images.placeimage.PlaceImageService;
+import scot.carricksoftware.grants.services.places.places.PlaceService;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
+class DataLoadImagesImageAppendixTest {
+
+    private DataLoadImages dataLoadImages;
+
+    @Mock
+    private ImageService imageServiceMock;
+
+    @Mock
+    private PersonImageService personImageServiceMock;
+
+    @Mock
+    private PlaceImageService placeImageServiceMock;
+
+    @Mock
+    private AppendixImageService appendixImageServiceMock;
+
+    @Mock
+    private PlaceService placeServiceMock;
+
+
+    @BeforeEach
+    void setUp() {
+        dataLoadImages = new DataLoadImages(imageServiceMock,
+                personImageServiceMock,
+                placeImageServiceMock,
+                appendixImageServiceMock,
+                placeServiceMock);
+    }
+
+
+    @Test
+    public void anAppendixIsCreatedTest() {
+        ArgumentCaptor<AppendixImageCommand> captor = ArgumentCaptor.forClass(AppendixImageCommand.class);
+        Image image = new Image();
+
+        when(imageServiceMock.findById(1L)).thenReturn(image);
+        dataLoadImages.load();
+
+        verify(appendixImageServiceMock).saveAppendixImageCommand(captor.capture());
+        assertEquals(image, captor.getValue().getImage());
+    }
+
+
+}

src/test/java/scot/carricksoftware/grants/bootstrap/DataLoadImagesTest.java → src/test/java/scot/carricksoftware/grants/bootstrap/DataLoadImagesImagePeopleAndPlacesTest.java

@@ -11,26 +11,23 @@ import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
-import scot.carricksoftware.grants.commands.images.ImageCommand;
 import scot.carricksoftware.grants.commands.images.PersonImageCommand;
 import scot.carricksoftware.grants.commands.images.PlaceImageCommand;
-import scot.carricksoftware.grants.domains.people.Person;
+import scot.carricksoftware.grants.domains.images.Image;
 import scot.carricksoftware.grants.domains.places.Place;
 import scot.carricksoftware.grants.services.images.appendiximage.AppendixImageService;
 import scot.carricksoftware.grants.services.images.image.ImageService;
 import scot.carricksoftware.grants.services.images.personimage.PersonImageService;
 import scot.carricksoftware.grants.services.images.placeimage.PlaceImageService;
-import scot.carricksoftware.grants.services.people.PersonService;
 import scot.carricksoftware.grants.services.places.places.PlaceService;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
-import static scot.carricksoftware.grants.GenerateRandomPeopleValues.GetRandomPerson;
 import static scot.carricksoftware.grants.GenerateRandomPlaceValues.GetRandomPlace;
 
 @ExtendWith(MockitoExtension.class)
-class DataLoadImagesTest {
+class DataLoadImagesImagePeopleAndPlacesTest {
 
     private DataLoadImages dataLoadImages;
 
@@ -49,8 +46,6 @@ class DataLoadImagesTest {
     @Mock
     private PlaceService placeServiceMock;
 
-    @Mock
-    private PersonService personServiceMock;
 
     @BeforeEach
     void setUp() {
@@ -58,29 +53,20 @@ class DataLoadImagesTest {
                 personImageServiceMock,
                 placeImageServiceMock,
                 appendixImageServiceMock,
-                personServiceMock,
                 placeServiceMock);
     }
 
-    @Test
-    public void anImageIsCreatedTest() {
-        ArgumentCaptor<ImageCommand> captor = ArgumentCaptor.forClass(ImageCommand.class);
-        dataLoadImages.load();
-        verify(imageServiceMock).saveImageCommand(captor.capture());
-        assertEquals("Dalkeith", captor.getValue().getName());
-        assertEquals("Midlothian", captor.getValue().getFileName());
-    }
 
     @Test
     public void aPersonImageIsCreatedTest() {
         ArgumentCaptor<PersonImageCommand> captor = ArgumentCaptor.forClass(PersonImageCommand.class);
-        Person person = GetRandomPerson();
+        Image image = new Image();
 
-        when(personServiceMock.findById(1L)).thenReturn(person);
+        when(imageServiceMock.findById(1L)).thenReturn(image);
         dataLoadImages.load();
 
         verify(personImageServiceMock).savePersonImageCommand(captor.capture());
-        assertEquals(person, captor.getValue().getPerson());
+        assertEquals(image, captor.getValue().getImage());
     }
 
     @Test

src/test/java/scot/carricksoftware/grants/bootstrap/DataLoadImagesImageTest.java

@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) Andrew Grant of Carrick Software 28/03/2025, 16:14. All rights reserved.
+ *
+ */
+
+package scot.carricksoftware.grants.bootstrap;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import scot.carricksoftware.grants.commands.images.ImageCommand;
+import scot.carricksoftware.grants.services.images.appendiximage.AppendixImageService;
+import scot.carricksoftware.grants.services.images.image.ImageService;
+import scot.carricksoftware.grants.services.images.personimage.PersonImageService;
+import scot.carricksoftware.grants.services.images.placeimage.PlaceImageService;
+import scot.carricksoftware.grants.services.places.places.PlaceService;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.verify;
+
+@ExtendWith(MockitoExtension.class)
+class DataLoadImagesImageTest {
+
+    private DataLoadImages dataLoadImages;
+
+    @Mock
+    private ImageService imageServiceMock;
+
+    @Mock
+    private PersonImageService personImageServiceMock;
+
+    @Mock
+    private PlaceImageService placeImageServiceMock;
+
+    @Mock
+    private AppendixImageService appendixImageServiceMock;
+
+    @Mock
+    private PlaceService placeServiceMock;
+
+    @BeforeEach
+    void setUp() {
+        dataLoadImages = new DataLoadImages(imageServiceMock,
+                personImageServiceMock,
+                placeImageServiceMock,
+                appendixImageServiceMock,
+                placeServiceMock);
+    }
+
+    @Test
+    public void anImageIsCreatedTest() {
+        ArgumentCaptor<ImageCommand> captor = ArgumentCaptor.forClass(ImageCommand.class);
+        dataLoadImages.load();
+        verify(imageServiceMock).saveImageCommand(captor.capture());
+        assertEquals("Dalkeith", captor.getValue().getName());
+        assertEquals("Midlothian", captor.getValue().getFileName());
+    }
+
+
+}