CapitalisePersonTest

docs/additions.txt

@@ -12,6 +12,9 @@
 10.1: Uppercase on save
 11: Validator
 12: Validator Test
+12.1 Capitalisation
+12.2 Capitalisation Test
+12.3 Capitalisation Integration Test
 13: Switch to uat
 13A: In the database window select the uat database *** and then refresh it***
 14: Generate changelog (ctrl-shift-A) as sql

src/main/java/scot/carricksoftware/grants/capitalisation/census/census/CapitaliseCensusImpl.java

@@ -5,15 +5,18 @@
 
 package scot.carricksoftware.grants.capitalisation.census.census;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.stereotype.Component;
 import scot.carricksoftware.grants.commands.census.CensusCommand;
 
 @Component
 public class CapitaliseCensusImpl implements CapitaliseCensus {
+    private static final Logger logger = LogManager.getLogger(CapitaliseCensusImpl.class);
 
     @Override
     public void capitalise(CensusCommand censusCommand) {
-
+        logger.debug("CapitaliseCensusImpl::capitalise - no action required!");
     }
 
 

src/main/java/scot/carricksoftware/grants/capitalisation/census/censusentry/CapitaliseCensusEntry.java

@@ -10,5 +10,5 @@ import scot.carricksoftware.grants.commands.census.CensusEntryCommand;
 public interface CapitaliseCensusEntry {
 
     @SuppressWarnings("EmptyMethod")
-    void capitalise(CensusEntryCommand command);
+    void capitalise(@SuppressWarnings("unused") CensusEntryCommand command);
 }

src/main/java/scot/carricksoftware/grants/capitalisation/census/censusentry/CapitaliseCensusEntryImpl.java

@@ -5,17 +5,20 @@
 
 package scot.carricksoftware.grants.capitalisation.census.censusentry;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.stereotype.Component;
 import scot.carricksoftware.grants.commands.census.CensusEntryCommand;
 
 @Component
 public class CapitaliseCensusEntryImpl implements CapitaliseCensusEntry {
 
+    private static final Logger logger = LogManager.getLogger(CapitaliseCensusEntryImpl.class);
+
     @Override
     public void capitalise(CensusEntryCommand censusEntryCommand) {
-
+        logger.debug("CapitaliseCensusEntryImpl::capitalise - no action required!");
     }
 
 
-
 }

src/main/java/scot/carricksoftware/grants/capitalisation/certificates/birthcertificate/CapitaliseBirthCertificateImpl.java

@@ -5,6 +5,8 @@
 
 package scot.carricksoftware.grants.capitalisation.certificates.birthcertificate;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.stereotype.Component;
 import scot.carricksoftware.grants.capitalisation.CapitaliseString;
 import scot.carricksoftware.grants.commands.certificates.birthcertificates.BirthCertificateCommand;
@@ -12,7 +14,9 @@ import scot.carricksoftware.grants.commands.certificates.birthcertificates.Birth
 @Component
 public class CapitaliseBirthCertificateImpl implements CapitaliseBirthCertificate {
 
-   private final CapitaliseString capitaliseString;
+    private static final Logger logger = LogManager.getLogger(CapitaliseBirthCertificateImpl.class);
+
+    private final CapitaliseString capitaliseString;
 
     public CapitaliseBirthCertificateImpl(CapitaliseString capitaliseString) {
         this.capitaliseString = capitaliseString;
@@ -20,6 +24,7 @@ public class CapitaliseBirthCertificateImpl implements CapitaliseBirthCertificat
 
     @Override
     public void capitalise(BirthCertificateCommand birthCertificateCommand) {
+        logger.debug("CapitaliseBirthCertificate::capitalise");
         birthCertificateCommand.setInformantQualification(capitaliseString.capitalise(birthCertificateCommand.getInformantQualification()));
         birthCertificateCommand.setUntrackedWhereBorn(capitaliseString.capitalise(birthCertificateCommand.getUntrackedWhereBorn()));
         birthCertificateCommand.setUntrackedFather(capitaliseString.capitalise(birthCertificateCommand.getUntrackedFather()));
@@ -28,6 +33,4 @@ public class CapitaliseBirthCertificateImpl implements CapitaliseBirthCertificat
         birthCertificateCommand.setCertificateNumber(capitaliseString.capitalise(birthCertificateCommand.getCertificateNumber()));
     }
 
-
-
 }

src/main/java/scot/carricksoftware/grants/capitalisation/people/CapitalisePersonImpl.java

@@ -5,15 +5,28 @@
 
 package scot.carricksoftware.grants.capitalisation.people;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.stereotype.Component;
+import scot.carricksoftware.grants.capitalisation.CapitaliseString;
 import scot.carricksoftware.grants.commands.people.PersonCommand;
 
 @Component
 public class CapitalisePersonImpl implements CapitalisePerson {
 
+    private static final Logger logger = LogManager.getLogger(CapitalisePersonImpl.class);
+
+    private final CapitaliseString capitaliseString;
+
+    public CapitalisePersonImpl(CapitaliseString capitaliseString) {
+        this.capitaliseString = capitaliseString;
+    }
+
     @Override
     public void capitalise(PersonCommand personCommand) {
-
+        logger.debug("CapitalisePersonImpl::capitalise");
+        personCommand.setFirstName(capitaliseString.capitalise(personCommand.getFirstName()));
+        personCommand.setLastName(capitaliseString.capitalise(personCommand.getLastName()));
     }
 
 

src/main/java/scot/carricksoftware/grants/commands/people/PersonCommandImpl.java

@@ -5,6 +5,7 @@
 
 package scot.carricksoftware.grants.commands.people;
 
+import org.springframework.stereotype.Component;
 import scot.carricksoftware.grants.domains.census.CensusEntry;
 import scot.carricksoftware.grants.domains.certificates.BirthCertificate;
 import scot.carricksoftware.grants.domains.certificates.DeathCertificate;
@@ -16,6 +17,7 @@ import scot.carricksoftware.grants.domains.text.PersonText;
 import java.util.ArrayList;
 import java.util.List;
 
+@Component
 public class PersonCommandImpl implements PersonCommand {
 
     private Long Id;

src/test/java/scot/carricksoftware/grants/capitalisation/people/CapitalisePersonTest.java

@@ -7,22 +7,41 @@ package scot.carricksoftware.grants.capitalisation.people;
 
 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.grants.capitalisation.CapitaliseString;
+import scot.carricksoftware.grants.commands.people.PersonCommand;
+import scot.carricksoftware.grants.commands.people.PersonCommandImpl;
 
-import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.when;
 
 
+@ExtendWith(MockitoExtension.class)
 class CapitalisePersonTest {
 
-
     private CapitalisePerson capitalisePerson;
 
+    private PersonCommand personCommand;
+
+    @Mock
+    private CapitaliseString capitaliseStringMock;
+
     @BeforeEach
     void setUp() {
-        capitalisePerson = new CapitalisePersonImpl();
+        capitalisePerson = new CapitalisePersonImpl(capitaliseStringMock);
+        personCommand = new PersonCommandImpl();
+        when(capitaliseStringMock.capitalise("first")).thenReturn("First");
+        when(capitaliseStringMock.capitalise("last")).thenReturn("Last");
     }
 
     @Test
-    void constructorTest() {
-        assertNotNull(capitalisePerson);
+    void nameTest() {
+        personCommand.setFirstName("first");
+        personCommand.setLastName("last");
+        capitalisePerson.capitalise(personCommand);
+        assertEquals("First", personCommand.getFirstName());
+        assertEquals("Last", personCommand.getLastName());
     }
 }

src/test/java/scot/carricksoftware/grants/controllers/places/regions/RegionFormControllerCleansingTest.java

@@ -5,7 +5,6 @@
 
 package scot.carricksoftware.grants.controllers.places.regions;
 
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -25,7 +24,6 @@ import scot.carricksoftware.grants.validators.places.RegionCommandValidator;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-
 @ExtendWith(MockitoExtension.class)
 public class RegionFormControllerCleansingTest {