Skip to content

NIAD-3137: Refactor to use IsEqualToIgnoringWhitespace #884

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MartinWheelerMT merged 1 commit into from
Sep 17, 2024
+18 −20
Merged

NIAD-3137: Refactor to use IsEqualToIgnoringWhitespace #884

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 18 additions & 20 deletions service/src/test/java/uk/nhs/adaptors/gp2gp/ehr/mapper/EncounterComponentsMapperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -471,17 +480,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)
Expand Down