CapitaliseCensusTest

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

@@ -8,6 +8,7 @@ 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.capitalisation.CapitaliseString;
 import scot.carricksoftware.grants.commands.census.CensusEntryCommand;
 
 @Component
@@ -15,9 +16,19 @@ public class CapitaliseCensusEntryImpl implements CapitaliseCensusEntry {
 
     private static final Logger logger = LogManager.getLogger(CapitaliseCensusEntryImpl.class);
 
+    private final CapitaliseString capitaliseString;
+
+    public CapitaliseCensusEntryImpl(CapitaliseString capitaliseString) {
+        this.capitaliseString = capitaliseString;
+    }
+
     @Override
     public void capitalise(CensusEntryCommand censusEntryCommand) {
-        logger.debug("CapitaliseCensusEntryImpl::capitalise - no action required!");
+        logger.debug("CapitaliseCensusEntryImpl::capitalise");
+        censusEntryCommand.setWhereBorn(capitaliseString.capitalise(censusEntryCommand.getWhereBorn()));
+        censusEntryCommand.setPersonalOccupation(capitaliseString.capitalise(censusEntryCommand.getPersonalOccupation()));
+        censusEntryCommand.setNotes(capitaliseString.capitalise(censusEntryCommand.getNotes()));
+        censusEntryCommand.setPersonalOccupation(capitaliseString.capitalise(censusEntryCommand.getPersonalOccupation()));
     }
 
 

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

@@ -22,6 +22,7 @@ public class CapitaliseBirthCertificateImpl implements CapitaliseBirthCertificat
         this.capitaliseString = capitaliseString;
     }
 
+
     @Override
     public void capitalise(BirthCertificateCommand birthCertificateCommand) {
         logger.debug("CapitaliseBirthCertificate::capitalise");

src/test/java/scot/carricksoftware/grants/capitalisation/census/census/CapitaliseCensusTest.java

@@ -38,5 +38,6 @@ class CapitaliseCensusTest {
         censusCommand.setFilledInBy("lower");
         capitaliseCensus.capitalise(censusCommand);
         assertEquals("Lower", censusCommand.getFilledInBy());
+
     }
 }

src/test/java/scot/carricksoftware/grants/capitalisation/census/censusentry/CapitaliseCensusEntryTest.java

@@ -6,22 +6,11 @@
 package scot.carricksoftware.grants.capitalisation.census.censusentry;
 
 
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
 
-import static org.junit.jupiter.api.Assertions.assertNotNull;
 
+@ExtendWith(MockitoExtension.class)
 class CapitaliseCensusEntryTest {
 
-    private CapitaliseCensusEntry capitaliseCensusEntry;
-
-    @BeforeEach
-    void setUp() {
-        capitaliseCensusEntry = new CapitaliseCensusEntryImpl();
-    }
-
-    @Test
-    void constructorTest() {
-        assertNotNull(capitaliseCensusEntry);
-    }
 }

src/test/java/scot/carricksoftware/grants/capitalisation/certificates/birthcertificates/CapitaliseBirthCertificateBirthCertificateTest.java

@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2025.  Andrew Grant Carrick Software. All rights reserved
- *
- */
-
-package scot.carricksoftware.grants.capitalisation.certificates.birthcertificates;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.junit.jupiter.MockitoExtension;
-import scot.carricksoftware.grants.capitalisation.CapitaliseStringImpl;
-import scot.carricksoftware.grants.capitalisation.certificates.birthcertificate.CapitaliseBirthCertificate;
-import scot.carricksoftware.grants.capitalisation.certificates.birthcertificate.CapitaliseBirthCertificateImpl;
-import scot.carricksoftware.grants.commands.certificates.birthcertificates.BirthCertificateCommand;
-import scot.carricksoftware.grants.commands.certificates.birthcertificates.BirthCertificateCommandImpl;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-@ExtendWith(MockitoExtension.class)
-class CapitaliseBirthCertificateBirthCertificateTest {
-
-    private final CapitaliseStringImpl capitaliseString = new CapitaliseStringImpl();
-
-    @SuppressWarnings("unused")
-    private CapitaliseBirthCertificate capitaliseBirthCertificate;
-
-    @BeforeEach
-    void setUp() {
-        capitaliseBirthCertificate = new CapitaliseBirthCertificateImpl(capitaliseString);
-    }
-
-    @Test
-    void birthCertificateCommandTest() {
-        BirthCertificateCommand command = new BirthCertificateCommandImpl();
-        command.setInformantQualification("lower1");
-        command.setUntrackedInformant("lower2");
-        command.setUntrackedWhereBorn("lower3");
-        command.setUntrackedFather("lower4");
-        command.setWhenBorn("lower5");
-        command.setCertificateNumber("lower6");
-
-        capitaliseBirthCertificate.capitalise(command);
-        assertEquals("Lower1", command.getInformantQualification());
-        assertEquals("Lower2", command.getUntrackedInformant());
-        assertEquals("Lower3", command.getUntrackedWhereBorn());
-        assertEquals("Lower4", command.getUntrackedFather());
-        assertEquals("Lower5", command.getWhenBorn());
-        assertEquals("Lower6", command.getCertificateNumber());
-    }
-}