CensusTest (2)

src/test/java/scot/carricksoftware/grantswriter/GenerateCertificateRandomValues.java

@@ -6,11 +6,9 @@
 package scot.carricksoftware.grantswriter;
 
 
-
 import java.util.Random;
 
 
-
 public class GenerateCertificateRandomValues {
 
     private static final Random rand = new Random();
@@ -25,6 +23,4 @@ public class GenerateCertificateRandomValues {
     }
 
 
-
-
 }

src/test/java/scot/carricksoftware/grantswriter/GenerateRandomPlaceValues.java

@@ -39,9 +39,4 @@ public class GenerateRandomPlaceValues {
     }
 
 
-
-
-
-
-
 }

src/test/java/scot/carricksoftware/grantswriter/data/DMYCompareTest.java

@@ -49,5 +49,4 @@ class DMYCompareTest {
     }
 
 
-
 }

src/test/java/scot/carricksoftware/grantswriter/data/DMYParseNumericDayTest.java

@@ -61,5 +61,4 @@ class DMYParseNumericDayTest {
     }
 
 
-
 }

src/test/java/scot/carricksoftware/grantswriter/data/DMYParseNumericMonthTest.java

@@ -61,5 +61,4 @@ class DMYParseNumericMonthTest {
     }
 
 
-
 }

src/test/java/scot/carricksoftware/grantswriter/data/DMYParseNumericYearTest.java

@@ -61,5 +61,4 @@ class DMYParseNumericYearTest {
     }
 
 
-
 }

src/test/java/scot/carricksoftware/grantswriter/data/TimeLineDataAddTest.java

@@ -92,8 +92,8 @@ class TimeLineDataAddTest {
         Set<DMY> keys = timeLine.keySet();
         for (DMY key : keys) {
             List<String> values = timeLine.get(key);
-            assert(values.contains(requiredRecorded));
-            assert(values.contains(requiredOccupation));
+            assert (values.contains(requiredRecorded));
+            assert (values.contains(requiredOccupation));
         }
     }
 }

src/test/java/scot/carricksoftware/grantswriter/data/TimeLineDataSetterAndGetterTest.java

@@ -45,12 +45,12 @@ class TimeLineDataSetterAndGetterTest {
     }
 
     @Test
-    void getRefsTest(){
+    void getRefsTest() {
         assertEquals(0, timeLineData.getRefs().size());
     }
 
     @Test
-    void setRefsTest(){
+    void setRefsTest() {
         SortedSet<String> refs = new TreeSet<>();
         refs.add(GetRandomString());
         timeLineData.setRefs(refs);
@@ -58,18 +58,18 @@ class TimeLineDataSetterAndGetterTest {
     }
 
     @Test
-    void getTimeLineTest(){
+    void getTimeLineTest() {
         assertEquals(0, timeLineData.getTimeLine().size());
     }
 
     @Test
-    void setTimeLineTest(){
-       TreeMap<DMY, List<String>> timeLine = new TreeMap<>();
-       List<String> list = new ArrayList<>();
-       list.add(GetRandomString());
-       timeLine.put(dmyMock, list);
-       timeLineData.setTimeline(timeLine);
-       assertEquals(timeLine, timeLineData.getTimeLine());
+    void setTimeLineTest() {
+        TreeMap<DMY, List<String>> timeLine = new TreeMap<>();
+        List<String> list = new ArrayList<>();
+        list.add(GetRandomString());
+        timeLine.put(dmyMock, list);
+        timeLineData.setTimeline(timeLine);
+        assertEquals(timeLine, timeLineData.getTimeLine());
     }
 
     @Test

src/test/java/scot/carricksoftware/grantswriter/data/TimeLineDateComparatorTest.java

@@ -26,7 +26,6 @@ class TimeLineDateComparatorTest {
     String sameDay;
 
 
-
     @BeforeEach
     void setUp() {
         timeLineDateComparator = new TimeLineDateComparator();
@@ -41,7 +40,7 @@ class TimeLineDateComparatorTest {
     @Test
     void timeLineNextYearTest() {
         assertEquals(1, timeLineDateComparator.compare(nextYear, today));
-        assertEquals(-1, timeLineDateComparator.compare( today, nextYear));
+        assertEquals(-1, timeLineDateComparator.compare(today, nextYear));
     }
 
     @Test

src/test/java/scot/carricksoftware/grantswriter/domains/census/CensusEntryPartOneTest.java

@@ -71,6 +71,4 @@ class CensusEntryPartOneTest {
     }
 
 
-
-
 }

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

@@ -18,6 +18,7 @@ import static org.mockito.Mockito.when;
 import static scot.carricksoftware.grantswriter.GenerateCensusRandomEnums.GetRandomCensusDate;
 import static scot.carricksoftware.grantswriter.GenerateCertificateRandomValues.GetRandomString;
 import static scot.carricksoftware.grantswriter.GenerateRandomNumberValues.GetRandomLong;
+import static scot.carricksoftware.grantswriter.GenerateRandomPlaceValues.GetRandomPlace;
 
 
 @ExtendWith(MockitoExtension.class)
@@ -33,7 +34,6 @@ public class CensusTest {
     @Mock
     private Place placeMock;
 
-
     @Test
     public void getIdTest() {
         assertNull(census.getId());
@@ -68,4 +68,16 @@ public class CensusTest {
         assertEquals(placeString + ", " + censusDate.label, census.toString());
     }
 
+    @Test
+    public void getPlaceTest() {
+        assertNull(census.getPlace());
+    }
+
+    @Test
+    public void setPlaceTest() {
+        Place place = GetRandomPlace();
+        census.setPlace(place);
+        assertEquals(place, census.getPlace());
+    }
+
 }

src/test/java/scot/carricksoftware/grantswriter/domains/places/region/RegionTest.java

@@ -50,7 +50,4 @@ public class RegionTest {
     }
 
 
-
-
-
 }

src/test/java/scot/carricksoftware/grantswriter/files/WriterFilesTest.java

@@ -69,10 +69,4 @@ class WriterFilesTest {
     }
 
 
-
-
-
-
-
-
 }

src/test/java/scot/carricksoftware/grantswriter/services/people/PersonServiceTest.java

@@ -45,5 +45,4 @@ class PersonServiceTest {
     }
 
 
-
 }

src/test/java/scot/carricksoftware/grantswriter/writer/FileWriterTest.java

@@ -48,15 +48,15 @@ class FileWriterTest {
 
     @Test
     public void writeLineTest() throws Exception {
-       String tempFileName = getTemporaryFileName();
-       deleteTempFile(tempFileName);
-       String line = GetRandomString();
+        String tempFileName = getTemporaryFileName();
+        deleteTempFile(tempFileName);
+        String line = GetRandomString();
 
-       writer.init(tempFileName);
-       writer.writeLine(line);
-       writer.close();
+        writer.init(tempFileName);
+        writer.writeLine(line);
+        writer.close();
 
-       List<String> contents = getTempFileContents(tempFileName);
+        List<String> contents = getTempFileContents(tempFileName);
         assertEquals(line, contents.get(0));
     }
 

src/test/java/scot/carricksoftware/grantswriter/writer/TexWriterTest.java

@@ -43,7 +43,7 @@ class TexWriterTest {
 
     @Test
     void writeTest() throws Exception {
-        InOrder inorder = inOrder(fileWriterMock, docStartMock, docEndMock, partsWriterMock,fileWriterMock);
+        InOrder inorder = inOrder(fileWriterMock, docStartMock, docEndMock, partsWriterMock, fileWriterMock);
         texWriter.write(GetRandomString());
 
         inorder.verify(fileWriterMock).init(anyString());

src/test/java/scot/carricksoftware/grantswriter/writer/latex/LatexDocumentEndTest.java

@@ -21,7 +21,7 @@ class LatexDocumentEndTest {
     private LatexDocumentEnd documentEnd;
 
     @Mock
-    private FileWriter fileWriterMock ;
+    private FileWriter fileWriterMock;
 
     @BeforeEach
     void setUp() {

src/test/java/scot/carricksoftware/grantswriter/writer/latex/LatexDocumentStartTest.java

@@ -39,7 +39,7 @@ class LatexDocumentStartTest {
 
     @Test
     public void writeTest() {
-        InOrder inorder = inOrder(fileWriterMock, latexPackageDeclarationMock,fileWriterMock);
+        InOrder inorder = inOrder(fileWriterMock, latexPackageDeclarationMock, fileWriterMock);
         documentStart.write();
 
         //noinspection SpellCheckingInspection

src/test/java/scot/carricksoftware/grantswriter/writer/latex/LatexLongTabLeEndTest.java

@@ -14,7 +14,7 @@ import scot.carricksoftware.grantswriter.writer.FileWriter;
 
 import static org.mockito.Mockito.verify;
 
-@ExtendWith(SpringExtension .class)
+@ExtendWith(SpringExtension.class)
 class LatexLongTabLeEndTest {
 
     private LatexLongTabLeEnd latexLongTabLeEnd;

src/test/java/scot/carricksoftware/grantswriter/writer/latex/LatexPackageDeclarationTest.java

@@ -21,7 +21,7 @@ class LatexPackageDeclarationTest {
     private LatexPackageDeclaration latexPackageDeclaration;
 
     @Mock
-    private  FileWriter fileWriterMock;
+    private FileWriter fileWriterMock;
 
     @BeforeEach
     void setUp() {

src/test/java/scot/carricksoftware/grantswriter/writer/latex/LatexSectionHeaderTest.java

@@ -18,10 +18,10 @@ import static scot.carricksoftware.grantswriter.GenerateCertificateRandomValues.
 @ExtendWith(MockitoExtension.class)
 class LatexSectionHeaderTest {
 
-   private LatexSectionHeader header;
+    private LatexSectionHeader header;
 
-   @Mock
-   private FileWriter fileWriterMock;
+    @Mock
+    private FileWriter fileWriterMock;
 
     @BeforeEach
     void setUp() {

src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/PartsWriterTest.java

@@ -30,12 +30,12 @@ class PartsWriterTest {
     }
 
     @Test
-    void constructorTest(){
+    void constructorTest() {
         assertNotNull(partsWriter);
     }
 
     @Test
-    void writeTest(){
+    void writeTest() {
         partsWriter.write();
         verify(peoplePartWriterMock).write();
     }

src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/PersonSubSectionTimeLineWriterTest.java

@@ -46,6 +46,6 @@ class PersonSubSectionTimeLineWriterTest {
 
     @Test
     void writeTest() {
-       assertNotNull(writer);
+        assertNotNull(writer);
     }
 }