remove unnecessary usage of IsEqualToIgnoringWhitespace() (#1395)

Jonopono123 · web-flow · commit b6ef96a3808c · 2025-11-03T15:54:42.000Z
diff --git a/service/src/test/java/uk/nhs/adaptors/gp2gp/ehr/mapper/ObservationStatementMapperTest.java b/service/src/test/java/uk/nhs/adaptors/gp2gp/ehr/mapper/ObservationStatementMapperTest.java
@@ -261,7 +261,7 @@ void When_MappingObservationJson_Expect_ObservationStatementXmlOutput(String inp
         Observation parsedObservation = new FhirParseService().parseResource(jsonInput, Observation.class);
 
         String outputMessage = observationStatementMapper.mapObservationToObservationStatement(parsedObservation, false);
-        assertThat(outputMessage).isEqualToIgnoringWhitespace(expectedOutputMessage);
+        assertThat(outputMessage).isEqualTo(expectedOutputMessage);
     }
 
     @ParameterizedTest
diff --git a/service/src/test/resources/ehr/mapper/observation/expected-output-observation-statement-1.xml b/service/src/test/resources/ehr/mapper/observation/expected-output-observation-statement-1.xml
@@ -7,8 +7,6 @@
             <center value="20100714163251"/>
         </effectiveTime>
         <availabilityTime value="20100714163251"/>
-        
-        
         <pertinentInformation typeCode="PERT">
             <sequenceNumber value="+1" />
             <pertinentAnnotation classCode="OBS" moodCode="EVN">
@@ -27,6 +25,5 @@ The line below contains special characters...
 ¬`1234567890!&quot;£$%^&amp;*()_+=-{}][~@#&apos;:;&lt;&gt;?,./|\</text>
             </pertinentAnnotation>
         </pertinentInformation>
-        
     </ObservationStatement>
 </component>
diff --git a/service/src/test/resources/ehr/mapper/observation/expected-output-observation-statement-10.xml b/service/src/test/resources/ehr/mapper/observation/expected-output-observation-statement-10.xml
@@ -7,14 +7,11 @@
             <center value="20190601113000"/>
         </effectiveTime>
         <availabilityTime value="20190601113000"/>
-        
-        
         <pertinentInformation typeCode="PERT">
             <sequenceNumber value="+1" />
             <pertinentAnnotation classCode="OBS" moodCode="EVN">
                 <text>Range: Text: Test reference range text High: 20 Test comment</text>
             </pertinentAnnotation>
         </pertinentInformation>
-        
     </ObservationStatement>
 </component>
diff --git a/service/src/test/resources/ehr/mapper/observation/expected-output-observation-statement-11.xml b/service/src/test/resources/ehr/mapper/observation/expected-output-observation-statement-11.xml
@@ -7,8 +7,7 @@
             <center value="20190601113000"/>
         </effectiveTime>
         <availabilityTime value="20190601113000"/>
-        
-        <interpretationCode code="HI" codeSystem="2.16.840.1.113883.2.1.6.5" displayName="Above high reference limit">
+            <interpretationCode code="HI" codeSystem="2.16.840.1.113883.2.1.6.5" displayName="Above high reference limit">
     <originalText>Very High Value</originalText>
 </interpretationCode>
 
@@ -18,6 +17,5 @@
                 <text>Range: Text: Test reference range text High: 20 Test comment</text>
             </pertinentAnnotation>
         </pertinentInformation>
-        
     </ObservationStatement>
 </component>
diff --git a/service/src/test/resources/ehr/mapper/observation/expected-output-observation-statement-12.xml b/service/src/test/resources/ehr/mapper/observation/expected-output-observation-statement-12.xml
@@ -7,15 +7,12 @@
             <center value="20190601113000"/>
         </effectiveTime>
         <availabilityTime value="20190601113000"/>
-        
-        
         <pertinentInformation typeCode="PERT">
             <sequenceNumber value="+1" />
             <pertinentAnnotation classCode="OBS" moodCode="EVN">
                 <text>Range: Text: Test reference range text High: 20 Interpretation: Example without code
 Test comment</text>
             </pertinentAnnotation>
         </pertinentInformation>
-        
     </ObservationStatement>
 </component>
diff --git a/service/src/test/resources/ehr/mapper/observation/expected-output-observation-statement-13.xml b/service/src/test/resources/ehr/mapper/observation/expected-output-observation-statement-13.xml
@@ -7,15 +7,12 @@
             <center value="20190601113000"/>
         </effectiveTime>
         <availabilityTime value="20190601113000"/>
-        
-        
         <pertinentInformation typeCode="PERT">
             <sequenceNumber value="+1" />
             <pertinentAnnotation classCode="OBS" moodCode="EVN">
                 <text>Range: Text: Test reference range text High: 20 Interpretation: An example text string in interpretation
 Test comment</text>
             </pertinentAnnotation>
         </pertinentInformation>
-        
     </ObservationStatement>
 </component>
diff --git a/service/src/test/resources/ehr/mapper/observation/expected-output-observation-statement-14.xml b/service/src/test/resources/ehr/mapper/observation/expected-output-observation-statement-14.xml
@@ -7,15 +7,12 @@
             <center value="20190601113000"/>
         </effectiveTime>
         <availabilityTime value="20190601113000"/>
-        
-        
         <pertinentInformation typeCode="PERT">
             <sequenceNumber value="+1" />
             <pertinentAnnotation classCode="OBS" moodCode="EVN">
                 <text>Range: Text: Test reference range text High: 20 Interpretation: Example with userSelected
 Test comment</text>
             </pertinentAnnotation>
         </pertinentInformation>
-        
     </ObservationStatement>
 </component>
diff --git a/service/src/test/resources/ehr/mapper/observation/expected-output-observation-statement-15.xml b/service/src/test/resources/ehr/mapper/observation/expected-output-observation-statement-15.xml
@@ -7,8 +7,7 @@
             <center value="20190601113000"/>
         </effectiveTime>
         <availabilityTime value="20190601113000"/>
-        
-        <interpretationCode code="HI" codeSystem="2.16.840.1.113883.2.1.6.5" displayName="Above high reference limit">
+            <interpretationCode code="HI" codeSystem="2.16.840.1.113883.2.1.6.5" displayName="Above high reference limit">
     <originalText>Very High Value</originalText>
 </interpretationCode>
 
@@ -18,6 +17,5 @@
                 <text>Range: Text: Test reference range text High: 20 Test comment</text>
             </pertinentAnnotation>
         </pertinentInformation>
-        
     </ObservationStatement>
 </component>
diff --git a/service/src/test/resources/ehr/mapper/observation/expected-output-observation-statement-16.xml b/service/src/test/resources/ehr/mapper/observation/expected-output-observation-statement-16.xml
@@ -7,8 +7,7 @@
             <center value="20190601113000"/>
         </effectiveTime>
         <availabilityTime value="20190601113000"/>
-        
-        <interpretationCode code="LO" codeSystem="2.16.840.1.113883.2.1.6.5" displayName="Below low reference limit">
+            <interpretationCode code="LO" codeSystem="2.16.840.1.113883.2.1.6.5" displayName="Below low reference limit">
     <originalText>Low Value</originalText>
 </interpretationCode>
 
@@ -18,6 +17,5 @@
                 <text>Range: Text: Test reference range text Low: 20 Test comment</text>
             </pertinentAnnotation>
         </pertinentInformation>
-        
     </ObservationStatement>
 </component>
diff --git a/service/src/test/resources/ehr/mapper/observation/expected-output-observation-statement-17.xml b/service/src/test/resources/ehr/mapper/observation/expected-output-observation-statement-17.xml
@@ -7,8 +7,7 @@
             <center value="20190601113000"/>
         </effectiveTime>
         <availabilityTime value="20190601113000"/>
-        
-        <interpretationCode code="PA" codeSystem="2.16.840.1.113883.2.1.6.5" displayName="Potentially abnormal">
+            <interpretationCode code="PA" codeSystem="2.16.840.1.113883.2.1.6.5" displayName="Potentially abnormal">
     <originalText>Abnormal</originalText>
 </interpretationCode>
 
@@ -18,6 +17,5 @@
                 <text>Range: Text: Test reference range text High: 20 Test comment</text>
             </pertinentAnnotation>
         </pertinentInformation>
-        
     </ObservationStatement>
 </component>
diff --git a/service/src/test/resources/ehr/mapper/observation/expected-output-observation-statement-18.xml b/service/src/test/resources/ehr/mapper/observation/expected-output-observation-statement-18.xml
@@ -7,15 +7,12 @@
             <center value="20190601113000"/>
         </effectiveTime>
         <availabilityTime value="20190601113000"/>
-        
-        
         <pertinentInformation typeCode="PERT">
             <sequenceNumber value="+1" />
             <pertinentAnnotation classCode="OBS" moodCode="EVN">
                 <text>Test comment</text>
             </pertinentAnnotation>
         </pertinentInformation>
-        
         <Participant typeCode="PRF" contextControlCode="OP">
     <agentRef classCode="AGNT">
         <id root="394559384658936"/>
diff --git a/service/src/test/resources/ehr/mapper/observation/expected-output-observation-statement-19.xml b/service/src/test/resources/ehr/mapper/observation/expected-output-observation-statement-19.xml
@@ -7,14 +7,11 @@
             <center value="20100714163251"/>
         </effectiveTime>
         <availabilityTime value="20100714163251"/>
-        
-        
         <pertinentInformation typeCode="PERT">
             <sequenceNumber value="+1" />
             <pertinentAnnotation classCode="OBS" moodCode="EVN">
                 <text>Component(s): [Code: Allergy to penicillin Code Value: test-code Test display Interpretation Code: Example without userSelected Interpretation Text: Example interpretation text 1 Range: Low 0.1 mg/L High 0.6 mg/L] [Range: Low 55 mm] [Range: High 10.7 cm] Example comment</text>
             </pertinentAnnotation>
         </pertinentInformation>
-        
     </ObservationStatement>
 </component>
diff --git a/service/src/test/resources/ehr/mapper/observation/expected-output-observation-statement-2.xml b/service/src/test/resources/ehr/mapper/observation/expected-output-observation-statement-2.xml
@@ -7,8 +7,6 @@
             <center nullFlavor="UNK"/>
         </effectiveTime>
         <availabilityTime nullFlavor="UNK"/>
-        
-        
         <pertinentInformation typeCode="PERT">
             <sequenceNumber value="+1" />
             <pertinentAnnotation classCode="OBS" moodCode="EVN">
@@ -27,6 +25,5 @@ The line below contains special characters...
 ¬`1234567890!&quot;£$%^&amp;*()_+=-{}][~@#&apos;:;&lt;&gt;?,./|\</text>
             </pertinentAnnotation>
         </pertinentInformation>
-        
     </ObservationStatement>
 </component>
diff --git a/service/src/test/resources/ehr/mapper/observation/expected-output-observation-statement-20.xml b/service/src/test/resources/ehr/mapper/observation/expected-output-observation-statement-20.xml
@@ -7,14 +7,11 @@
             <center value="20100714163251"/>
         </effectiveTime>
         <availabilityTime value="20100714163251"/>
-        
-        
         <pertinentInformation typeCode="PERT">
             <sequenceNumber value="+1" />
             <pertinentAnnotation classCode="OBS" moodCode="EVN">
                 <text>Component(s): [Quantity Value: 7.2 g/dl] Example comment</text>
             </pertinentAnnotation>
         </pertinentInformation>
-        
     </ObservationStatement>
 </component>
diff --git a/service/src/test/resources/ehr/mapper/observation/expected-output-observation-statement-21.xml b/service/src/test/resources/ehr/mapper/observation/expected-output-observation-statement-21.xml
@@ -7,14 +7,11 @@
             <center value="20100714163251"/>
         </effectiveTime>
         <availabilityTime value="20100714163251"/>
-        
-        
         <pertinentInformation typeCode="PERT">
             <sequenceNumber value="+1" />
             <pertinentAnnotation classCode="OBS" moodCode="EVN">
                 <text>Component(s): [String Value: Example of a valueString] Example comment</text>
             </pertinentAnnotation>
         </pertinentInformation>
-        
     </ObservationStatement>
 </component>
diff --git a/service/src/test/resources/ehr/mapper/observation/expected-output-observation-statement-22.xml b/service/src/test/resources/ehr/mapper/observation/expected-output-observation-statement-22.xml
@@ -7,14 +7,11 @@
             <center value="20100714163251"/>
         </effectiveTime>
         <availabilityTime value="20100714163251"/>
-        
-        
         <pertinentInformation typeCode="PERT">
             <sequenceNumber value="+1" />
             <pertinentAnnotation classCode="OBS" moodCode="EVN">
                 <text>Component(s): [Code Value: test-code Example display valueCodeableConcept] [Range Value: Low 10.1 test-unit High 20.5 test-unit] [Ratio Value: &lt; 10 test-unit / &gt; 20 test-unit] [Time Value: 12:30:10] [DateTime Value: 2017-03-01 12:50:12] [Period Value: Start 2017-03-01 12:50:12 End 2018-06-03 14:12:10] Example comment</text>
             </pertinentAnnotation>
         </pertinentInformation>
-        
     </ObservationStatement>
 </component>
diff --git a/service/src/test/resources/ehr/mapper/observation/expected-output-observation-statement-23.xml b/service/src/test/resources/ehr/mapper/observation/expected-output-observation-statement-23.xml
@@ -7,14 +7,11 @@
             <center value="20100714163251"/>
         </effectiveTime>
         <availabilityTime value="20100714163251"/>
-        
-        
         <pertinentInformation typeCode="PERT">
             <sequenceNumber value="+1" />
             <pertinentAnnotation classCode="OBS" moodCode="EVN">
                 <text>Component(s): [Interpretation Code: Second interpretation code with userSelected true Interpretation Text: Example interpretation text] Example comment</text>
             </pertinentAnnotation>
         </pertinentInformation>
-        
     </ObservationStatement>
 </component>
diff --git a/service/src/test/resources/ehr/mapper/observation/expected-output-observation-statement-24.xml b/service/src/test/resources/ehr/mapper/observation/expected-output-observation-statement-24.xml
@@ -7,14 +7,11 @@
             <center value="20100714163251"/>
         </effectiveTime>
         <availabilityTime value="20100714163251"/>
-        
-        
         <pertinentInformation typeCode="PERT">
             <sequenceNumber value="+1" />
             <pertinentAnnotation classCode="OBS" moodCode="EVN">
                 <text>Component(s): [Interpretation Code: First interpretation code] Example comment</text>
             </pertinentAnnotation>
         </pertinentInformation>
-        
     </ObservationStatement>
 </component>
diff --git a/service/src/test/resources/ehr/mapper/observation/expected-output-observation-statement-25.xml b/service/src/test/resources/ehr/mapper/observation/expected-output-observation-statement-25.xml
@@ -7,14 +7,11 @@
             <center value="20100714163251"/>
         </effectiveTime>
         <availabilityTime value="20100714163251"/>
-        
-        
         <pertinentInformation typeCode="PERT">
             <sequenceNumber value="+1" />
             <pertinentAnnotation classCode="OBS" moodCode="EVN">
                 <text>Component(s): [Code: Allergy to penicillin Code Value: test-code Test display Interpretation Code: Example without userSelected Interpretation Text: Example interpretation text 1 Range: Low 20 test-unit High 30 test-unit] [Code: BMD - Left Femur String Value: test-string Interpretation Code: Example with userSelected Interpretation Text: Example interpretation text 2] [String Value: Example of a valueString] [Quantity Value: 7.2 g/dl] Example comment</text>
             </pertinentAnnotation>
         </pertinentInformation>
-        
     </ObservationStatement>
 </component>
diff --git a/service/src/test/resources/ehr/mapper/observation/expected-output-observation-statement-26.xml b/service/src/test/resources/ehr/mapper/observation/expected-output-observation-statement-26.xml
@@ -7,15 +7,12 @@
             <center value="20100714163251"/>
         </effectiveTime>
         <availabilityTime value="20100714163251"/>
-        
-        
         <pertinentInformation typeCode="PERT">
             <sequenceNumber value="+1" />
             <pertinentAnnotation classCode="OBS" moodCode="EVN">
                 <text>Interpretation: An example of text in interpretation
 Example comment</text>
             </pertinentAnnotation>
         </pertinentInformation>
-        
     </ObservationStatement>
 </component>
diff --git a/service/src/test/resources/ehr/mapper/observation/expected-output-observation-statement-27.xml b/service/src/test/resources/ehr/mapper/observation/expected-output-observation-statement-27.xml
@@ -7,14 +7,11 @@
             <low nullFlavor="UNK"/><high value="20190701113000"/>
         </effectiveTime>
         <availabilityTime nullFlavor="UNK"/>
-        
-        
         <pertinentInformation typeCode="PERT">
             <sequenceNumber value="+1" />
             <pertinentAnnotation classCode="OBS" moodCode="EVN">
                 <text>Test comment</text>
             </pertinentAnnotation>
         </pertinentInformation>
-        
     </ObservationStatement>
 </component>
diff --git a/service/src/test/resources/ehr/mapper/observation/expected-output-observation-statement-28.xml b/service/src/test/resources/ehr/mapper/observation/expected-output-observation-statement-28.xml
@@ -7,14 +7,11 @@
             <center nullFlavor="UNK"/>
         </effectiveTime>
         <availabilityTime nullFlavor="UNK"/>
-        
-        
         <pertinentInformation typeCode="PERT">
             <sequenceNumber value="+1" />
             <pertinentAnnotation classCode="OBS" moodCode="EVN">
                 <text>Test comment</text>
             </pertinentAnnotation>
         </pertinentInformation>
-        
     </ObservationStatement>
 </component>
diff --git a/service/src/test/resources/ehr/mapper/observation/expected-output-observation-statement-29.xml b/service/src/test/resources/ehr/mapper/observation/expected-output-observation-statement-29.xml
@@ -7,14 +7,11 @@
             <center value="20100714163251"/>
         </effectiveTime>
         <availabilityTime value="20100714163251"/>
-        
-        
         <pertinentInformation typeCode="PERT">
             <sequenceNumber value="+1" />
             <pertinentAnnotation classCode="OBS" moodCode="EVN">
                 <text>Range: Low: 10.000 ml High: 100.000 ml</text>
             </pertinentAnnotation>
         </pertinentInformation>
-        
     </ObservationStatement>
 </component>
diff --git a/service/src/test/resources/ehr/mapper/observation/expected-output-observation-statement-30.xml b/service/src/test/resources/ehr/mapper/observation/expected-output-observation-statement-30.xml
@@ -7,14 +7,11 @@
             <center value="20100714163251"/>
         </effectiveTime>
         <availabilityTime value="20100714163251"/>
-        
-        
         <pertinentInformation typeCode="PERT">
             <sequenceNumber value="+1" />
             <pertinentAnnotation classCode="OBS" moodCode="EVN">
                 <text>Range: High: 100.000 ml</text>
             </pertinentAnnotation>
         </pertinentInformation>
-        
     </ObservationStatement>
 </component>
diff --git a/service/src/test/resources/ehr/mapper/observation/expected-output-observation-statement-31.xml b/service/src/test/resources/ehr/mapper/observation/expected-output-observation-statement-31.xml
diff --git a/service/src/test/resources/ehr/mapper/observation/expected-output-observation-statement-32.xml b/service/src/test/resources/ehr/mapper/observation/expected-output-observation-statement-32.xml
diff --git a/service/src/test/resources/ehr/mapper/observation/expected-output-observation-statement-4.xml b/service/src/test/resources/ehr/mapper/observation/expected-output-observation-statement-4.xml
diff --git a/service/src/test/resources/ehr/mapper/observation/expected-output-observation-statement-5.xml b/service/src/test/resources/ehr/mapper/observation/expected-output-observation-statement-5.xml
diff --git a/service/src/test/resources/ehr/mapper/observation/expected-output-observation-statement-6.xml b/service/src/test/resources/ehr/mapper/observation/expected-output-observation-statement-6.xml
diff --git a/service/src/test/resources/ehr/mapper/observation/expected-output-observation-statement-7.xml b/service/src/test/resources/ehr/mapper/observation/expected-output-observation-statement-7.xml
diff --git a/service/src/test/resources/ehr/mapper/observation/expected-output-observation-statement-9.xml b/service/src/test/resources/ehr/mapper/observation/expected-output-observation-statement-9.xml
diff --git a/service/src/test/resources/ehr/mapper/observation/expected-output-observation-with-body-site.xml b/service/src/test/resources/ehr/mapper/observation/expected-output-observation-with-body-site.xml

Original file line number	Diff line number	Diff line change
`@@ -261,7 +261,7 @@ void When_MappingObservationJson_Expect_ObservationStatementXmlOutput(String inp`
`261`	`261`	`Observation parsedObservation = new FhirParseService().parseResource(jsonInput, Observation.class);`
`262`	`262`
`263`	`263`	`String outputMessage = observationStatementMapper.mapObservationToObservationStatement(parsedObservation, false);`
`264`		`- assertThat(outputMessage).isEqualToIgnoringWhitespace(expectedOutputMessage);`
	`264`	`+ assertThat(outputMessage).isEqualTo(expectedOutputMessage);`
`265`	`265`	`}`
`266`	`266`
`267`	`267`	`@ParameterizedTest`