[NIAD-3144] Improve test assertions

NHSDigital · Aug 19, 2024 · 8053607 · 8053607
1 parent dcce21a
commit 8053607
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/service/src/test/java/uk/nhs/adaptors/gp2gp/TestUtility.java b/service/src/test/java/uk/nhs/adaptors/gp2gp/TestUtility.java
@@ -8,6 +8,7 @@
 
 public final class TestUtility {
     private TestUtility() { }
+    private static final String CONFIDENTIALITY_CODE = "confidentialityCode";
     private static final String NOPAT_CONFIDENTIALITY_CODE = """
         <confidentialityCode
             code="NOPAT"
@@ -36,8 +37,8 @@ public static void assertThatXmlContainsNopatConfidentialityCode(String xml) {
         assertThat(xml).contains(NOPAT_CONFIDENTIALITY_CODE);
     }
 
-    public static void assertThatXmlDoesNotContainNopatConfidentialityCode(String xml) {
-        assertThat(xml).doesNotContain(NOPAT_CONFIDENTIALITY_CODE);
+    public static void assertThatXmlDoesNotContainConfidentialityCode(String xml) {
+        assertThat(xml).doesNotContain(CONFIDENTIALITY_CODE);
     }
 
     public static <R extends DomainResource> String getSecurityCodeFromResource(R resource) {

diff --git a/...st/java/uk/nhs/adaptors/gp2gp/ehr/mapper/diagnosticreport/DiagnosticReportMapperTest.java b/...st/java/uk/nhs/adaptors/gp2gp/ehr/mapper/diagnosticreport/DiagnosticReportMapperTest.java
@@ -167,7 +167,7 @@ void When_DiagnosticReport_With_NoscrubMetaSecurity_Expect_ConfidentialityCodeNo
         final String result = mapper.mapDiagnosticReportToCompoundStatement(diagnosticReport);
 
         assertAll(
-            () -> TestUtility.assertThatXmlDoesNotContainNopatConfidentialityCode(result),
+            () -> TestUtility.assertThatXmlDoesNotContainConfidentialityCode(result),
             () -> assertThat(TestUtility.getSecurityCodeFromResource(diagnosticReport)).isEqualTo("NOSCRUB")
         );
     }