RegionFormControllerCleansingTest

src/test/java/scot/carricksoftware/grants/controllers/places/places/PlaceFormControllerValidationAndCapitalisationTest.java

@@ -29,7 +29,7 @@ import static org.mockito.Mockito.when;
 @ExtendWith(MockitoExtension.class)
 public class PlaceFormControllerValidationAndCapitalisationTest {
 
-    @SuppressWarnings({"unused", "FieldCanBeLocal"})
+    @SuppressWarnings({"unused"})
     private PlaceFormControllerImpl placeController;
 
     @Mock

src/test/java/scot/carricksoftware/grants/controllers/places/regions/RegionFormControllerCleansingTest.java

@@ -11,20 +11,25 @@ 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 scot.carricksoftware.grants.capitalisation.places.regions.CapitaliseRegionImpl;
+import scot.carricksoftware.grants.commands.places.regions.RegionCommand;
+import scot.carricksoftware.grants.commands.places.regions.RegionCommandImpl;
 import scot.carricksoftware.grants.converters.places.regions.RegionCommandConverterImpl;
 import scot.carricksoftware.grants.converters.places.regions.RegionConverterImpl;
 import scot.carricksoftware.grants.services.places.countries.CountryService;
 import scot.carricksoftware.grants.services.places.regions.RegionService;
 import scot.carricksoftware.grants.validators.places.RegionCommandValidator;
 
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 
 @ExtendWith(MockitoExtension.class)
 public class RegionFormControllerCleansingTest {
 
-    @SuppressWarnings({"unused", "FieldCanBeLocal"})
+    @SuppressWarnings({"unused"})
     private RegionFormControllerImpl regionController;
 
     @Mock
@@ -33,7 +38,6 @@ public class RegionFormControllerCleansingTest {
     @Mock
     private CountryService countryServiceMock;
 
-
     @Mock
     private RegionCommandConverterImpl regionCommandConverterMock;
 
@@ -46,7 +50,15 @@ public class RegionFormControllerCleansingTest {
 
 
     @Mock
-    RegionCommandValidator regionCommandValidatorMock;
+    private RegionCommandValidator regionCommandValidatorMock;
+
+    @Mock
+    private Model modelMock;
+
+    @Mock
+    private BindingResult bindingResultMock;
+
+    RegionCommand regionCommand;
 
     @BeforeEach
     public void setUp() {
@@ -56,13 +68,20 @@ public class RegionFormControllerCleansingTest {
                 capitaliseRegionMock,
                 regionCommandValidatorMock,
                 countryServiceMock);
+        regionCommand = new RegionCommandImpl();
     }
 
     @Test
-    void dummyTest() {
-       assertTrue(true);
+    public void validationTakesRegionTest() {
+        when(regionServiceMock.saveRegionCommand(regionCommand)).thenReturn(regionCommand);
+        regionController.saveOrUpdate(regionCommand, bindingResultMock, modelMock);
+        verify(regionCommandValidatorMock).validate(regionCommand, bindingResultMock);
     }
 
-
-
+    @Test
+    public void capitalisationTakesRegionTest() {
+        when(regionServiceMock.saveRegionCommand(regionCommand)).thenReturn(regionCommand);
+        regionController.saveOrUpdate(regionCommand, bindingResultMock, modelMock);
+        verify(capitaliseRegionMock).capitalise(regionCommand);
+    }
 }