ImageFormControllerSaveOrUpdateTest

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

@@ -6,11 +6,13 @@
 package scot.carricksoftware.grants.controllers.images.images;
 
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 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;
@@ -19,12 +21,15 @@ import scot.carricksoftware.grants.converters.images.image.ImageConverterImpl;
 import scot.carricksoftware.grants.services.images.image.ImageService;
 import scot.carricksoftware.grants.validators.images.ImageCommandValidator;
 
+import java.io.IOException;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.when;
 
-@SuppressWarnings("CommentedOutCode")
 @ExtendWith(MockitoExtension.class)
 public class ImageFormControllerSaveOrUpdateTest {
 
-    @SuppressWarnings({"unused", "FieldCanBeLocal"})
     private ImageFormControllerImpl imageController;
 
     @Mock
@@ -50,9 +55,10 @@ public class ImageFormControllerSaveOrUpdateTest {
     @Mock
     ConvertToBase64 convertToBase64Mock;
 
-    @SuppressWarnings({"FieldCanBeLocal", "unused"})
-    private ImageCommand imageCommand;
+    @Mock
+    MultipartFile fileMock;
 
+    private ImageCommand imageCommand;
 
     @BeforeEach
     public void setUp() {
@@ -64,20 +70,20 @@ public class ImageFormControllerSaveOrUpdateTest {
         imageCommand = new ImageCommandImpl();
     }
 
-//    @Test
-//    public void saveOrUpdateNoErrorsTest() {
-//        Long id = 4L;
-//        imageCommand.setId(id);
-//        when(imageServiceMock.saveImageCommand(any(ImageCommand.class))).thenReturn(imageCommand);
-//        assertEquals("redirect:/image/4/show", imageController.saveOrUpdate(imageCommand, bindingResultMock, modelMock));
-//    }
-
-//    @Test
-//    public void saveOrUpdateErrorsTest() {
-//        Long id = 4L;
-//        imageCommand.setId(id);
-//        when(bindingResultMock.hasErrors()).thenReturn(true);
-//        assertEquals("images/image/form", imageController.saveOrUpdate(imageCommand, bindingResultMock, modelMock));
-//    }
+    @Test
+    public void saveOrUpdateReturnNoErrorsTest() throws IOException {
+        Long id = 4L;
+        imageCommand.setId(id);
+        when(imageServiceMock.saveImageCommand(any(ImageCommand.class))).thenReturn(imageCommand);
+        assertEquals("redirect:/image/4/show", imageController.saveOrUpdate(imageCommand, fileMock,bindingResultMock, modelMock));
+    }
+
+    @Test
+    public void saveOrUpdateReturnErrorsTest() throws IOException {
+        Long id = 4L;
+        imageCommand.setId(id);
+        when(bindingResultMock.hasErrors()).thenReturn(true);
+        assertEquals("images/image/form", imageController.saveOrUpdate(imageCommand, fileMock, bindingResultMock, modelMock));
+    }
 
 }