Merge branch 'main' into NIAD-1137/EncounterMapper

Jonopono123 · web-flow · commit 200bcfc6fad4 · 2025-10-30T15:15:58.000Z
diff --git a/service/src/test/java/uk/nhs/adaptors/gp2gp/ehr/mapper/ObservationToNarrativeStatementMapperTest.java b/service/src/test/java/uk/nhs/adaptors/gp2gp/ehr/mapper/ObservationToNarrativeStatementMapperTest.java
@@ -119,7 +119,7 @@ void When_MappingObservationJsonWithNestedTrue_Expect_NarrativeStatementXmlOutpu
 
         String outputMessage = observationToNarrativeStatementMapper.mapObservationToNarrativeStatement(parsedObservation, true);
 
-        assertThat(outputMessage).isEqualToIgnoringWhitespace(expectedOutputMessage);
+        assertThat(outputMessage).isEqualTo(expectedOutputMessage);
     }
 
     @Test

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ void When_MappingObservationJsonWithNestedTrue_Expect_NarrativeStatementXmlOutpu`
`119`	`119`
`120`	`120`	`String outputMessage = observationToNarrativeStatementMapper.mapObservationToNarrativeStatement(parsedObservation, true);`
`121`	`121`
`122`		`- assertThat(outputMessage).isEqualToIgnoringWhitespace(expectedOutputMessage);`
	`122`	`+ assertThat(outputMessage).isEqualTo(expectedOutputMessage);`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`@Test`