From d8e2e020af8396a7913631b8439fbdaacd3faa2b Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Fri, 21 Jul 2023 12:41:56 +1000 Subject: [PATCH] fix failing tests --- .../utilities/ValueSetProcessBase.java | 14 ++++++++------ .../hl7/fhir/utilities/UnicodeUtilitiesTests.java | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/utilities/ValueSetProcessBase.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/utilities/ValueSetProcessBase.java index 4230aa0ec..30de48170 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/utilities/ValueSetProcessBase.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/utilities/ValueSetProcessBase.java @@ -48,12 +48,14 @@ public class ValueSetProcessBase { } public void seeValueSet(ValueSet vs) { - for (Extension ext : vs.getCompose().getExtension()) { - if ("http://hl7.org/fhir/tools/StructureDefinion/valueset-expansion-param".equals(ext.getUrl())) { - String name = ext.getExtensionString("name"); - Extension value = ext.getExtensionByUrl("value"); - if ("includeAlternateCodes".equals(name) && value != null && value.hasValue()) { - seeParameter(value.getValue()); + if (vs != null) { + for (Extension ext : vs.getCompose().getExtension()) { + if ("http://hl7.org/fhir/tools/StructureDefinion/valueset-expansion-param".equals(ext.getUrl())) { + String name = ext.getExtensionString("name"); + Extension value = ext.getExtensionByUrl("value"); + if ("includeAlternateCodes".equals(name) && value != null && value.hasValue()) { + seeParameter(value.getValue()); + } } } } diff --git a/org.hl7.fhir.utilities/src/test/java/org/hl7/fhir/utilities/UnicodeUtilitiesTests.java b/org.hl7.fhir.utilities/src/test/java/org/hl7/fhir/utilities/UnicodeUtilitiesTests.java index f4f214390..17e539173 100644 --- a/org.hl7.fhir.utilities/src/test/java/org/hl7/fhir/utilities/UnicodeUtilitiesTests.java +++ b/org.hl7.fhir.utilities/src/test/java/org/hl7/fhir/utilities/UnicodeUtilitiesTests.java @@ -22,7 +22,7 @@ public class UnicodeUtilitiesTests { Assertions.assertNull(UnicodeUtilities.checkUnicodeWellFormed(UnicodeUtilities.RLI + " "+ UnicodeUtilities.LRI + "a b c "+ UnicodeUtilities.PDI+" "+UnicodeUtilities.LRI+" d e f "+UnicodeUtilities.PDI+" "+UnicodeUtilities.PDI)); Assertions.assertEquals(UnicodeUtilities.checkUnicodeWellFormed("'''subject funds from back account then "+UnicodeUtilities.RLI + "''' ;return"), - "Unicode Character RLI at index 40 has no terminating match"); + "Unicode Character RLI at index 40 has no terminating match (preceding text = 'then ')"); } }