소스 검색

Reformatting Mocks

Andrew Grant 1 주 전
부모
커밋
6f8ceb706a
39개의 변경된 파일90개의 추가작업 그리고 241개의 파일을 삭제
  1. 2 5
      src/test/java/scot/carricksoftware/grantswriter/writer/latex/LatexDivisionHeaderTest.java
  2. 1 2
      src/test/java/scot/carricksoftware/grantswriter/writer/latex/LatexDocumentEndTest.java
  3. 2 5
      src/test/java/scot/carricksoftware/grantswriter/writer/latex/LatexDocumentStartTest.java
  4. 1 2
      src/test/java/scot/carricksoftware/grantswriter/writer/latex/LatexLongTabLeEndTest.java
  5. 1 2
      src/test/java/scot/carricksoftware/grantswriter/writer/latex/LatexLongTableStartTest.java
  6. 1 2
      src/test/java/scot/carricksoftware/grantswriter/writer/latex/LatexPackageDeclarationTest.java
  7. 1 2
      src/test/java/scot/carricksoftware/grantswriter/writer/latex/LatexPartHeaderTest.java
  8. 1 2
      src/test/java/scot/carricksoftware/grantswriter/writer/latex/LatexSectionHeaderTest.java
  9. 1 2
      src/test/java/scot/carricksoftware/grantswriter/writer/latex/LatexSubSectionHeaderTest.java
  10. 2 6
      src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/PartsWriterTest.java
  11. 3 8
      src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/PeoplePartWriterTest.java
  12. 1 2
      src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/appendix/headers/AppendixPartHeaderTest.java
  13. 1 2
      src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/headers/PeoplePartWriterHeaderTest.java
  14. 2 5
      src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/headers/PersonSectionHeaderTest.java
  15. 7 20
      src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/sections/PersonSectionTest.java
  16. 2 5
      src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/sections/PersonSubSectionReferencesWriterTest.java
  17. 4 11
      src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/PersonSectionContentsWriterOnyContentsTest.java
  18. 2 6
      src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/PersonSubSectionReferencesWriterTest.java
  19. 2 5
      src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/PersonSubSectionTimeLineWriterTest.java
  20. 5 14
      src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/GatherBirthCertificateTimeLineDataTest.java
  21. 3 8
      src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/GatherCensusTimeLineDataTest.java
  22. 3 9
      src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/GatherDeathCertificateTimeLineDataTest.java
  23. 3 8
      src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/GatherDivorceCertificateTimeLineDataTest.java
  24. 5 14
      src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/GatherMarriageCertificateBrideAndGroomTimeLineDataTest.java
  25. 5 14
      src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/GatherMarriageCertificateWitnessTimeLineDataTest.java
  26. 6 18
      src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/GatherTimeLineDataTest.java
  27. 4 12
      src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/WriteReferencesTest.java
  28. 4 11
      src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/WriteTimeLineTest.java
  29. 1 2
      src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/level2/birthcertificate/GatherBirthCertificateFatherTimeLineDataFatherTest.java
  30. 2 5
      src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/level2/birthcertificate/GatherBirthCertificateFatherTimeLineDataRefsTest.java
  31. 1 2
      src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/level2/birthcertificate/GatherBirthCertificateInformantTimeLineDataInformantTest.java
  32. 2 6
      src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/level2/birthcertificate/GatherBirthCertificateInformantTimeLineDataRefsTest.java
  33. 1 2
      src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/level2/birthcertificate/GatherBirthCertificateMotherTimeLineDataMotherTest.java
  34. 2 6
      src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/level2/birthcertificate/GatherBirthCertificateMotherTimeLineDataRefsTest.java
  35. 1 2
      src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/level2/birthcertificate/GatherBirthCertificateNewBornTimeLineDataFatherTest.java
  36. 1 2
      src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/level2/birthcertificate/GatherBirthCertificateNewBornTimeLineDataMotherTest.java
  37. 2 6
      src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/level2/birthcertificate/GatherBirthCertificateNewBornTimeLineDataRefsTest.java
  38. 1 3
      src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/level2/birthcertificate/GatherBirthCertificateNewBornTimeLineDataWhenRegisteredTest.java
  39. 1 3
      src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/level2/birthcertificate/GatherBirthCertificateNewBornTimeLineDataWhereBornTest.java

+ 2 - 5
src/test/java/scot/carricksoftware/grantswriter/writer/latex/LatexDivisionHeaderTest.java

@@ -23,11 +23,8 @@ class LatexDivisionHeaderTest {
 
     private LatexDivisionHeader header;
 
-    @Mock
-    private FileWriter fileWriterMock;
-
-    @Mock
-    private LatexDivision latexDivisionMock;
+    @Mock private FileWriter fileWriterMock;
+    @Mock private LatexDivision latexDivisionMock;
 
     @BeforeEach
     void setUp() {

+ 1 - 2
src/test/java/scot/carricksoftware/grantswriter/writer/latex/LatexDocumentEndTest.java

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

+ 2 - 5
src/test/java/scot/carricksoftware/grantswriter/writer/latex/LatexDocumentStartTest.java

@@ -21,11 +21,8 @@ class LatexDocumentStartTest {
 
     private LatexDocumentStart documentStart;
 
-    @Mock
-    private FileWriter fileWriterMock;
-
-    @Mock
-    private LatexPackageDeclaration latexPackageDeclarationMock;
+    @Mock private FileWriter fileWriterMock;
+    @Mock private LatexPackageDeclaration latexPackageDeclarationMock;
 
     @BeforeEach
     void setUp() {

+ 1 - 2
src/test/java/scot/carricksoftware/grantswriter/writer/latex/LatexLongTabLeEndTest.java

@@ -19,8 +19,7 @@ class LatexLongTabLeEndTest {
 
     private LatexLongTabLeEnd latexLongTabLeEnd;
 
-    @Mock
-    private FileWriter fileWriterMock;
+    @Mock private FileWriter fileWriterMock;
 
     @BeforeEach
     void setUp() {

+ 1 - 2
src/test/java/scot/carricksoftware/grantswriter/writer/latex/LatexLongTableStartTest.java

@@ -20,8 +20,7 @@ class LatexLongTableStartTest {
 
     private LatexLongTableStart latexLongTableStart;
 
-    @Mock
-    private FileWriter fileWriterMock;
+    @Mock private FileWriter fileWriterMock;
 
     @BeforeEach
     void setUp() {

+ 1 - 2
src/test/java/scot/carricksoftware/grantswriter/writer/latex/LatexPackageDeclarationTest.java

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

+ 1 - 2
src/test/java/scot/carricksoftware/grantswriter/writer/latex/LatexPartHeaderTest.java

@@ -19,8 +19,7 @@ class LatexPartHeaderTest {
 
     private LatexPartHeader header;
 
-    @Mock
-    private LatexDivisionHeader latexDivisionHeaderMock;
+    @Mock private LatexDivisionHeader latexDivisionHeaderMock;
 
     @BeforeEach
     void setUp() {

+ 1 - 2
src/test/java/scot/carricksoftware/grantswriter/writer/latex/LatexSectionHeaderTest.java

@@ -19,8 +19,7 @@ class LatexSectionHeaderTest {
 
     private LatexSectionHeader header;
 
-    @Mock
-    private LatexDivisionHeader latexDivisionHeaderMock;
+    @Mock private LatexDivisionHeader latexDivisionHeaderMock;
 
     @BeforeEach
     void setUp() {

+ 1 - 2
src/test/java/scot/carricksoftware/grantswriter/writer/latex/LatexSubSectionHeaderTest.java

@@ -19,8 +19,7 @@ class LatexSubSectionHeaderTest {
 
     private LatexSubSectionHeader header;
 
-    @Mock
-    private LatexDivisionHeader latexDivisionHeaderMock;
+    @Mock private LatexDivisionHeader latexDivisionHeaderMock;
 
     @BeforeEach
     void setUp() {

+ 2 - 6
src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/PartsWriterTest.java

@@ -22,12 +22,8 @@ class PartsWriterTest {
 
     private PartsWriter partsWriter;
 
-    @Mock
-    PeoplePartWriter peoplePartWriterMock;
-
-    @Mock
-    AppendixPartWriter appendixPartWriterMock;
-
+    @Mock PeoplePartWriter peoplePartWriterMock;
+    @Mock AppendixPartWriter appendixPartWriterMock;
 
     @BeforeEach
     void setUp() {

+ 3 - 8
src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/PeoplePartWriterTest.java

@@ -31,14 +31,9 @@ class PeoplePartWriterTest {
 
     private PeoplePartWriter peoplePartWriter;
 
-    @Mock
-    private PersonService personServiceMock;
-
-    @Mock
-    private PersonSection personSectionMock;
-
-    @Mock
-    private PeoplePartHeader peopleHeaderMock;
+    @Mock private PersonService personServiceMock;
+    @Mock private PersonSection personSectionMock;
+    @Mock private PeoplePartHeader peopleHeaderMock;
 
     @SuppressWarnings("EmptyMethod")
     @BeforeEach

+ 1 - 2
src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/appendix/headers/AppendixPartHeaderTest.java

@@ -19,8 +19,7 @@ class AppendixPartHeaderTest {
 
     private AppendixPartHeader appendixPartHeader;
 
-    @Mock
-    private LatexPartHeader latexPartHeaderMock;
+    @Mock private LatexPartHeader latexPartHeaderMock;
 
     @BeforeEach
     void setUp() {

+ 1 - 2
src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/headers/PeoplePartWriterHeaderTest.java

@@ -20,8 +20,7 @@ class PeoplePartWriterHeaderTest {
 
     private PeoplePartHeader header;
 
-    @Mock
-    private LatexPartHeader latexPartHeaderMock;
+    @Mock private LatexPartHeader latexPartHeaderMock;
 
     @BeforeEach
     void setUp() {

+ 2 - 5
src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/headers/PersonSectionHeaderTest.java

@@ -21,11 +21,8 @@ class PersonSectionHeaderTest {
 
     PersonSectionHeader personSectionHeader;
 
-    @Mock
-    LatexSectionHeader latexSectionHeaderMock;
-
-    @Mock
-    Person personMock;
+    @Mock LatexSectionHeader latexSectionHeaderMock;
+    @Mock Person personMock;
 
     @BeforeEach
     void setUp() {

+ 7 - 20
src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/sections/PersonSectionTest.java

@@ -26,26 +26,13 @@ class PersonSectionTest {
 
     private PersonSection personSection;
 
-    @Mock
-    private PersonSectionHeader personSectionHeaderMock;
-
-    @Mock
-    private PersonSubSectionTimeLineWriter personSubSectionTimeLineWriterMock;
-
-    @Mock
-    private PersonSubSectionReferencesWriter personSubSectionReferencesWriterMock;
-
-    @Mock
-    private Person personMock;
-
-    @Mock
-    private GatherTimeLineData gatherTimeLineDataMock;
-
-    @Mock
-    private PersonSectionContentsWriter personSectionContentsWriterMock;
-
-    @Mock
-    ClearExistingTimeLineData clearExistingTimeLineDataMock;
+    @Mock private PersonSectionHeader personSectionHeaderMock;
+    @Mock private PersonSubSectionTimeLineWriter personSubSectionTimeLineWriterMock;
+    @Mock private PersonSubSectionReferencesWriter personSubSectionReferencesWriterMock;
+    @Mock private Person personMock;
+    @Mock private GatherTimeLineData gatherTimeLineDataMock;
+    @Mock private PersonSectionContentsWriter personSectionContentsWriterMock;
+    @Mock ClearExistingTimeLineData clearExistingTimeLineDataMock;
 
     @BeforeEach
     void setUp() {

+ 2 - 5
src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/sections/PersonSubSectionReferencesWriterTest.java

@@ -22,11 +22,8 @@ class PersonSubSectionReferencesWriterTest {
 
     private PersonSubSectionReferencesWriter writer;
 
-    @Mock
-    private LatexSubSectionHeader latexSubSectionHeaderMock;
-
-    @Mock
-    private WriteReferences writeReferencesMock;
+    @Mock private LatexSubSectionHeader latexSubSectionHeaderMock;
+    @Mock private WriteReferences writeReferencesMock;
 
     @BeforeEach
     void setUp() {

+ 4 - 11
src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/PersonSectionContentsWriterOnyContentsTest.java

@@ -33,17 +33,10 @@ class PersonSectionContentsWriterOnyContentsTest {
 
     private PersonSectionContentsWriter writer;
 
-    @Mock
-    private PersonTextService personTextServiceMock;
-
-    @Mock
-    private FileWriter fileWriterMock;
-
-    @Mock
-    private LatexDivisionHeader latexDivisionHeaderMock;
-
-    @Mock
-    private PersonListSortByOrder personListSortByOrderMock;
+    @Mock private PersonTextService personTextServiceMock;
+    @Mock private FileWriter fileWriterMock;
+    @Mock private LatexDivisionHeader latexDivisionHeaderMock;
+    @Mock private PersonListSortByOrder personListSortByOrderMock;
 
     private List<PersonText> contents;
 

+ 2 - 6
src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/PersonSubSectionReferencesWriterTest.java

@@ -24,12 +24,8 @@ class PersonSubSectionReferencesWriterTest {
 
     private PersonSubSectionReferencesWriter personSubSectionReferencesWriter;
 
-    @Mock
-    private LatexSubSectionHeader latexSubSectionHeaderMock;
-
-    @Mock
-    private WriteReferences writeReferencesMock;
-
+    @Mock private LatexSubSectionHeader latexSubSectionHeaderMock;
+    @Mock private WriteReferences writeReferencesMock;
 
     @BeforeEach
     void setUp() {

+ 2 - 5
src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/PersonSubSectionTimeLineWriterTest.java

@@ -21,11 +21,8 @@ class PersonSubSectionTimeLineWriterTest {
 
     private PersonSubSectionTimeLineWriter writer;
 
-    @Mock
-    private LatexSubSectionHeader latexSubSectionHeaderMock;
-
-    @Mock
-    private WriteTimeLine writeTimeLineMock;
+    @Mock private LatexSubSectionHeader latexSubSectionHeaderMock;
+    @Mock private WriteTimeLine writeTimeLineMock;
 
     @BeforeEach
     void setUp() {

+ 5 - 14
src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/GatherBirthCertificateTimeLineDataTest.java

@@ -31,20 +31,11 @@ class GatherBirthCertificateTimeLineDataTest {
 
     private GatherBirthCertificateTimeLineData gatherBirthCertificateTimeLineData;
 
-    @Mock
-    private BirthCertificateService birthCertificateServiceMock;
-
-    @Mock
-    private GatherBirthCertificateNewBornTimeLineData gatherBirthCertificateNewBornTimeLineDataMock;
-
-    @Mock
-    private GatherBirthCertificateFatherTimeLineData gatherBirthCertificateFatherTimeLineDataMock;
-
-    @Mock
-    private GatherBirthCertificateMotherTimeLineData gatherBirthCertificateMotherTimeLineDataMock;
-
-    @Mock
-    private GatherBirthCertificateInformantTimeLineDataImpl gatherBirthCertificateInformantTimeLineDataMock;
+    @Mock private BirthCertificateService birthCertificateServiceMock;
+    @Mock private GatherBirthCertificateNewBornTimeLineData gatherBirthCertificateNewBornTimeLineDataMock;
+    @Mock private GatherBirthCertificateFatherTimeLineData gatherBirthCertificateFatherTimeLineDataMock;
+    @Mock private GatherBirthCertificateMotherTimeLineData gatherBirthCertificateMotherTimeLineDataMock;
+    @Mock private GatherBirthCertificateInformantTimeLineDataImpl gatherBirthCertificateInformantTimeLineDataMock;
 
     List<BirthCertificate> birthCertificates;
     Person person;

+ 3 - 8
src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/GatherCensusTimeLineDataTest.java

@@ -26,14 +26,9 @@ class GatherCensusTimeLineDataTest {
 
     private GatherCensusTimeLineData gatherCensusTimeLineData;
 
-    @Mock
-    CensusEntryService censusEntryServiceMock;
-
-    @Mock
-    TimeLineData timeLineDataMock;
-
-    @Mock
-    Person personMock;
+    @Mock CensusEntryService censusEntryServiceMock;
+    @Mock TimeLineData timeLineDataMock;
+    @Mock Person personMock;
 
     @BeforeEach
     void setUp() {

+ 3 - 9
src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/GatherDeathCertificateTimeLineDataTest.java

@@ -29,15 +29,9 @@ class GatherDeathCertificateTimeLineDataTest {
 
     private GatherDeathCertificateTimeLineData gatherDeathCertificateTimeLineData;
 
-    @Mock
-    private DeathCertificateService deathCertificateServiceMock;
-
-    @Mock
-    private GatherDeathCertificateDeceasedTimeLineData gatherDeathCertificateDeceasedTimeLineDataMock;
-
-    @Mock
-    private GatherDeathCertificateInformantTimeLineData gatherDeathCertificateInformantTimeLineDataMock;
-
+    @Mock private DeathCertificateService deathCertificateServiceMock;
+    @Mock private GatherDeathCertificateDeceasedTimeLineData gatherDeathCertificateDeceasedTimeLineDataMock;
+    @Mock private GatherDeathCertificateInformantTimeLineData gatherDeathCertificateInformantTimeLineDataMock;
 
     List<DeathCertificate> deathCertificates;
     Person person;

+ 3 - 8
src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/GatherDivorceCertificateTimeLineDataTest.java

@@ -29,14 +29,9 @@ class GatherDivorceCertificateTimeLineDataTest {
 
     private GatherDivorceCertificateTimeLineData gatherDivorceCertificateTimeLineData;
 
-    @Mock
-    private DivorceCertificateService divorceCertificateServiceMock;
-
-    @Mock
-    private GatherDivorceCertificateFirstPartyTimeLineData gatherDivorceCertificateFirstPartyTimeLineDataMock;
-
-    @Mock
-    private GatherDivorceCertificateSecondPartyTimeLineData gatherDivorceCertificateSecondPartyTimeLineDataMock;
+    @Mock private DivorceCertificateService divorceCertificateServiceMock;
+    @Mock private GatherDivorceCertificateFirstPartyTimeLineData gatherDivorceCertificateFirstPartyTimeLineDataMock;
+    @Mock private GatherDivorceCertificateSecondPartyTimeLineData gatherDivorceCertificateSecondPartyTimeLineDataMock;
 
     List<DivorceCertificate> divorceCertificates;
     Person person;

+ 5 - 14
src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/GatherMarriageCertificateBrideAndGroomTimeLineDataTest.java

@@ -31,20 +31,11 @@ class GatherMarriageCertificateBrideAndGroomTimeLineDataTest {
 
     private GatherMarriageCertificateTimeLineData gatherMarriageCertificateTimeLineData;
 
-    @Mock
-    private MarriageCertificateService marriageCertificateServiceMock;
-
-    @Mock
-    private GatherMarriageCertificateBrideTimeLineData gatherMarriageCertificateBrideTimeLineDataMock;
-
-    @Mock
-    private GatherMarriageCertificateGroomTimeLineData gatherMarriageCertificateGroomTimeLineDataMock;
-
-    @Mock
-    private GatherMarriageCertificateFirstWitnessTimeLineDataImpl gatherMarriageCertificateFirstWitnessTimeLineData;
-
-    @Mock
-    private GatherMarriageCertificateSecondWitnessTimeLineDataImpl gatherMarriageCertificateSecondWitnessTimeLineData;
+    @Mock private MarriageCertificateService marriageCertificateServiceMock;
+    @Mock private GatherMarriageCertificateBrideTimeLineData gatherMarriageCertificateBrideTimeLineDataMock;
+    @Mock private GatherMarriageCertificateGroomTimeLineData gatherMarriageCertificateGroomTimeLineDataMock;
+    @Mock private GatherMarriageCertificateFirstWitnessTimeLineDataImpl gatherMarriageCertificateFirstWitnessTimeLineData;
+    @Mock private GatherMarriageCertificateSecondWitnessTimeLineDataImpl gatherMarriageCertificateSecondWitnessTimeLineData;
 
     List<MarriageCertificate> marriageCertificates;
     Person person;

+ 5 - 14
src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/GatherMarriageCertificateWitnessTimeLineDataTest.java

@@ -30,20 +30,11 @@ class GatherMarriageCertificateWitnessTimeLineDataTest {
 
     private GatherMarriageCertificateTimeLineData gatherMarriageCertificateTimeLineData;
 
-    @Mock
-    private MarriageCertificateService marriageCertificateServiceMock;
-
-    @Mock
-    private GatherMarriageCertificateBrideTimeLineData gatherMarriageCertificateBrideTimeLineDataMock;
-
-    @Mock
-    private GatherMarriageCertificateGroomTimeLineData gatherMarriageCertificateGroomTimeLineDataMock;
-
-    @Mock
-    private GatherMarriageCertificateFirstWitnessTimeLineDataImpl gatherMarriageCertificateFirstWitnessTimeLineDataMock;
-
-    @Mock
-    private GatherMarriageCertificateSecondWitnessTimeLineDataImpl gatherMarriageCertificateSecondWitnessTimeLineDataMock;
+    @Mock private MarriageCertificateService marriageCertificateServiceMock;
+    @Mock private GatherMarriageCertificateBrideTimeLineData gatherMarriageCertificateBrideTimeLineDataMock;
+    @Mock private GatherMarriageCertificateGroomTimeLineData gatherMarriageCertificateGroomTimeLineDataMock;
+    @Mock private GatherMarriageCertificateFirstWitnessTimeLineDataImpl gatherMarriageCertificateFirstWitnessTimeLineDataMock;
+    @Mock private GatherMarriageCertificateSecondWitnessTimeLineDataImpl gatherMarriageCertificateSecondWitnessTimeLineDataMock;
 
     List<MarriageCertificate> marriageCertificates;
     Person person;

+ 6 - 18
src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/GatherTimeLineDataTest.java

@@ -19,24 +19,12 @@ class GatherTimeLineDataTest {
 
     private GatherTimeLineData gatherTimeLineData;
 
-    @Mock
-    private GatherCensusTimeLineData gatherCensusTimeLineDataMock;
-
-    @Mock
-    private GatherBirthCertificateTimeLineData gatherBirthCertificateTimeLineDataMock;
-
-    @Mock
-    private GatherDeathCertificateTimeLineData gatherDeathCertificateTimeLineDataMock;
-
-    @Mock
-    private GatherMarriageCertificateTimeLineData gatherMarriageCertificateTimeLineDataMock;
-
-    @Mock
-    private GatherDivorceCertificateTimeLineData gatherDivorceCertificateTimeLineDataMock;
-
-
-    @Mock
-    private Person personMock;
+    @Mock private GatherCensusTimeLineData gatherCensusTimeLineDataMock;
+    @Mock private GatherBirthCertificateTimeLineData gatherBirthCertificateTimeLineDataMock;
+    @Mock private GatherDeathCertificateTimeLineData gatherDeathCertificateTimeLineDataMock;
+    @Mock private GatherMarriageCertificateTimeLineData gatherMarriageCertificateTimeLineDataMock;
+    @Mock private GatherDivorceCertificateTimeLineData gatherDivorceCertificateTimeLineDataMock;
+    @Mock private Person personMock;
 
     @BeforeEach
     void setUp() {

+ 4 - 12
src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/WriteReferencesTest.java

@@ -29,18 +29,10 @@ class WriteReferencesTest {
 
     private WriteReferences writeReferences;
 
-
-    @Mock
-    private FileWriter fileWriterMock;
-
-    @Mock
-    private LatexLongTableStart latexLongTableStartMock;
-
-    @Mock
-    private LatexLongTabLeEnd latexLongTabLeEndMock;
-
-    @Mock
-    TimeLineData timeLineDataMock;
+    @Mock private FileWriter fileWriterMock;
+    @Mock private LatexLongTableStart latexLongTableStartMock;
+    @Mock private LatexLongTabLeEnd latexLongTabLeEndMock;
+    @Mock private TimeLineData timeLineDataMock;
 
     @BeforeEach
     void setUp() {

+ 4 - 11
src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/WriteTimeLineTest.java

@@ -33,17 +33,10 @@ class WriteTimeLineTest {
 
     private WriteTimeLine writeTimeLine;
 
-    @Mock
-    private FileWriter fileWriterMock;
-
-    @Mock
-    private LatexLongTableStart latexLongTableStartMock;
-
-    @Mock
-    private LatexLongTabLeEnd latexLongTabLeEndMock;
-
-    @Mock
-    private TimeLineData timeLineDataMock;
+    @Mock private FileWriter fileWriterMock;
+    @Mock private LatexLongTableStart latexLongTableStartMock;
+    @Mock private LatexLongTabLeEnd latexLongTabLeEndMock;
+    @Mock private TimeLineData timeLineDataMock;
 
     @BeforeEach
     void setUp() {

+ 1 - 2
src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/level2/birthcertificate/GatherBirthCertificateFatherTimeLineDataFatherTest.java

@@ -30,8 +30,7 @@ class GatherBirthCertificateFatherTimeLineDataFatherTest {
 
     GatherBirthCertificateFatherTimeLineData gatherBirthCertificateFatherTimeLineData;
 
-    @Mock
-    private TimeLineData timelineDataMock;
+    @Mock private TimeLineData timelineDataMock;
 
     private List<BirthCertificate> birthCertificates;
 

+ 2 - 5
src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/level2/birthcertificate/GatherBirthCertificateFatherTimeLineDataRefsTest.java

@@ -29,11 +29,8 @@ class GatherBirthCertificateFatherTimeLineDataRefsTest {
 
     GatherBirthCertificateFatherTimeLineData gatherBirthCertificateFatherTimeLineData;
 
-    @Mock
-    private TimeLineData timelineDataMock;
-
-    @Mock
-    private Person personMock;
+    @Mock private TimeLineData timelineDataMock;
+    @Mock private Person personMock;
 
     private List<BirthCertificate> birthCertificates;
 

+ 1 - 2
src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/level2/birthcertificate/GatherBirthCertificateInformantTimeLineDataInformantTest.java

@@ -29,8 +29,7 @@ class GatherBirthCertificateInformantTimeLineDataInformantTest {
 
     GatherBirthCertificateInformantTimeLineData gatherBirthCertificateInformantTimeLineData;
 
-    @Mock
-    private TimeLineData timelineDataMock;
+    @Mock private TimeLineData timelineDataMock;
 
     private List<BirthCertificate> birthCertificates;
 

+ 2 - 6
src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/level2/birthcertificate/GatherBirthCertificateInformantTimeLineDataRefsTest.java

@@ -29,15 +29,11 @@ class GatherBirthCertificateInformantTimeLineDataRefsTest {
 
     GatherBirthCertificateInformantTimeLineData gatherBirthCertificateInformantTimeLineData;
 
-    @Mock
-    private TimeLineData timelineDataMock;
-
-    @Mock
-    private Person personMock;
+    @Mock private TimeLineData timelineDataMock;
+    @Mock private Person personMock;
 
     private List<BirthCertificate> birthCertificates;
 
-
     @BeforeEach
     void setUp() {
         gatherBirthCertificateInformantTimeLineData = new GatherBirthCertificateInformantTimeLineDataImpl(this.timelineDataMock);

+ 1 - 2
src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/level2/birthcertificate/GatherBirthCertificateMotherTimeLineDataMotherTest.java

@@ -28,8 +28,7 @@ class GatherBirthCertificateMotherTimeLineDataMotherTest {
 
     GatherBirthCertificateMotherTimeLineData gatherBirthCertificateMotherTimeLineData;
 
-    @Mock
-    private TimeLineData timelineDataMock;
+    @Mock private TimeLineData timelineDataMock;
 
     private List<BirthCertificate> birthCertificates;
 

+ 2 - 6
src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/level2/birthcertificate/GatherBirthCertificateMotherTimeLineDataRefsTest.java

@@ -29,15 +29,11 @@ class GatherBirthCertificateMotherTimeLineDataRefsTest {
 
     GatherBirthCertificateMotherTimeLineData gatherBirthCertificateMotherTimeLineData;
 
-    @Mock
-    private TimeLineData timelineDataMock;
-
-    @Mock
-    private Person personMock;
+    @Mock private TimeLineData timelineDataMock;
+    @Mock private Person personMock;
 
     private List<BirthCertificate> birthCertificates;
 
-
     @BeforeEach
     void setUp() {
         gatherBirthCertificateMotherTimeLineData = new GatherBirthCertificateMotherTimeLineDataImpl(this.timelineDataMock);

+ 1 - 2
src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/level2/birthcertificate/GatherBirthCertificateNewBornTimeLineDataFatherTest.java

@@ -28,8 +28,7 @@ class GatherBirthCertificateNewBornTimeLineDataFatherTest {
 
     GatherBirthCertificateNewBornTimeLineData gatherBirthCertificateNewBornTimeLineData;
 
-    @Mock
-    private TimeLineData timelineDataMock;
+    @Mock private TimeLineData timelineDataMock;
 
     private List<BirthCertificate> birthCertificates;
 

+ 1 - 2
src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/level2/birthcertificate/GatherBirthCertificateNewBornTimeLineDataMotherTest.java

@@ -28,8 +28,7 @@ class GatherBirthCertificateNewBornTimeLineDataMotherTest {
 
     GatherBirthCertificateNewBornTimeLineData gatherBirthCertificateNewBornTimeLineData;
 
-    @Mock
-    private TimeLineData timelineDataMock;
+    @Mock private TimeLineData timelineDataMock;
 
     private List<BirthCertificate> birthCertificates;
 

+ 2 - 6
src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/level2/birthcertificate/GatherBirthCertificateNewBornTimeLineDataRefsTest.java

@@ -29,15 +29,11 @@ class GatherBirthCertificateNewBornTimeLineDataRefsTest {
 
     GatherBirthCertificateNewBornTimeLineData gatherBirthCertificateNewBornTimeLineData;
 
-    @Mock
-    private TimeLineData timelineDataMock;
-
-    @Mock
-    private Person personMock;
+    @Mock private TimeLineData timelineDataMock;
+    @Mock private Person personMock;
 
     private List<BirthCertificate> birthCertificates;
 
-
     @BeforeEach
     void setUp() {
         gatherBirthCertificateNewBornTimeLineData = new GatherBirthCertificateNewBornTimeLineDataImpl(this.timelineDataMock);

+ 1 - 3
src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/level2/birthcertificate/GatherBirthCertificateNewBornTimeLineDataWhenRegisteredTest.java

@@ -31,8 +31,7 @@ class GatherBirthCertificateNewBornTimeLineDataWhenRegisteredTest {
 
     GatherBirthCertificateNewBornTimeLineData gatherBirthCertificateNewBornTimeLineData;
 
-    @Mock
-    private TimeLineData timelineDataMock;
+    @Mock private TimeLineData timelineDataMock;
 
     private List<BirthCertificate> birthCertificates;
 
@@ -40,7 +39,6 @@ class GatherBirthCertificateNewBornTimeLineDataWhenRegisteredTest {
 
     private BirthCertificate birthCertificate;
 
-
     @BeforeEach
     void setUp() {
         gatherBirthCertificateNewBornTimeLineData = new GatherBirthCertificateNewBornTimeLineDataImpl(this.timelineDataMock);

+ 1 - 3
src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/level2/birthcertificate/GatherBirthCertificateNewBornTimeLineDataWhereBornTest.java

@@ -30,8 +30,7 @@ class GatherBirthCertificateNewBornTimeLineDataWhereBornTest {
 
     GatherBirthCertificateNewBornTimeLineData gatherBirthCertificateNewBornTimeLineData;
 
-    @Mock
-    private TimeLineData timelineDataMock;
+    @Mock private TimeLineData timelineDataMock;
 
     private List<BirthCertificate> birthCertificates;
 
@@ -39,7 +38,6 @@ class GatherBirthCertificateNewBornTimeLineDataWhereBornTest {
 
     private BirthCertificate birthCertificate;
 
-
     @BeforeEach
     void setUp() {
         gatherBirthCertificateNewBornTimeLineData = new GatherBirthCertificateNewBornTimeLineDataImpl(this.timelineDataMock);