Browse Source

WhereBorn added to converters

Andrew Grant 5 months ago
parent
commit
3197543e30

+ 1 - 0
src/main/java/scot/carricksoftware/grants/converters/certificates/birthcertificates/BirthCertificateCommandConverterImpl.java

@@ -28,6 +28,7 @@ public class BirthCertificateCommandConverterImpl implements BirthCertificateCom
         target.setNumber(source.getNumber());
         target.setNumber(source.getNumber());
         target.setSex(source.getSex());
         target.setSex(source.getSex());
         target.setWhenBorn(source.getWhenBorn());
         target.setWhenBorn(source.getWhenBorn());
+        target.setWhereBorn(source.getWhereBorn());
         target.setUntrackedWhereBorn(source.getUntrackedWhereBorn());
         target.setUntrackedWhereBorn(source.getUntrackedWhereBorn());
         target.setFather(source.getFather());
         target.setFather(source.getFather());
         target.setUntrackedFather(source.getUntrackedFather());
         target.setUntrackedFather(source.getUntrackedFather());

+ 1 - 0
src/main/java/scot/carricksoftware/grants/converters/certificates/birthcertificates/BirthCertificateConverterImpl.java

@@ -32,6 +32,7 @@ public class BirthCertificateConverterImpl implements BirthCertificateConverter
         target.setNumber(source.getNumber());
         target.setNumber(source.getNumber());
         target.setSex(source.getSex());
         target.setSex(source.getSex());
         target.setWhenBorn(source.getWhenBorn());
         target.setWhenBorn(source.getWhenBorn());
+        target.setWhereBorn(source.getWhereBorn());
         target.setUntrackedWhereBorn(source.getUntrackedWhereBorn());
         target.setUntrackedWhereBorn(source.getUntrackedWhereBorn());
         target.setFather(source.getFather());
         target.setFather(source.getFather());
         target.setUntrackedFather(source.getUntrackedFather());
         target.setUntrackedFather(source.getUntrackedFather());

+ 2 - 4
src/test/java/scot/carricksoftware/grants/bootstrap/DataLoadCertificatesBirthCertificatesTest.java

@@ -79,8 +79,8 @@ public class DataLoadCertificatesBirthCertificatesTest {
         assertEquals(certificateSourceMock, captor.getValue().getCertificateSource());
         assertEquals(certificateSourceMock, captor.getValue().getCertificateSource());
         assertEquals(newBornMock, captor.getValue().getNewBorn());
         assertEquals(newBornMock, captor.getValue().getNewBorn());
         assertEquals(Sex.MALE, captor.getValue().getSex());
         assertEquals(Sex.MALE, captor.getValue().getSex());
-        assertEquals("25/01/1953 01:01",captor.getValue().getWhenBorn());
-        assertEquals("Edinburgh",captor.getValue().getUntrackedWhereBorn());
+        assertEquals("25/01/1953 01:01", captor.getValue().getWhenBorn());
+        assertEquals("Edinburgh", captor.getValue().getUntrackedWhereBorn());
         assertEquals(fatherMock, captor.getValue().getFather());
         assertEquals(fatherMock, captor.getValue().getFather());
         assertEquals("Untracked Father", captor.getValue().getUntrackedFather());
         assertEquals("Untracked Father", captor.getValue().getUntrackedFather());
         assertEquals(motherMock, captor.getValue().getMother());
         assertEquals(motherMock, captor.getValue().getMother());
@@ -89,6 +89,4 @@ public class DataLoadCertificatesBirthCertificatesTest {
     }
     }
 
 
 
 
-
-
 }
 }

+ 1 - 1
src/test/java/scot/carricksoftware/grants/validators/certificates/birthcertificate/BirthCertificateCommandPartThreeValidatorTest.java

@@ -71,7 +71,7 @@ class BirthCertificateCommandPartThreeValidatorTest {
         when(birthCertificateCommandMock.getUntrackedFather()).thenReturn(untrackedFather);
         when(birthCertificateCommandMock.getUntrackedFather()).thenReturn(untrackedFather);
         when(birthCertificateCommandMock.getFather()).thenReturn(father);
         when(birthCertificateCommandMock.getFather()).thenReturn(father);
         validator.validate(birthCertificateCommandMock, bindingResultMock);
         validator.validate(birthCertificateCommandMock, bindingResultMock);
-        verify(validateTypesMock).validatePersonAndUntrackedPerson(father, untrackedFather, "father", "untrackedFather","One and only one father and untracked father must be specified.", bindingResultMock);
+        verify(validateTypesMock).validatePersonAndUntrackedPerson(father, untrackedFather, "father", "untrackedFather", "One and only one father and untracked father must be specified.", bindingResultMock);
     }
     }
 
 
 
 

+ 0 - 1
src/test/java/scot/carricksoftware/grants/validators/helpers/ValidateTypesPersonAndUntrackedPersonTest.java

@@ -79,5 +79,4 @@ class ValidateTypesPersonAndUntrackedPersonTest {
     }
     }
 
 
 
 
-
 }
 }