GatherMarriageCertificateWitnessTimeLineDataTest

src/main/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/level2/marriagecertificate/GatherMarriageCertificateSecondWitnessTimeLineDataImpl.java

@@ -8,8 +8,8 @@ package scot.carricksoftware.grantswriter.writer.latex.parts.people.subsections.
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.stereotype.Component;
+import scot.carricksoftware.grantswriter.converters.StringToDMYConverter;
 import scot.carricksoftware.grantswriter.data.DMY;
-import scot.carricksoftware.grantswriter.data.DMYImpl;
 import scot.carricksoftware.grantswriter.data.TimeLineData;
 import scot.carricksoftware.grantswriter.domains.certificates.marriagecertificate.MarriageCertificate;
 
@@ -24,8 +24,11 @@ public class GatherMarriageCertificateSecondWitnessTimeLineDataImpl implements G
 
     private static final Logger logger = LogManager.getLogger(GatherMarriageCertificateSecondWitnessTimeLineDataImpl.class);
 
-    public GatherMarriageCertificateSecondWitnessTimeLineDataImpl(TimeLineData timelineData) {
+    private final StringToDMYConverter stringToDMYConverter;
+
+    public GatherMarriageCertificateSecondWitnessTimeLineDataImpl(TimeLineData timelineData, StringToDMYConverter stringToDMYConverter) {
         this.timelineData = timelineData;
+        this.stringToDMYConverter = stringToDMYConverter;
     }
 
     @Override
@@ -45,20 +48,15 @@ public class GatherMarriageCertificateSecondWitnessTimeLineDataImpl implements G
     private void addWitnessed(TreeMap<DMY, List<String>> timeLine, MarriageCertificate marriageCertificate) {
         logger.info("GatherMarriageCertificateFirstWitnessTimeLineDataImpl::AddWitnessed");
 
-        List<String> existingValues = timeLine.get(getDMY(marriageCertificate.getWhenMarried()));
+        List<String> existingValues = timeLine.get(stringToDMYConverter.convert(marriageCertificate.getWhenMarried()));
         if (existingValues == null) {
             existingValues = new ArrayList<>();
         }
 
         existingValues.add("Witnessed the marriage of " + marriageCertificate.getGroom().toString() + " and " + marriageCertificate.getBride().toString());
 
-        timeLine.put(getDMY(marriageCertificate.getWhenMarried()), existingValues);
+        timeLine.put(stringToDMYConverter.convert(marriageCertificate.getWhenMarried()), existingValues);
 
     }
 
-    private DMY getDMY(String dateKey) {
-        DMY dmyKey = new DMYImpl();
-        dmyKey.parse(dateKey);
-        return dmyKey;
-    }
 }

src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/level2/marriagecertificates/GatherMarriageCertificateFirstWitnessTimeLineDataRefsTest.java

@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2025.  Andrew Grant Carrick Software. All rights reserved
+ *
+ */
+
+package scot.carricksoftware.grantswriter.writer.latex.parts.people.subsections.helpers.level2.marriagecertificates;
+
+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.converters.StringToDMYConverter;
+import scot.carricksoftware.grantswriter.data.DMY;
+import scot.carricksoftware.grantswriter.data.TimeLineData;
+import scot.carricksoftware.grantswriter.domains.certificates.marriagecertificate.MarriageCertificate;
+import scot.carricksoftware.grantswriter.domains.people.Person;
+import scot.carricksoftware.grantswriter.writer.latex.parts.people.subsections.helpers.level2.marriagecertificate.GatherMarriageCertificateFirstWitnessTimeLineData;
+import scot.carricksoftware.grantswriter.writer.latex.parts.people.subsections.helpers.level2.marriagecertificate.GatherMarriageCertificateFirstWitnessTimeLineDataImpl;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.when;
+import static scot.carricksoftware.grantswriter.GenerateCertificateRandomValues.GetRandomString;
+import static scot.carricksoftware.grantswriter.GenerateRandomDMYValues.GetRandomDMY;
+import static scot.carricksoftware.grantswriter.GenerateRandomPeopleValues.GetRandomPerson;
+
+@ExtendWith(MockitoExtension.class)
+class GatherMarriageCertificateFirstWitnessTimeLineDataRefsTest {
+
+    GatherMarriageCertificateFirstWitnessTimeLineData gatherMarriageCertificateFirstWitnessTimeLineData;
+
+    @Mock
+    private TimeLineData timelineDataMock;
+
+    @Mock
+    private StringToDMYConverter stringToDMYConverterMock;
+
+    private List<MarriageCertificate> marriageCertificates;
+
+    private Person bride;
+    private Person groom;
+
+    @BeforeEach
+    void setUp() {
+        gatherMarriageCertificateFirstWitnessTimeLineData = new GatherMarriageCertificateFirstWitnessTimeLineDataImpl(
+                timelineDataMock,
+                stringToDMYConverterMock);
+        marriageCertificates = new ArrayList<>();
+        bride = GetRandomPerson();
+        groom = GetRandomPerson();
+        DMY dmy = GetRandomDMY();
+        when(stringToDMYConverterMock.convert(anyString())).thenReturn(dmy);
+    }
+
+    @Test
+    void refsAreAddedTest() {
+        SortedSet<String> refs = new TreeSet<>();
+        refs.add(GetRandomString());
+        when(timelineDataMock.getRefs()).thenReturn(refs);
+        MarriageCertificate marriageCertificate = new MarriageCertificate();
+        marriageCertificate.setBride(bride);
+        marriageCertificate.setGroom(groom);
+        marriageCertificate.setBrideRank("RandomQ");
+        marriageCertificate.setWhenMarried("25/01/1953");
+        marriageCertificates.add(marriageCertificate);
+
+        gatherMarriageCertificateFirstWitnessTimeLineData.gather(marriageCertificates);
+        assertTrue(refs.contains("Marriage Certificate for : " + bride.toString() + " and " + groom.toString()));
+    }
+}

src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/level2/marriagecertificates/GatherMarriageCertificateSecondWitnessTimeLineDataRefsTest.java

@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2025.  Andrew Grant Carrick Software. All rights reserved
+ *
+ */
+
+package scot.carricksoftware.grantswriter.writer.latex.parts.people.subsections.helpers.level2.marriagecertificates;
+
+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.converters.StringToDMYConverter;
+import scot.carricksoftware.grantswriter.data.DMY;
+import scot.carricksoftware.grantswriter.data.TimeLineData;
+import scot.carricksoftware.grantswriter.domains.certificates.marriagecertificate.MarriageCertificate;
+import scot.carricksoftware.grantswriter.domains.people.Person;
+import scot.carricksoftware.grantswriter.writer.latex.parts.people.subsections.helpers.level2.marriagecertificate.GatherMarriageCertificateSecondWitnessTimeLineData;
+import scot.carricksoftware.grantswriter.writer.latex.parts.people.subsections.helpers.level2.marriagecertificate.GatherMarriageCertificateSecondWitnessTimeLineDataImpl;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.when;
+import static scot.carricksoftware.grantswriter.GenerateCertificateRandomValues.GetRandomString;
+import static scot.carricksoftware.grantswriter.GenerateRandomDMYValues.GetRandomDMY;
+import static scot.carricksoftware.grantswriter.GenerateRandomPeopleValues.GetRandomPerson;
+
+@ExtendWith(MockitoExtension.class)
+class GatherMarriageCertificateSecondWitnessTimeLineDataRefsTest {
+
+    GatherMarriageCertificateSecondWitnessTimeLineData gatherMarriageCertificateSecondWitnessTimeLineData;
+
+    @Mock
+    private TimeLineData timelineDataMock;
+
+    @Mock
+    private StringToDMYConverter stringToDMYConverterMock;
+
+    private List<MarriageCertificate> marriageCertificates;
+
+    private Person bride;
+    private Person groom;
+
+    @BeforeEach
+    void setUp() {
+        gatherMarriageCertificateSecondWitnessTimeLineData = new GatherMarriageCertificateSecondWitnessTimeLineDataImpl(
+                timelineDataMock,
+                stringToDMYConverterMock);
+        marriageCertificates = new ArrayList<>();
+        DMY dmy = GetRandomDMY();
+        when(stringToDMYConverterMock.convert(anyString())).thenReturn(dmy);
+        bride = GetRandomPerson();
+        groom = GetRandomPerson();
+    }
+
+    @Test
+    void refsAreAddedTest() {
+        SortedSet<String> refs = new TreeSet<>();
+        refs.add(GetRandomString());
+        when(timelineDataMock.getRefs()).thenReturn(refs);
+        MarriageCertificate marriageCertificate = new MarriageCertificate();
+        marriageCertificate.setBride(bride);
+        marriageCertificate.setGroom(groom);
+        marriageCertificate.setBrideRank("RandomQ");
+        marriageCertificate.setWhenMarried("25/01/1953");
+        marriageCertificates.add(marriageCertificate);
+
+        gatherMarriageCertificateSecondWitnessTimeLineData.gather(marriageCertificates);
+        assertTrue(refs.contains("Marriage Certificate for : " + bride.toString() + " and " + groom.toString()));
+    }
+}