Ver código fonte

CensusEntryService

Andrew Grant 3 meses atrás
pai
commit
93dd9ed077

+ 5 - 6
src/test/java/scot/carricksoftware/grantswriter/data/TimelineDataGetterAndSetterTest.java

@@ -7,10 +7,9 @@ package scot.carricksoftware.grantswriter.data;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.springframework.util.LinkedMultiValueMap;
 
-import java.util.SortedMap;
 import java.util.SortedSet;
-import java.util.TreeMap;
 import java.util.TreeSet;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -46,16 +45,16 @@ class TimelineDataGetterAndSetterTest {
 
     @Test
     void setTimelineTest() {
-        SortedMap<String, String> timeline   = new TreeMap<>();
-        timeline.put(GetRandomString(), GetRandomString());
+        LinkedMultiValueMap<String, String> timeline   = new LinkedMultiValueMap<>();
+        timeline.add(GetRandomString(), GetRandomString());
         timelineData.setTimeline(timeline);
         assertEquals(timeline, timelineData.getTimeline());
     }
 
     @Test
     void clearTimeLineTest() {
-        SortedMap<String, String> timeline   = new TreeMap<>();
-        timeline.put(GetRandomString(), GetRandomString());
+        LinkedMultiValueMap<String, String> timeline   = new LinkedMultiValueMap<>();
+        timeline.add(GetRandomString(), GetRandomString());
         timelineData.setTimeline(timeline);
         timelineData.clear();
         assertEquals(0, timelineData.getTimeline().size());

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

@@ -10,6 +10,7 @@ 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.data.TimelineData;
 import scot.carricksoftware.grantswriter.domains.people.Person;
 import scot.carricksoftware.grantswriter.services.censusentry.CensusEntryService;
 import scot.carricksoftware.grantswriter.writer.latex.LatexSubSectionHeader;
@@ -27,12 +28,15 @@ class PersonSubSectionTimeLineWriterTest {
     @Mock
     private CensusEntryService censusEntryServiceMock;
 
+    @Mock
+    private TimelineData timelineDataMock;
+
     @Mock
     private Person personMock;
 
     @BeforeEach
     void setUp() {
-        writer = new PersonSubSectionTimeLineWriterImpl(latexSubSectionHeaderMock, censusEntryServiceMock);
+        writer = new PersonSubSectionTimeLineWriterImpl(latexSubSectionHeaderMock, censusEntryServiceMock, timelineDataMock);
     }
 
     @Test