浏览代码

Military attributes death certificate command

Andrew Grant 4 月之前
父节点
当前提交
c45e1cffab

+ 12 - 0
src/main/java/scot/carricksoftware/grants/commands/certificates/deathcertificates/DeathCertificateCommand.java

@@ -98,4 +98,16 @@ public interface DeathCertificateCommand {
     String getNumber();
 
     void setNumber(String number);
+
+    String getRegiment();
+
+    void setRegiment(String regiment);
+
+    String getServiceRank();
+
+    void setServiceRank(String serviceRank);
+
+    String getServiceNumber();
+
+    void setServiceNumber(String serviceNumber);
 }

+ 33 - 0
src/main/java/scot/carricksoftware/grants/commands/certificates/deathcertificates/DeathCertificateCommandImpl.java

@@ -48,6 +48,9 @@ public class DeathCertificateCommandImpl implements DeathCertificateCommand {
     private String whenDied;
     private String whenRegistered;
     private String whereRegistered;
+    private String regiment;
+    private String serviceNumber;
+    private String serviceRank;
 
     @Override
     public Long getId() {
@@ -398,4 +401,34 @@ public class DeathCertificateCommandImpl implements DeathCertificateCommand {
     public void setNumber(String number) {
         this.number = number;
     }
+
+    @Override
+    public String getRegiment() {
+        return regiment;
+    }
+
+    @Override
+    public void setRegiment(String regiment) {
+        this.regiment = regiment;
+    }
+
+    @Override
+    public String getServiceRank() {
+        return serviceRank;
+    }
+
+    @Override
+    public void setServiceRank(String serviceRank) {
+        this.serviceRank = serviceRank;
+    }
+
+    @Override
+    public String getServiceNumber() {
+        return serviceNumber;
+    }
+
+    @Override
+    public void setServiceNumber(String serviceNumber) {
+        this.serviceNumber = serviceNumber;
+    }
 }

+ 62 - 0
src/test/java/scot/carricksoftware/grants/commands/certificates/death/DeathCertificateCommandMilitaryTest.java

@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2025.  Andrew Grant Carrick Software. All rights reserved
+ *
+ */
+
+package scot.carricksoftware.grants.commands.certificates.death;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import scot.carricksoftware.grants.commands.certificates.deathcertificates.DeathCertificateCommand;
+import scot.carricksoftware.grants.commands.certificates.deathcertificates.DeathCertificateCommandImpl;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static scot.carricksoftware.grants.GenerateCertificateRandomValues.GetRandomString;
+
+class DeathCertificateCommandMilitaryTest {
+
+    private DeathCertificateCommand deathCertificateCommand;
+
+    @BeforeEach
+    void setUp() {
+        deathCertificateCommand = new DeathCertificateCommandImpl();
+    }
+
+    @Test
+    void getRegimentTest() {
+        assertNull(deathCertificateCommand.getRegiment());
+    }
+
+    @Test
+    void setRegimentTest() {
+        String regiment = GetRandomString();
+        deathCertificateCommand.setRegiment(regiment);
+        assertEquals(regiment, deathCertificateCommand.getRegiment());
+    }
+
+    @Test
+    void getServiceNumberTest() {
+        assertNull(deathCertificateCommand.getServiceNumber());
+    }
+
+    @Test
+    void setServiceNumberTest() {
+        String serviceNumber = GetRandomString();
+        deathCertificateCommand.setServiceNumber(serviceNumber);
+        assertEquals(serviceNumber, deathCertificateCommand.getServiceNumber());
+    }
+
+    @Test
+    void getServiceRankTest() {
+        assertNull(deathCertificateCommand.getServiceRank());
+    }
+
+    @Test
+    void setServiceRankTest() {
+        String serviceRank = GetRandomString();
+        deathCertificateCommand.setServiceRank(serviceRank);
+        assertEquals(serviceRank, deathCertificateCommand.getServiceRank());
+    }
+
+}