Explorar o código

TimeLineDataSetterAndGetterTest

Andrew Grant hai 3 meses
pai
achega
39491490b9

+ 2 - 2
src/main/java/scot/carricksoftware/grantswriter/data/TimeLineData.java

@@ -20,10 +20,10 @@ public interface TimeLineData {
     void add(List<CensusEntry> censusEntryList);
 
     @SuppressWarnings("unused")
-    TreeMap<DMY, List<String>> getTimeline();
+    TreeMap<DMY, List<String>> getTimeLine();
 
     @SuppressWarnings("unused")
-    void setTimeline(TreeMap<DMY, List<String>> timeline);
+    void setTimeline(TreeMap<DMY, List<String>> timeLine);
 
     @SuppressWarnings("unused")
     SortedSet<String> getRefs();

+ 10 - 10
src/main/java/scot/carricksoftware/grantswriter/data/TimeLineDataImpl.java

@@ -17,7 +17,7 @@ import java.util.TreeSet;
 @Component
 public class TimeLineDataImpl implements TimeLineData {
 
-    private TreeMap<DMY, List<String>> timeline;
+    private TreeMap<DMY, List<String>> timeLine;
 
     private SortedSet<String> refs;
 
@@ -29,13 +29,13 @@ public class TimeLineDataImpl implements TimeLineData {
     public TimeLineDataImpl(DMY dmy, TimeLineDateComparator timeLineDateComparator) {
         this.dmy = dmy;
         this.timeLineDateComparator = timeLineDateComparator;
-        this.timeline = new TreeMap<>();
+        this.timeLine = new TreeMap<>();
         this.refs = new TreeSet<>();
     }
 
     @Override
     public void clear() {
-        timeline.clear();
+        timeLine.clear();
         refs.clear();
     }
 
@@ -45,31 +45,31 @@ public class TimeLineDataImpl implements TimeLineData {
             String key = censusEntry.getCensus().getCensusDate().label;
             dmy.parse(key);
 
-            List<String> values = timeline.get(dmy);
+            List<String> values = timeLine.get(dmy);
             if (values == null) {
                 values = new ArrayList<>();
             }
             values.add( "Recorded as being at " +
                     censusEntry.getCensus().getPlace().toString());
-            timeline.put(dmy, values);
+            timeLine.put(dmy, values);
 
             if (censusEntry.getPersonalOccupation() != null && !censusEntry.getPersonalOccupation().isEmpty()) {
                 values.add("Occupation recorded as " +
                                 censusEntry.getPersonalOccupation());
-                timeline.put(dmy, values);
+                timeLine.put(dmy, values);
             }
             refs.add(censusEntry.getCensus().toString());
         }
     }
 
     @Override
-    public TreeMap<DMY, List<String>> getTimeline() {
-        return timeline;
+    public TreeMap<DMY, List<String>> getTimeLine() {
+        return timeLine;
     }
 
     @Override
-    public void setTimeline(TreeMap<DMY, List<String>> timeline) {
-        this.timeline = timeline;
+    public void setTimeline(TreeMap<DMY, List<String>> timeLine) {
+        this.timeLine = timeLine;
     }
 
     @Override

+ 1 - 1
src/main/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/PersonSubSectionTimeLineWriterImpl.java

@@ -46,7 +46,7 @@ public class PersonSubSectionTimeLineWriterImpl implements PersonSubSectionTimeL
         timelineData.clear();
         timelineData.add(censusEntryList);
 
-        writeTimeLine.write(timelineData.getTimeline());
+        writeTimeLine.write(timelineData.getTimeLine());
     }
 
 

+ 20 - 2
src/test/java/scot/carricksoftware/grantswriter/data/TimeLineDataTest.java → src/test/java/scot/carricksoftware/grantswriter/data/TimeLineDataSetterAndGetterTest.java

@@ -11,7 +11,10 @@ import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.SortedSet;
+import java.util.TreeMap;
 import java.util.TreeSet;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -19,7 +22,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static scot.carricksoftware.grantswriter.GenerateCertificateRandomValues.GetRandomString;
 
 @ExtendWith(MockitoExtension.class)
-class TimeLineDataTest {
+class TimeLineDataSetterAndGetterTest {
 
 
     private TimeLineData timeLineData;
@@ -42,7 +45,7 @@ class TimeLineDataTest {
     }
 
     @Test
-    void getRefSTest(){
+    void getRefsTest(){
         assertEquals(0, timeLineData.getRefs().size());
     }
 
@@ -54,4 +57,19 @@ class TimeLineDataTest {
         assertEquals(refs, timeLineData.getRefs());
     }
 
+    @Test
+    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());
+    }
+
 }