Census date changed to an enum

src/main/java/scot/carricksoftware/grants/domains/census/Census.java

@@ -48,7 +48,7 @@ public class Census extends BaseEntity {
 
     @Override
     public String toString() {
-        return place.toString() + ", " + date.toString();
+        return place.toString() + ", " + date.label;
     }
 
     public Place getPlace() {

src/test/java/scot/carricksoftware/grants/GenerateCensusEntryRandomEnums.java

@@ -22,7 +22,7 @@ public class GenerateCensusEntryRandomEnums {
         CensusEntryCondition[] conditions = CensusEntryCondition.values();
 
         Random random = new Random();
-        int randomInt = random.nextInt(0, conditions.length );
+        int randomInt = random.nextInt(0, conditions.length);
         return conditions[randomInt];
     }
 
@@ -30,7 +30,7 @@ public class GenerateCensusEntryRandomEnums {
         CensusEntryGaelic[] gaelicArray = CensusEntryGaelic.values();
 
         Random random = new Random();
-        int randomInt = random.nextInt(0, gaelicArray.length );
+        int randomInt = random.nextInt(0, gaelicArray.length);
         return gaelicArray[randomInt];
     }
 
@@ -38,7 +38,7 @@ public class GenerateCensusEntryRandomEnums {
         CensusEntryRelationship[] relationships = CensusEntryRelationship.values();
 
         Random random = new Random();
-        int randomInt = random.nextInt(0, relationships.length );
+        int randomInt = random.nextInt(0, relationships.length);
         return relationships[randomInt];
     }
 
@@ -46,7 +46,7 @@ public class GenerateCensusEntryRandomEnums {
         CensusEntryWorker[] workers = CensusEntryWorker.values();
 
         Random random = new Random();
-        int randomInt = random.nextInt(0, workers.length );
+        int randomInt = random.nextInt(0, workers.length);
         return workers[randomInt];
     }
 }

src/test/java/scot/carricksoftware/grants/GenerateCensusRandomEnums.java

@@ -3,7 +3,9 @@
  *
  */
 
-package scot.carricksoftware.grants;import org.springframework.stereotype.Component;
+package scot.carricksoftware.grants;
+
+import org.springframework.stereotype.Component;
 import scot.carricksoftware.grants.enums.census.CensusBoundaryType;
 import scot.carricksoftware.grants.enums.census.CensusDate;
 
@@ -18,7 +20,7 @@ public class GenerateCensusRandomEnums {
         CensusBoundaryType[] boundaryTypes = CensusBoundaryType.values();
 
         Random random = new Random();
-        int randomInt = random.nextInt(0, boundaryTypes.length );
+        int randomInt = random.nextInt(0, boundaryTypes.length);
         return boundaryTypes[randomInt];
     }
 
@@ -27,7 +29,7 @@ public class GenerateCensusRandomEnums {
         CensusDate[] dates = CensusDate.values();
 
         Random random = new Random();
-        int randomInt = random.nextInt(0, dates.length );
+        int randomInt = random.nextInt(0, dates.length);
         return dates[randomInt];
     }
 

src/test/java/scot/carricksoftware/grants/GenerateRandomTextValues.java

@@ -21,9 +21,9 @@ import static scot.carricksoftware.grants.GenerateRandomPlaceValues.GetRandomPla
 public class GenerateRandomTextValues {
 
     public static DocumentText GetRandomDocumentText() {
-       DocumentText documentText = new DocumentText();
-       documentText.setId(GetRandomLong());
-       return documentText;
+        DocumentText documentText = new DocumentText();
+        documentText.setId(GetRandomLong());
+        return documentText;
     }
 
     @SuppressWarnings("unused")

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

@@ -44,5 +44,4 @@ class DataLoaderTest {
     }
 
 
-
 }

src/test/java/scot/carricksoftware/grants/commands/census/CensusCommandEnumTest.java

@@ -36,5 +36,4 @@ class CensusCommandEnumTest {
     }
 
 
-
 }

src/test/java/scot/carricksoftware/grants/commands/census/CensusEntryCommandEnumTest.java

@@ -36,8 +36,8 @@ class CensusEntryCommandEnumTest {
         CensusEntryRelationship relationship = GetRandomCensusEntryRelationship();
         command.setRelationship(relationship);
         assertEquals(relationship, command.getRelationship());
-    } 
-    
+    }
+
     @Test
     void getConditionTest() {
         assertNull(command.getCondition());
@@ -73,5 +73,5 @@ class CensusEntryCommandEnumTest {
         command.setWorker(worker);
         assertEquals(worker, command.getWorker());
     }
-    
+
 }

src/test/java/scot/carricksoftware/grants/commands/images/PlaceImageCommandTest.java

@@ -41,7 +41,7 @@ class PlaceImageCommandTest {
     }
 
     @Test
-    void  setPlaceTest() {
+    void setPlaceTest() {
         Place place = GetRandomPlace();
         imageCommand.setPlace(place);
         assertEquals(place, imageCommand.getPlace());

src/test/java/scot/carricksoftware/grants/converters/images/image/ImageCommandConverterTest.java

@@ -31,7 +31,6 @@ class ImageCommandConverterTest {
         source.setId(Id);
 
 
-
         Image target = converter.convert(source);
 
         assertNotNull(target);

src/test/java/scot/carricksoftware/grants/converters/images/personimage/PersonImageCommandConverterTest.java

@@ -36,7 +36,6 @@ class PersonImageCommandConverterTest {
         source.setId(Id);
 
 
-
         PersonImage target = converter.convert(source);
 
         assertNotNull(target);

src/test/java/scot/carricksoftware/grants/converters/images/placeImage/PlaceImageCommandConverterTest.java

@@ -38,7 +38,6 @@ class PlaceImageCommandConverterTest {
         source.setPlace(place);
 
 
-
         PlaceImage target = converter.convert(source);
 
         assertNotNull(target);

src/test/java/scot/carricksoftware/grants/domains/census/CensusTest.java

@@ -10,11 +10,13 @@ import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.junit.jupiter.MockitoExtension;
 import scot.carricksoftware.grants.domains.places.Place;
+import scot.carricksoftware.grants.enums.census.CensusDate;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.*;
+import static scot.carricksoftware.grants.GenerateCensusRandomEnums.GetRandomCensusDate;
 import static scot.carricksoftware.grants.GenerateRandomCensusValues.GetRandomCensusEntry;
 import static scot.carricksoftware.grants.GenerateRandomNumberValues.GetRandomLong;
 import static scot.carricksoftware.grants.GenerateRandomPlaceValues.GetRandomPlace;
@@ -67,5 +69,12 @@ public class CensusTest {
         assertEquals(place, census.getPlace());
     }
 
+    @Test
+    public void toStringTest() {
+        CensusDate date = GetRandomCensusDate();
+        census.setDate(date);
+        assertEquals(date, census.getDate());
+    }
+
 
 }

src/test/java/scot/carricksoftware/grants/domains/images/ImageTest.java

@@ -12,7 +12,7 @@ import static org.junit.jupiter.api.Assertions.*;
 import static scot.carricksoftware.grants.GenerateRandomNumberValues.GetRandomLong;
 
 class ImageTest {
-private Image image;
+    private Image image;
 
     @BeforeEach
     void setUp() {

src/test/java/scot/carricksoftware/grants/domains/images/PersonImageTest.java

@@ -14,7 +14,7 @@ import static scot.carricksoftware.grants.GenerateRandomNumberValues.GetRandomLo
 
 class PersonImageTest {
 
-private PersonImage image;
+    private PersonImage image;
 
     @BeforeEach
     void setUp() {

src/test/java/scot/carricksoftware/grants/domains/images/PlaceImageTest.java

@@ -16,7 +16,7 @@ import static scot.carricksoftware.grants.GenerateRandomPlaceValues.GetRandomPla
 
 class PlaceImageTest {
 
-private PlaceImage image;
+    private PlaceImage image;
 
     @BeforeEach
     void setUp() {
@@ -41,7 +41,7 @@ private PlaceImage image;
     }
 
     @Test
-    public  void setPlaceTest() {
+    public void setPlaceTest() {
         Place place = GetRandomPlace();
         image.setPlace(place);
         assertEquals(place, image.getPlace());

src/test/java/scot/carricksoftware/grants/services/images/image/ImageServiceTest.java

@@ -83,6 +83,4 @@ public class ImageServiceTest {
     }
 
 
-
-
 }

src/test/java/scot/carricksoftware/grants/services/images/personimage/PersonImageServiceTest.java

@@ -83,6 +83,4 @@ public class PersonImageServiceTest {
     }
 
 
-
-
 }

src/test/java/scot/carricksoftware/grants/services/images/placeimage/PlaceImageServiceTest.java

@@ -83,6 +83,4 @@ public class PlaceImageServiceTest {
     }
 
 
-
-
 }

src/test/java/scot/carricksoftware/grants/services/text/documenttext/DocumentTextServiceTest.java

@@ -81,6 +81,6 @@ public class DocumentTextServiceTest {
         when(documentTextRepositoryMock.findAll(any(Pageable.class))).thenReturn(pageMock);
         assertEquals(result, documentTextService.getPagedDocumentTexts(0));
     }
-    
+
 
 }

src/test/java/scot/carricksoftware/grants/services/text/persontext/PersonTextServiceTest.java

@@ -81,6 +81,6 @@ public class PersonTextServiceTest {
         when(personTextRepositoryMock.findAll(any(Pageable.class))).thenReturn(pageMock);
         assertEquals(result, personTextService.getPagedPersonTexts(0));
     }
-    
+
 
 }

src/test/java/scot/carricksoftware/grants/services/text/placetext/PlaceTextServiceTest.java

@@ -81,6 +81,6 @@ public class PlaceTextServiceTest {
         when(placeTextRepositoryMock.findAll(any(Pageable.class))).thenReturn(pageMock);
         assertEquals(result, placeTextService.getPagedPlaceTexts(0));
     }
-    
+
 
 }