AppendixPartWriterTest (4)

src/test/java/scot/carricksoftware/grantswriter/controllers/FilesControllerTest.java

@@ -24,11 +24,8 @@ class FilesControllerTest {
 
     private FilesController controller;
 
-    @Mock
-    private WriterFiles writerFilesMock;
-
-    @Mock
-    private Model modelMock;
+    @Mock private WriterFiles writerFilesMock;
+    @Mock private Model modelMock;
 
     @BeforeEach
     void setUp() {

src/test/java/scot/carricksoftware/grantswriter/controllers/IndexControllerTest.java

@@ -19,8 +19,7 @@ class IndexControllerTest {
 
     private IndexController controller;
 
-    @Mock
-    private Model modelMock;
+    @Mock private Model modelMock;
 
     @BeforeEach
     void setUp() {

src/test/java/scot/carricksoftware/grantswriter/controllers/StatusControllerTest.java

@@ -22,11 +22,8 @@ class StatusControllerTest {
 
     private StatusController controller;
 
-    @Mock
-    private StatusService statusServiceMock;
-
-    @Mock
-    private Model modelMock;
+    @Mock private StatusService statusServiceMock;
+    @Mock private Model modelMock;
 
     @BeforeEach
     void setUp() {

src/test/java/scot/carricksoftware/grantswriter/controllers/TexControllerTest.java

@@ -26,14 +26,9 @@ class TexControllerTest {
 
     private TexController controller;
 
-    @Mock
-    private WriterFiles writerFilesMock;
-
-    @Mock
-    private TexWriter texWriterMock;
-
-    @Mock
-    private Model modelMock;
+    @Mock private WriterFiles writerFilesMock;
+    @Mock private TexWriter texWriterMock;
+    @Mock private Model modelMock;
 
     @BeforeEach
     void setUp() {

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

@@ -24,11 +24,9 @@ class TimeLineDataAddCensusEntryTest {
 
     private TimeLineData timeLineData;
 
-
     @Mock
     AddCensusEntry addCensusEntryMock;
 
-
     @BeforeEach
     void setUp() {
         timeLineData = new TimeLineDataImpl(addCensusEntryMock);

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

@@ -19,21 +19,15 @@ import java.util.TreeMap;
 import java.util.TreeSet;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static scot.carricksoftware.grantswriter.GenerateCertificateRandomValues.GetRandomString;
 
 @ExtendWith(MockitoExtension.class)
 class TimeLineDataSetterAndGetterTest {
 
-
     private TimeLineData timeLineData;
 
-    @Mock
-    private DMY dmyMock;
-
-
-    @Mock
-    AddCensusEntry addCensusEntryMock;
+    @Mock private DMY dmyMock;
+    @Mock AddCensusEntry addCensusEntryMock;
 
 
     @BeforeEach
@@ -41,11 +35,6 @@ class TimeLineDataSetterAndGetterTest {
         timeLineData = new TimeLineDataImpl(addCensusEntryMock);
     }
 
-    @Test
-    void constructorTest() {
-        assertNotNull(timeLineData);
-    }
-
     @Test
     void getRefsTest() {
         assertEquals(0, timeLineData.getRefs().size());

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

@@ -15,16 +15,11 @@ class TimeLineDateComparatorTest {
 
     private TimeLineDateComparator timeLineDateComparator;
 
-    String today;
-
-    String nextYear;
-
-    String nextMonth;
-
-    String nextDay;
-
-    String sameDay;
-
+    private String today;
+    private String nextYear;
+    private String nextMonth;
+    private String nextDay;
+    private String sameDay;
 
     @BeforeEach
     void setUp() {

src/test/java/scot/carricksoftware/grantswriter/data/helpers/AddCensusEntryTest.java

@@ -34,18 +34,12 @@ class AddCensusEntryTest {
     private AddCensusEntry addCensusEntry;
 
     private TreeMap<DMY, List<String>> timeLine;
-
     private List<CensusEntry> censusEntryList;
-
     private SortedSet<String> refs;
-
     private Place place;
 
-    @Mock
-    private Census censusMock;
-
-    @Mock
-    private CensusEntry censusEntryMock;
+    @Mock private Census censusMock;
+    @Mock private CensusEntry censusEntryMock;
 
     @BeforeEach
     void setUp() {

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

@@ -8,7 +8,6 @@ package scot.carricksoftware.grantswriter.domains.census;
 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 scot.carricksoftware.grantswriter.domains.people.Person;
 
@@ -24,10 +23,6 @@ class CensusEntryPartOneTest {
 
     private CensusEntry entry;
 
-    @SuppressWarnings("unused")
-    @Mock
-    private Census censusMock;
-
     @BeforeEach
     void setUp() {
         entry = new CensusEntry();
@@ -80,6 +75,4 @@ class CensusEntryPartOneTest {
         entry.setPersonalOccupation(occupation);
         assertEquals(occupation, entry.getPersonalOccupation());
     }
-
-
 }

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

@@ -26,14 +26,13 @@ public class CensusTest {
 
     private Census census;
 
+    @Mock private Place placeMock;
+
     @BeforeEach
     public void setUp() {
         census = new Census();
     }
 
-    @Mock
-    private Place placeMock;
-
     @Test
     public void getIdTest() {
         assertNull(census.getId());

src/test/java/scot/carricksoftware/grantswriter/domains/certificates/BaseCertificateStringTest.java

@@ -35,7 +35,6 @@ class BaseCertificateStringTest {
         assertEquals(testString, baseCertificate.getCertificateNumber());
     }
 
-
     @Test
     void getCertificateDateTest() {
         assertNull(baseCertificate.getCertificateDate());

src/test/java/scot/carricksoftware/grantswriter/domains/certificates/BaseCertificateTest.java

@@ -62,6 +62,4 @@ class BaseCertificateTest {
         baseCertificate.setRegistrationAuthority(organisation);
         assertEquals(organisation, baseCertificate.getRegistrationAuthority());
     }
-
-
 }

src/test/java/scot/carricksoftware/grantswriter/domains/certificates/deathcertificate/DeathCertificatePlaceTest.java

@@ -24,7 +24,6 @@ class DeathCertificatePlaceTest {
         deathCertificate = new DeathCertificate();
     }
 
-
     @Test
     void getWhereRegisteredTest() {
         assertNull(deathCertificate.getWhereRegistered());

src/test/java/scot/carricksoftware/grantswriter/domains/certificates/deathcertificate/DeathCertificateTest.java

@@ -23,7 +23,6 @@ class DeathCertificateTest {
         deathCertificate = new DeathCertificate();
     }
 
-
     @Test
     void getSexTest() {
         assertNull(deathCertificate.getSex());

src/test/java/scot/carricksoftware/grantswriter/domains/certificates/deathcertificate/DeathCertificateTimeTest.java

@@ -22,7 +22,6 @@ class DeathCertificateTimeTest {
         deathCertificate = new DeathCertificate();
     }
 
-
     @Test
     void getWhenBornTest() {
         assertNull(deathCertificate.getWhenBorn());
@@ -70,6 +69,4 @@ class DeathCertificateTimeTest {
         deathCertificate.setWhenRegistered(whenRegistered);
         assertEquals(whenRegistered, deathCertificate.getWhenRegistered());
     }
-
-
 }

src/test/java/scot/carricksoftware/grantswriter/domains/certificates/deathcertificate/DeathCertificateTwoTest.java

@@ -45,6 +45,4 @@ class DeathCertificateTwoTest {
         deathCertificate.setInformantQualification(informantQualification);
         assertEquals(informantQualification, deathCertificate.getInformantQualification());
     }
-
-
 }

src/test/java/scot/carricksoftware/grantswriter/domains/certificates/deathcertificate/DeathCertificateUntrackedTest.java

@@ -93,6 +93,4 @@ class DeathCertificateUntrackedTest {
         deathCertificate.setUntrackedUsualResidence(untrackedUsualResidence);
         assertEquals(untrackedUsualResidence, deathCertificate.getUntrackedUsualResidence());
     }
-
-
 }

src/test/java/scot/carricksoftware/grantswriter/domains/certificates/divorcecertificate/DivorceCertificateDateTest.java

@@ -58,10 +58,4 @@ class DivorceCertificateDateTest {
         certificate.setRegisteredDate(string);
         assertEquals(string, certificate.getRegisteredDate());
     }
-
-
-
-
-
-
 }

src/test/java/scot/carricksoftware/grantswriter/domains/certificates/divorcecertificate/DivorceCertificateIDTest.java

@@ -34,7 +34,4 @@ class DivorceCertificateIDTest {
         certificate.setId(id);
         assertEquals(id, certificate.getId());
     }
-
-
-
 }

src/test/java/scot/carricksoftware/grantswriter/domains/certificates/divorcecertificate/DivorceCertificatePeopleTest.java

@@ -47,8 +47,4 @@ class DivorceCertificatePeopleTest {
         certificate.setSecondParty(person);
         assertEquals(person, certificate.getSecondParty());
     }
-
-
-
-
 }

src/test/java/scot/carricksoftware/grantswriter/domains/people/PersonToStringTest.java

@@ -20,7 +20,6 @@ class PersonToStringTest {
     final String certifiedBirth = "1930";
     final String certifiedDeath = "1940";
 
-
     @BeforeEach
     void setUp() {
         person = new Person();

src/test/java/scot/carricksoftware/grantswriter/domains/places/country/CountryTest.java

@@ -39,6 +39,4 @@ class CountryTest {
         country.setName(name);
         assertEquals(name, country.getName());
     }
-
-
 }

src/test/java/scot/carricksoftware/grantswriter/domains/places/place/PlaceTest.java

@@ -27,12 +27,8 @@ public class PlaceTest {
 
     private Place place;
 
-    @Mock
-    private Country countryMock;
-
-    @Mock
-    private Region regionMock;
-
+    @Mock private Country countryMock;
+    @Mock private Region regionMock;
 
     @BeforeEach
     public void setUp() {
@@ -93,6 +89,4 @@ public class PlaceTest {
                 + string + ", "
                 + string2, place.toString());
     }
-
-
 }

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

@@ -48,6 +48,4 @@ public class RegionTest {
         region.setCountry(country);
         assertEquals(country, region.getCountry());
     }
-
-
 }

src/test/java/scot/carricksoftware/grantswriter/domains/text/AppendixTextTest.java

@@ -37,7 +37,6 @@ class AppendixTextTest {
         assertEquals(id, appendixText.getId());
     }
 
-
     @Test
     void getLevelTest() {
         assertNull(appendixText.getLevel());

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

@@ -23,7 +23,6 @@ class WriterFilesTest {
         writerFiles = new WriterFilesImpl();
     }
 
-
     @Test
     public void getLatexFileNameTest() {
         assertNull(writerFiles.getLatexFileName());
@@ -67,6 +66,4 @@ class WriterFilesTest {
         assertTrue(writerFiles.getLatexFileName().contains("grants.tex"));
         assertTrue(writerFiles.getPdfFileName().contains("grants.pdf"));
     }
-
-
 }

src/test/java/scot/carricksoftware/grantswriter/services/censusentry/CensusEntryServiceTest.java

@@ -29,7 +29,6 @@ class CensusEntryServiceTest {
     @Mock
     private CensusEntryRepository censusEntryRepositoryMock;
 
-
     @BeforeEach
     void setUp() {
         censusEntryService = new CensusEntryServiceImpl(censusEntryRepositoryMock);
@@ -44,6 +43,4 @@ class CensusEntryServiceTest {
         when(censusEntryRepositoryMock.findAllByPerson(any())).thenReturn(censusEntryList);
         assertEquals(censusEntryList, censusEntryService.findAllByPerson(GetRandomPerson()));
     }
-
-
 }

src/test/java/scot/carricksoftware/grantswriter/services/certificates/birthcertificate/BirthCertificateServiceTest.java

@@ -30,8 +30,7 @@ class BirthCertificateServiceTest {
 
     private Person person;
 
-    @Mock
-    BirthCertificateRepository birthCertificateRepositoryMock;
+    @Mock BirthCertificateRepository birthCertificateRepositoryMock;
 
     @BeforeEach
     void setUp() {

src/test/java/scot/carricksoftware/grantswriter/services/certificates/deathcertificate/DeathCertificateServiceTest.java

@@ -30,8 +30,7 @@ class DeathCertificateServiceTest {
 
     private Person person;
 
-    @Mock
-    DeathCertificateRepository deathCertificateRepositoryMock;
+    @Mock DeathCertificateRepository deathCertificateRepositoryMock;
 
     @BeforeEach
     void setUp() {

src/test/java/scot/carricksoftware/grantswriter/services/certificates/divorcecertificate/DivorceCertificateServiceTest.java

@@ -26,10 +26,9 @@ import static scot.carricksoftware.grantswriter.GenerateRandomPeopleValues.GetRa
 @ExtendWith(MockitoExtension.class)
 public class DivorceCertificateServiceTest {
 
-    DivorceCertificateService divorceCertificateService;
+    private DivorceCertificateService divorceCertificateService;
 
-    @Mock
-    DivorceCertificateRepository divorceCertificateRepositoryMock;
+    @Mock DivorceCertificateRepository divorceCertificateRepositoryMock;
 
     private Person person;
 

src/test/java/scot/carricksoftware/grantswriter/services/certificates/marriagecertificate/MarriageCertificateServiceTest.java

@@ -30,8 +30,7 @@ class MarriageCertificateServiceTest {
 
     private Person person;
 
-    @Mock
-    MarriageCertificateRepository marriageCertificateRepositoryMock;
+    @Mock MarriageCertificateRepository marriageCertificateRepositoryMock;
 
     @BeforeEach
     void setUp() {

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

@@ -27,15 +27,13 @@ class PersonServiceTest {
 
     private PersonService service;
 
-    @Mock
-    private PersonRepository personRepositoryMock;
+    @Mock private PersonRepository personRepositoryMock;
 
     @BeforeEach
     void setUp() {
         service = new PersonServiceImpl(personRepositoryMock);
     }
 
-
     @Test
     public void findAllTest() {
         List<Person> people = new ArrayList<>();
@@ -43,6 +41,4 @@ class PersonServiceTest {
         when(personRepositoryMock.findAll(any(Sort.class))).thenReturn(people);
         assertEquals(people, service.findAll());
     }
-
-
 }

src/test/java/scot/carricksoftware/grantswriter/services/status/StatusServiceTest.java

@@ -23,14 +23,9 @@ class StatusServiceTest {
 
     private StatusService statusService;
 
-    @Mock
-    private PersonRepository personRepositoryMock;
-
-    @Mock
-    private BirthCertificateRepository birthCertificateRepositoryMock;
-
-    @Mock
-    private CensusEntryRepository censusEntryRepositoryMock;
+    @Mock private PersonRepository personRepositoryMock;
+    @Mock private BirthCertificateRepository birthCertificateRepositoryMock;
+    @Mock private CensusEntryRepository censusEntryRepositoryMock;
 
     @BeforeEach
     void setUp() {

src/test/java/scot/carricksoftware/grantswriter/services/text/AppendixTextServiceTest.java

@@ -26,9 +26,7 @@ class AppendixTextServiceTest {
 
     private AppendixTextService appendixTextService;
 
-    @Mock
-    private AppendixTextRepository appendixTextRepositoryMock;
-
+    @Mock private AppendixTextRepository appendixTextRepositoryMock;
 
     @BeforeEach
     void setUp() {

src/test/java/scot/carricksoftware/grantswriter/services/text/PersonTextServiceTest.java

@@ -27,8 +27,7 @@ class PersonTextServiceTest {
 
     private PersonTextService personTextService;
 
-    @Mock
-    private PersonTextRepository personTextRepositoryMock;
+    @Mock private PersonTextRepository personTextRepositoryMock;
 
     private Person person;
 

src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/appendix/AppendixPartWriterTest.java

@@ -30,16 +30,11 @@ class AppendixPartWriterTest {
 
     private AppendixPartWriter writer;
 
-    @Mock
-    private AppendixPartHeader appendixPartHeaderMock;
-    @Mock
-    private AppendixTextService appendixTextServiceMock;
-    @Mock
-    private FileWriter fileWriterMock;
-    @Mock
-    private LatexDivisionHeader latexDivisionHeaderMock;
-    @Mock
-    private AppendixListSortByOrder appendixListSortByOrderMock;
+    @Mock private AppendixPartHeader appendixPartHeaderMock;
+    @Mock private AppendixTextService appendixTextServiceMock;
+    @Mock private FileWriter fileWriterMock;
+    @Mock private LatexDivisionHeader latexDivisionHeaderMock;
+    @Mock private AppendixListSortByOrder appendixListSortByOrderMock;
 
     @BeforeEach
     void setUp() {
@@ -93,6 +88,5 @@ class AppendixPartWriterTest {
 
         writer.write();
         verify(appendixListSortByOrderMock).sort(appendixTextList);
-
     }
 }

src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/headers/PersonSectionHeaderTest.java

@@ -19,7 +19,7 @@ import static org.mockito.Mockito.when;
 @ExtendWith(MockitoExtension.class)
 class PersonSectionHeaderTest {
 
-    PersonSectionHeader personSectionHeader;
+    private PersonSectionHeader personSectionHeader;
 
     @Mock LatexSectionHeader latexSectionHeaderMock;
     @Mock Person personMock;