Refactor: Replace useless numbers in test filenamess with descriptions

The expected XML filenames had an integer value which is printed out
by JUnit as part of the MethodSource ParameterizedTest execution.
As a result these filenames are useless as the description of what
each filename meant was within the Java constants.

Inline each constant, and rename the expected filenames to be more
descriptive.

Author: adrianclay

service/src/test/java/uk/nhs/adaptors/gp2gp/ehr/mapper/AllergyStructureMapperTest.java

@@ -89,44 +89,6 @@ public class AllergyStructureMapperTest {
         + "example-allergy-intolerance-resource-25.json";
 
 
-    private static final String OUTPUT_XML_USES_OPTIONAL_TEXT_FIELDS = TEST_FILE_DIRECTORY + "expected-output-allergy-structure-1.xml";
-    private static final String OUTPUT_XML_USES_NO_OPTIONAL_TEXT_FIELDS = TEST_FILE_DIRECTORY + "expected-output-allergy-structure-2.xml";
-    private static final String OUTPUT_XML_USES_PATIENT_RECORDER_AND_ASSERTER = TEST_FILE_DIRECTORY
-        + "expected-output-allergy-structure-3.xml";
-    private static final String OUTPUT_XML_USES_DATES = TEST_FILE_DIRECTORY + "expected-output-allergy-structure-4.xml";
-    private static final String OUTPUT_XML_USES_ONSET_DATE = TEST_FILE_DIRECTORY + "expected-output-allergy-structure-5.xml";
-    private static final String OUTPUT_XML_USES_NULL_FLAVOR_DATE = TEST_FILE_DIRECTORY + "expected-output-allergy-structure-6.xml";
-    private static final String OUTPUT_XML_USES_ENVIRONMENT_CATEGORY = TEST_FILE_DIRECTORY + "expected-output-allergy-structure-7.xml";
-    private static final String OUTPUT_XML_USES_MEDICATION_CATEGORY = TEST_FILE_DIRECTORY + "expected-output-allergy-structure-8.xml";
-    private static final String OUTPUT_XML_USES_REACTION = TEST_FILE_DIRECTORY + "expected-output-allergy-structure-9.xml";
-    private static final String OUTPUT_XML_USES_RELATION_TO_CONDITION_WITH_ONE_NOTE = TEST_FILE_DIRECTORY
-        + "expected-output-allergy-structure-10.xml";
-    private static final String OUTPUT_XML_USES_RELATION_TO_CONDITION_WITH_TWO_NOTES = TEST_FILE_DIRECTORY
-        + "expected-output-allergy-structure-11.xml";
-    private static final String OUTPUT_XML_USES_NO_RELATION_TO_CONDITION = TEST_FILE_DIRECTORY + "expected-output-allergy-structure-12.xml";
-    private static final String OUTPUT_XML_USES_RECORDER_AND_ASSERTER = TEST_FILE_DIRECTORY
-        + "expected-output-allergy-structure-13.xml";
-    private static final String OUTPUT_XML_USES_DEVICE_RECORDER_AND_ASSERTER = TEST_FILE_DIRECTORY
-        + "expected-output-allergy-structure-14.xml";
-    private static final String OUTPUT_XML_USES_RELATED_PERSON_ASSERTER = TEST_FILE_DIRECTORY
-        + "expected-output-allergy-structure-15.xml";
-    private static final String OUTPUT_XML_USES_RELATED_PERSON_ASSERTER_NO_NAME = TEST_FILE_DIRECTORY
-        + "expected-output-allergy-structure-16.xml";
-    private static final String OUTPUT_XML_USES_END_DATE = TEST_FILE_DIRECTORY + "expected-output-allergy-structure-17.xml";
-    private static final String OUTPUT_XML_USES_NO_END_DATE = TEST_FILE_DIRECTORY
-        + "expected-output-allergy-structure-without-endDate.xml";
-    private static final String OUTPUT_XML_USES_NO_ASSERTED_DATE = TEST_FILE_DIRECTORY
-            + "expected-output-allergy-structure-without-assertedDate.xml";
-    private static final String OUTPUT_XML_USES_NO_AUTHOR_OR_PERFORMER = TEST_FILE_DIRECTORY
-            + "expected-output-allergy-structure-18.xml";
-    private static final String OUTPUT_XML_USES_RECORDER_AS_PERFORMER_RELATED_PERSON_ASSERTER = TEST_FILE_DIRECTORY
-            + "expected-output-allergy-structure-19.xml";
-    private static final String OUTPUT_XML_USES_RECORDER_AS_PERFORMER_PATIENT_ASSERTER = TEST_FILE_DIRECTORY
-            + "expected-output-allergy-structure-20.xml";
-    private static final String OUTPUT_XML_USES_RECORDER_AS_FALLBACK_ASSERTER = TEST_FILE_DIRECTORY
-        + "expected-output-allergy-structure-21.xml";
-    private static final String OUTPUT_XML_USES_RESOLVED_CLINICAL_STATUS = TEST_FILE_DIRECTORY
-        + "expected-output-allergy-structure-22.xml";
     private static final String COMMON_ID = "6D340A1B-BC15-4D4E-93CF-BBCB5B74DF73";
 
     public static final String CONFIDENTIALITY_CODE = "<confidentialityCode code=\"NOPAT\" "
@@ -146,33 +108,34 @@ public class AllergyStructureMapperTest {
 
     private static Stream<Arguments> resourceFileParams() {
         return Stream.of(
-            Arguments.of(INPUT_JSON_WITH_OPTIONAL_TEXT_FIELDS, OUTPUT_XML_USES_OPTIONAL_TEXT_FIELDS),
-            Arguments.of(INPUT_JSON_WITH_NO_OPTIONAL_TEXT_FIELDS, OUTPUT_XML_USES_NO_OPTIONAL_TEXT_FIELDS),
-            Arguments.of(INPUT_JSON_WITH_PATIENT_RECORDER_AND_ASSERTER, OUTPUT_XML_USES_PATIENT_RECORDER_AND_ASSERTER),
-            Arguments.of(INPUT_JSON_WITH_RECORDER_AND_ASSERTER, OUTPUT_XML_USES_RECORDER_AND_ASSERTER),
-            Arguments.of(INPUT_JSON_WITH_DATES, OUTPUT_XML_USES_DATES),
-            Arguments.of(INPUT_JSON_WITH_ONSET_DATE_ONLY, OUTPUT_XML_USES_ONSET_DATE),
-            Arguments.of(INPUT_JSON_WITH_REASON_END_DATE_ONLY, OUTPUT_XML_USES_END_DATE),
-            Arguments.of(INPUT_JSON_WITH_NO_DATES, OUTPUT_XML_USES_NULL_FLAVOR_DATE),
-            Arguments.of(INPUT_JSON_WITH_ENVIRONMENT_CATEGORY, OUTPUT_XML_USES_ENVIRONMENT_CATEGORY),
-            Arguments.of(INPUT_JSON_WITH_MEDICATION_CATEGORY, OUTPUT_XML_USES_MEDICATION_CATEGORY),
-            Arguments.of(INPUT_JSON_WITH_REACTION, OUTPUT_XML_USES_REACTION),
-            Arguments.of(INPUT_JSON_WITH_RELATION_TO_CONDITION_WITH_ONE_NOTE, OUTPUT_XML_USES_RELATION_TO_CONDITION_WITH_ONE_NOTE),
-            Arguments.of(INPUT_JSON_WITH_RELATION_TO_CONDITION_WITH_TWO_NOTES, OUTPUT_XML_USES_RELATION_TO_CONDITION_WITH_TWO_NOTES),
-            Arguments.of(INPUT_JSON_WITH_NO_RELATION_TO_CONDITION, OUTPUT_XML_USES_NO_RELATION_TO_CONDITION),
-            Arguments.of(INPUT_JSON_WITH_DEVICE_RECORDER_AND_ASSERTER, OUTPUT_XML_USES_DEVICE_RECORDER_AND_ASSERTER),
-            Arguments.of(INPUT_JSON_WITH_RELATED_PERSON_ASSERTER, OUTPUT_XML_USES_RELATED_PERSON_ASSERTER),
-            Arguments.of(INPUT_JSON_WITH_RELATED_PERSON_ASSERTER_NAME_TEXT, OUTPUT_XML_USES_RELATED_PERSON_ASSERTER),
-            Arguments.of(INPUT_JSON_WITH_RELATED_PERSON_ASSERTER_NO_NAME, OUTPUT_XML_USES_RELATED_PERSON_ASSERTER_NO_NAME),
-            Arguments.of(INPUT_JSON_WITHOUT_END_DATE, OUTPUT_XML_USES_NO_END_DATE),
-            Arguments.of(INPUT_JSON_WITHOUT_ASSERTED_DATE, OUTPUT_XML_USES_NO_ASSERTED_DATE),
-            Arguments.of(INPUT_JSON_WITH_VALID_RECORDER_NO_ASSERTER, OUTPUT_XML_USES_RECORDER_AS_FALLBACK_ASSERTER),
-            Arguments.of(INPUT_JSON_WITH_INVALID_RECORDER_NO_ASSERTER, OUTPUT_XML_USES_NO_AUTHOR_OR_PERFORMER),
-            Arguments.of(INPUT_JSON_WITH_VALID_RECORDER_RELATED_PERSON_ASSERTER,
-                    OUTPUT_XML_USES_RECORDER_AS_PERFORMER_RELATED_PERSON_ASSERTER),
-            Arguments.of(INPUT_JSON_WITH_VALID_RECORDER_PATIENT_ASSERTER, OUTPUT_XML_USES_RECORDER_AS_PERFORMER_PATIENT_ASSERTER),
-            Arguments.of(INPUT_JSON_WITH_RESOLVED_CLINICAL_STATUS, OUTPUT_XML_USES_RESOLVED_CLINICAL_STATUS)
-
+            Arguments.of(INPUT_JSON_WITH_OPTIONAL_TEXT_FIELDS, "expected-uses-optional-text-fields.xml"),
+            Arguments.of(INPUT_JSON_WITH_NO_OPTIONAL_TEXT_FIELDS, "expected-uses-no-optional-text-fields.xml"),
+            Arguments.of(INPUT_JSON_WITH_PATIENT_RECORDER_AND_ASSERTER, "expected-uses-patient-recorder-and-asserter.xml"),
+            Arguments.of(INPUT_JSON_WITH_RECORDER_AND_ASSERTER, "expected-uses-recorder-and-asserter.xml"),
+            Arguments.of(INPUT_JSON_WITH_DATES, "expected-uses-dates.xml"),
+            Arguments.of(INPUT_JSON_WITH_ONSET_DATE_ONLY, "expected-uses-onset-date.xml"),
+            Arguments.of(INPUT_JSON_WITH_REASON_END_DATE_ONLY, "expected-uses-end-date.xml"),
+            Arguments.of(INPUT_JSON_WITH_NO_DATES, "expected-uses-null-flavor-date.xml"),
+            Arguments.of(INPUT_JSON_WITH_ENVIRONMENT_CATEGORY, "expected-uses-environment-category.xml"),
+            Arguments.of(INPUT_JSON_WITH_MEDICATION_CATEGORY, "expected-uses-medication-category.xml"),
+            Arguments.of(INPUT_JSON_WITH_REACTION, "expected-uses-reaction.xml"),
+            Arguments.of(INPUT_JSON_WITH_RELATION_TO_CONDITION_WITH_ONE_NOTE, "expected-uses-relation-to-condition-with-one-note.xml"),
+            Arguments.of(INPUT_JSON_WITH_RELATION_TO_CONDITION_WITH_TWO_NOTES, "expected-uses-relation-to-condition-with-two-notes.xml"),
+            Arguments.of(INPUT_JSON_WITH_NO_RELATION_TO_CONDITION, "expected-uses-no-relation-to-condition.xml"),
+            Arguments.of(INPUT_JSON_WITH_DEVICE_RECORDER_AND_ASSERTER, "expected-uses-device-recorder-and-asserter.xml"),
+            Arguments.of(INPUT_JSON_WITH_RELATED_PERSON_ASSERTER, "expected-uses-related-person-asserter.xml"),
+            Arguments.of(INPUT_JSON_WITH_RELATED_PERSON_ASSERTER_NAME_TEXT, "expected-uses-related-person-asserter.xml"),
+            Arguments.of(INPUT_JSON_WITH_RELATED_PERSON_ASSERTER_NO_NAME, "expected-uses-related-person-asserter-no-name.xml"),
+            Arguments.of(INPUT_JSON_WITHOUT_END_DATE, "expected-without-endDate.xml"),
+            Arguments.of(INPUT_JSON_WITHOUT_ASSERTED_DATE, "expected-without-assertedDate.xml"),
+            Arguments.of(INPUT_JSON_WITH_VALID_RECORDER_NO_ASSERTER, "expected-uses-recorder-as-fallback-asserter.xml"),
+            Arguments.of(INPUT_JSON_WITH_INVALID_RECORDER_NO_ASSERTER, "expected-uses-no-author-or-performer.xml"),
+            Arguments.of(
+                INPUT_JSON_WITH_VALID_RECORDER_RELATED_PERSON_ASSERTER,
+                "expected-uses-recorder-as-performer-related-person-asserter.xml"
+            ),
+            Arguments.of(INPUT_JSON_WITH_VALID_RECORDER_PATIENT_ASSERTER, "expected-uses-recorder-as-performer-patient-asserter.xml"),
+            Arguments.of(INPUT_JSON_WITH_RESOLVED_CLINICAL_STATUS, "expected-uses-resolved-clinical-status.xml")
         );
     }
 
@@ -224,7 +187,7 @@ private static Stream<Arguments> resourceInvalidFileParams() {
     @ParameterizedTest
     @MethodSource("resourceFileParams")
     public void When_MappingAllergyIntoleranceJson_Expect_AllergyStructureXmlOutput(String inputJson, String outputXml) {
-        final var expectedMessage = ResourceTestFileUtils.getFileContent(outputXml);
+        final var expectedMessage = ResourceTestFileUtils.getFileContent(TEST_FILE_DIRECTORY + outputXml);
         final var allergyIntolerance = parseAllergyIntoleranceFromJsonFile(inputJson);
 
         String message = allergyStructureMapper.mapAllergyIntoleranceToAllergyStructure(allergyIntolerance);