Error fixes, Census name prefixed

src/main/java/scot/carricksoftware/grantswriter/data/TimeLineData.java

@@ -13,12 +13,10 @@ import java.util.TreeMap;
 
 public interface TimeLineData {
 
-    @SuppressWarnings("unused")
-    void clear();
-    @SuppressWarnings({"EmptyMethod", "unused"})
-
     void add(List<CensusEntry> censusEntryList);
 
+    void clear();
+
     @SuppressWarnings("unused")
     TreeMap<DMY, List<String>> getTimeLine();
 

src/main/java/scot/carricksoftware/grantswriter/data/TimeLineDataImpl.java

@@ -30,11 +30,6 @@ public class TimeLineDataImpl implements TimeLineData {
         this.refs = new TreeSet<>();
     }
 
-    @Override
-    public void clear() {
-        timeLine.clear();
-        refs.clear();
-    }
 
     @Override
     public void add(List<CensusEntry> censusEntryList) {
@@ -56,10 +51,16 @@ public class TimeLineDataImpl implements TimeLineData {
                                 censusEntry.getPersonalOccupation());
                 timeLine.put(dmyKey, existingValues);
             }
-            refs.add(censusEntry.getCensus().toString());
+            refs.add("Census: " + censusEntry.getCensus().toString());
         }
     }
 
+    @Override
+    public void clear() {
+        timeLine.clear();
+        refs.clear();
+    }
+
     @Override
     public TreeMap<DMY, List<String>> getTimeLine() {
         return timeLine;

src/main/java/scot/carricksoftware/grantswriter/services/censusentry/CensusEntryServiceImpl.java

@@ -36,7 +36,6 @@ public class CensusEntryServiceImpl implements CensusEntryService {
         for (CensusEntry censusEntry : censusEntryIterable) {
             result.add(censusEntry);
         }
-        censusEntryIterable.forEach(result::add);
         return result;
     }
 

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

@@ -23,6 +23,7 @@ import java.util.TreeMap;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.when;
+import static scot.carricksoftware.grantswriter.GenerateCertificateRandomValues.GetRandomString;
 
 @ExtendWith(MockitoExtension.class)
 class TimeLineDataAddTest {
@@ -46,6 +47,7 @@ class TimeLineDataAddTest {
 
     @Test
     void timeLineAddRefsTest() {
+        String censusString = GetRandomString();
         List<CensusEntry> censusEntryList = new ArrayList<>();
         CensusEntry censusEntry = new CensusEntry();
 
@@ -53,14 +55,14 @@ class TimeLineDataAddTest {
         censusEntryList.add(censusEntry);
         when(censusMock.getCensusDate()).thenReturn(CensusDate.CENSUS_1861);
         when(censusMock.getPlace()).thenReturn(placeMock);
-        when(censusMock.toString()).thenReturn("Edinburgh");
+        when(censusMock.toString()).thenReturn(censusString);
 
 
         SortedSet<String> refs;
         timeLineData.add(censusEntryList);
         refs = timeLineData.getRefs();
 
-        assertEquals("Edinburgh", refs.first());
+        assertEquals("Census: " + censusString, refs.first());
     }
 
     @Test