ImageFormControllerValidationTest

src/test/java/scot/carricksoftware/grants/controllers/images/images/ImageFormControllerSaveOrUpdateTest.java

@@ -86,4 +86,5 @@ public class ImageFormControllerSaveOrUpdateTest {
         assertEquals("images/image/form", imageController.saveOrUpdate(imageCommand, fileMock, bindingResultMock, modelMock));
     }
 
+
 }

src/test/java/scot/carricksoftware/grants/controllers/images/images/ImageFormControllerValidationTest.java

@@ -12,13 +12,21 @@ import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.ui.Model;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.multipart.MultipartFile;
+import scot.carricksoftware.grants.commands.images.ImageCommand;
+import scot.carricksoftware.grants.commands.images.ImageCommandImpl;
 import scot.carricksoftware.grants.converters.images.ConvertToBase64;
 import scot.carricksoftware.grants.converters.images.image.ImageCommandConverterImpl;
 import scot.carricksoftware.grants.converters.images.image.ImageConverterImpl;
 import scot.carricksoftware.grants.services.images.image.ImageService;
 import scot.carricksoftware.grants.validators.images.ImageCommandValidator;
 
-import static org.junit.jupiter.api.Assertions.assertNotNull;
+import java.io.IOException;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 
 @ExtendWith(MockitoExtension.class)
@@ -35,7 +43,6 @@ public class ImageFormControllerValidationTest {
     @Mock
     private ImageConverterImpl imageConverterMock;
 
-
     @Mock
     ImageCommandValidator imageCommandValidatorMock;
 
@@ -46,6 +53,12 @@ public class ImageFormControllerValidationTest {
     @Mock
     ConvertToBase64 convertToBase64Mock;
 
+    @Mock
+    MultipartFile fileMock;
+
+    @Mock
+    BindingResult bindingResultMock;
+
     @BeforeEach
     public void setUp() {
         imageController = new ImageFormControllerImpl(imageServiceMock,
@@ -56,8 +69,12 @@ public class ImageFormControllerValidationTest {
     }
 
     @Test
-    public void constructorTest() {
-        assertNotNull(imageController);
+    public void validatorIsCalledTest() throws IOException {
+        ImageCommand imageCommand = new ImageCommandImpl();
+        when(imageServiceMock.saveImageCommand(any())).thenReturn(imageCommand);
+
+        imageController.saveOrUpdate(imageCommand,fileMock,bindingResultMock,modelMock);
+        verify(imageCommandValidatorMock).validate(imageCommand, bindingResultMock);
     }