NIAD-3137: Refactor to use IsEqualToIgnoringWhitespace

A quick refactor to use IsEqualToIgnoringWhitespace rather than helper method doing the same thing.

Author: MartinWheelerMT

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

@@ -227,7 +227,8 @@ public void When_MappingEncounterComponents_Expect_ResourceMapped() {
 
         System.out.println(mappedXml);
 
-        assertThat(removeLineEndingsAndWhiteSpace(mappedXml)).isEqualTo(removeLineEndingsAndWhiteSpace(expectedXml));
+        assertThat(mappedXml)
+            .isEqualToIgnoringWhitespace(expectedXml);
     }
 
     @Test
@@ -238,7 +239,8 @@ public void When_MappingEncounterComponents_Expect_IgnoredResourceNotMapped() {
         var encounter = extractEncounter(bundle);
 
         String mappedXml = encounterComponentsMapper.mapComponents(encounter);
-        assertThat(removeLineEndingsAndWhiteSpace(mappedXml)).isEqualTo(removeLineEndingsAndWhiteSpace(expectedXml));
+        assertThat(mappedXml)
+            .isEqualToIgnoringWhitespace(expectedXml);
     }
 
     @ParameterizedTest
@@ -307,7 +309,8 @@ public void When_MappingTopic_With_RelatedProblem_Expect_MappedToCode() {
 
         String mappedXml = encounterComponentsMapper.mapComponents(encounter);
 
-        assertThat(removeLineEndingsAndWhiteSpace(mappedXml)).isEqualTo(removeLineEndingsAndWhiteSpace(expectedXml));
+        assertThat(mappedXml)
+            .isEqualToIgnoringWhitespace(expectedXml);
     }
 
     @Test
@@ -321,7 +324,8 @@ public void When_MappingTopic_With_RelatedProblemAndNoTitle_Expect_MappedToCode(
 
         String mappedXml = encounterComponentsMapper.mapComponents(encounter);
 
-        assertThat(removeLineEndingsAndWhiteSpace(mappedXml)).isEqualTo(removeLineEndingsAndWhiteSpace(expectedXml));
+        assertThat(mappedXml)
+            .isEqualToIgnoringWhitespace(expectedXml);
     }
 
     @Test
@@ -332,7 +336,8 @@ public void When_MappingTopic_With_MissingDate_Expect_DateMappedFromEncounter()
 
         String mappedXml = encounterComponentsMapper.mapComponents(encounter);
 
-        assertThat(removeLineEndingsAndWhiteSpace(mappedXml)).isEqualTo(removeLineEndingsAndWhiteSpace(expectedXml));
+        assertThat(mappedXml)
+            .isEqualToIgnoringWhitespace(expectedXml);
     }
 
     @Test
@@ -346,7 +351,8 @@ public void When_MappingCategory_WithAndWithout_Title_Expect_BothCdsPresent() {
 
         String mappedXml = encounterComponentsMapper.mapComponents(encounter);
 
-        assertThat(removeLineEndingsAndWhiteSpace(mappedXml)).isEqualTo(removeLineEndingsAndWhiteSpace(expectedXml));
+        assertThat(mappedXml)
+            .isEqualToIgnoringWhitespace(expectedXml);
     }
 
     @Test
@@ -361,7 +367,8 @@ public void When_MappingTopic_WithAndWithout_Title_Expect_BothCdsPresent() {
 
         String mappedXml = encounterComponentsMapper.mapComponents(encounter);
 
-        assertThat(removeLineEndingsAndWhiteSpace(mappedXml)).isEqualTo(removeLineEndingsAndWhiteSpace(expectedXml));
+        assertThat(mappedXml)
+            .isEqualToIgnoringWhitespace(expectedXml);
     }
 
     @Test
@@ -372,7 +379,8 @@ public void When_MappingTopic_WithoutCategory_Expect_ComponentsMapped() {
 
         String mappedXml = encounterComponentsMapper.mapComponents(encounter);
 
-        assertThat(removeLineEndingsAndWhiteSpace(mappedXml)).isEqualTo(removeLineEndingsAndWhiteSpace(expectedXml));
+        assertThat(mappedXml)
+            .isEqualToIgnoringWhitespace(expectedXml);
     }
 
     @ParameterizedTest
@@ -386,7 +394,8 @@ public void When_MappingContainedResource_Expect_ResourcesMapped(String inputBun
 
         System.out.println(mappedXml);
 
-        assertThat(removeLineEndingsAndWhiteSpace(mappedXml)).isEqualTo(removeLineEndingsAndWhiteSpace(expectedXml));
+        assertThat(mappedXml)
+            .isEqualToIgnoringWhitespace(expectedXml);
     }
 
     @Test
@@ -469,17 +478,6 @@ private static Stream<Arguments> containedResourceMappingArguments() {
         );
     }
 
-    private String removeLineEndingsAndWhiteSpace(String input) {
-        return input
-            .replace("\n", " ")
-            .replace("\r", " ")
-            .replaceAll("\\s+", " ")
-            .replaceAll("\"\\s>", "\">")
-            .replaceAll("\"\\s/>", "\"/>")
-            .replaceAll("\\s+<", "<");
-
-    }
-
     private Encounter extractEncounter(Bundle bundle) {
         return (Encounter) bundle.getEntry().stream()
             .map(Bundle.BundleEntryComponent::getResource)