Images: display image on Form Page (3)

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

@@ -13,7 +13,6 @@ import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.ui.Model;
-import scot.carricksoftware.grants.commands.images.ImageCommand;
 import scot.carricksoftware.grants.constants.ImageAttributeConstants;
 import scot.carricksoftware.grants.converters.images.image.ImageCommandConverterImpl;
 import scot.carricksoftware.grants.converters.images.image.ImageConverterImpl;
@@ -25,7 +24,6 @@ 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.GenerateRandomImageValues.GetRandomImage;
-import static scot.carricksoftware.grants.GenerateRandomImageValues.GetRandomImageCommand;
 import static scot.carricksoftware.grants.GenerateRandomNumberValues.GetRandomLong;
 
 
@@ -79,16 +77,6 @@ public class ImageFormControllerTest {
         verify(modelMock).addAttribute(ImageAttributeConstants.IMAGE_COMMAND, image);
     }
 
-    @Test
-    public void showByIdTest() {
-        Long id = GetRandomLong();
-        Image image = GetRandomImage();
-        ImageCommand imageCommand = GetRandomImageCommand();
 
-        when(imageServiceMock.findById(id)).thenReturn(image);
-        when(imageConverterMock.convert(image)).thenReturn(imageCommand);
-        assertEquals("images/image/form", imageController.showById(id + "", modelMock));
-        verify(modelMock).addAttribute(ImageAttributeConstants.IMAGE_COMMAND, imageCommand);
-    }
 
 }

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

@@ -12,21 +12,17 @@ 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 scot.carricksoftware.grants.commands.images.ImageCommand;
 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.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.when;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 
 @ExtendWith(MockitoExtension.class)
 public class ImageFormControllerValidationTest {
 
-    @SuppressWarnings({"unused", "FieldCanBeLocal"})
     private ImageFormControllerImpl imageController;
 
     @Mock
@@ -39,13 +35,6 @@ public class ImageFormControllerValidationTest {
     private ImageConverterImpl imageConverterMock;
 
 
-    @Mock
-    ImageCommand imageCommandMock;
-
-    @SuppressWarnings("unused")
-    @Mock
-    BindingResult bindingResultMock;
-
     @Mock
     ImageCommandValidator imageCommandValidatorMock;
 
@@ -53,7 +42,6 @@ public class ImageFormControllerValidationTest {
     @Mock
     Model modelMock;
 
-
     @BeforeEach
     public void setUp() {
         imageController = new ImageFormControllerImpl(imageServiceMock,
@@ -62,13 +50,9 @@ public class ImageFormControllerValidationTest {
                 imageCommandValidatorMock);
     }
 
-
-    @SuppressWarnings("CommentedOutCode")
     @Test
-    public void saveOrUpdateValidationTest() {
-        when(imageServiceMock.saveImageCommand(any())).thenReturn(imageCommandMock);
-    //    imageController.saveOrUpdate(imageCommandMock, bindingResultMock, modelMock);
-    //    verify(imageCommandValidatorMock).validate(imageCommandMock, bindingResultMock);
+    public void constructorTest() {
+        assertNotNull(imageController);
     }