Addressed Review Comments

ministryofjustice · May 14, 2024 · 6a3648c · 6a3648c
1 parent ddd6634
commit 6a3648c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 30 deletions.
diff --git a/...ence/src/main/java/uk/gov/justice/laa/crime/evidence/staticdata/enums/IncomeEvidence.java b/...ence/src/main/java/uk/gov/justice/laa/crime/evidence/staticdata/enums/IncomeEvidence.java
@@ -8,9 +8,6 @@
 
 import java.util.stream.Stream;
 
-/**
- * static data migrated from TOGDATA.EVIDENCE_FEE_RULES table
- */
 @Getter
 @AllArgsConstructor
 @JsonInclude(JsonInclude.Include.NON_NULL)

diff --git a/.../src/test/java/uk/gov/justice/laa/crime/evidence/staticdata/enums/IncomeEvidenceTest.java b/.../src/test/java/uk/gov/justice/laa/crime/evidence/staticdata/enums/IncomeEvidenceTest.java
@@ -13,44 +13,20 @@ void givenABlankString_whenGetFromIsInvoked_thenNullIsReturned() {
     }
 
     @Test
-    void valueOfCurrentStatusFromString_nullParameter_ReturnsNull() {
+    void givenAInValidValue_whenGetFromIsInvoked_thenReturnsException() {
         assertThatThrownBy(
                 () -> IncomeEvidence.getFrom("MOCK_RESULT_STRING")
         ).isInstanceOf(IllegalArgumentException.class);
     }
 
     @Test
-    void testGetFrom() {
+    void givenAValidValue_whenGetFromIsInvoked_thenReturnsValue() {
         IncomeEvidence result = IncomeEvidence.getFrom("SIGNATURE");
         assertThat(result).isEqualTo(IncomeEvidence.SIGNATURE);
     }
 
     @Test
-    void testValues() {
-        IncomeEvidence[] result = IncomeEvidence.values();
-        assertThat(result).isEqualTo(new IncomeEvidence[]{
-                IncomeEvidence.SIGNATURE,
-                IncomeEvidence.CDS15,
-                IncomeEvidence.FREEZING,
-                IncomeEvidence.RESTRAINING,
-                IncomeEvidence.CONFISCATION,
-                IncomeEvidence.OTHER_ADHOC,
-                IncomeEvidence.EMP_LETTER_ADHOC,
-                IncomeEvidence.WAGE_SLIP_ADHOC,
-                IncomeEvidence.NINO,
-                IncomeEvidence.ACCOUNTS,
-                IncomeEvidence.OTHER_BUSINESS,
-                IncomeEvidence.CASH_BOOK,
-                IncomeEvidence.WAGE_SLIP,
-                IncomeEvidence.BANK_STATEMENT,
-                IncomeEvidence.TAX_RETURN,
-                IncomeEvidence.EMP_LETTER,
-                IncomeEvidence.OTHER
-        });
-    }
-
-    @Test
-    void testValueOf() {
+    void givenAValidValue_whenGetFromIsInvoked_thenCorrectValueIsReturned() {
         IncomeEvidence result = IncomeEvidence.valueOf("SIGNATURE");
         assertThat(result).isEqualTo(IncomeEvidence.SIGNATURE);
     }