From 7b809f059a1fc1df5339a553ce3f3ec32c85ca4c Mon Sep 17 00:00:00 2001 From: James Agnew Date: Wed, 27 Jun 2018 18:48:36 -0400 Subject: [PATCH] Terminology updates --- .../jpa/entity/ResourceIndexedSearchParamQuantityTest.java | 2 +- .../ca/uhn/fhir/jpa/term/TerminologyLoaderSvcLoincTest.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/entity/ResourceIndexedSearchParamQuantityTest.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/entity/ResourceIndexedSearchParamQuantityTest.java index afb6a2131fd..642820ee03d 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/entity/ResourceIndexedSearchParamQuantityTest.java +++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/entity/ResourceIndexedSearchParamQuantityTest.java @@ -20,7 +20,7 @@ public class ResourceIndexedSearchParamQuantityTest { // Make sure our hashing function gives consistent results assertEquals(834432764963581074L, token.getHashIdentity().longValue()); - assertEquals(3029184989308001259L, token.getHashIdentityAndUnits().longValue()); + assertEquals(-1970227166134682431L, token.getHashIdentityAndUnits().longValue()); } diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/TerminologyLoaderSvcLoincTest.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/TerminologyLoaderSvcLoincTest.java index bab29d6544e..2c01ae8b386 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/TerminologyLoaderSvcLoincTest.java +++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/TerminologyLoaderSvcLoincTest.java @@ -314,16 +314,16 @@ public class TerminologyLoaderSvcLoincTest { vs = valueSets.get("LG100-4"); ourLog.info(FhirContext.forR4().newXmlParser().setPrettyPrint(true).encodeResourceToString(vs)); assertEquals("Chem_DrugTox_Chal_Sero_Allergy", vs.getName()); - assertEquals("http://loinc.org/fhir/loinc-group-LG100-4", vs.getUrl()); + assertEquals("http://loinc.org/vs/LG100-4", vs.getUrl()); assertEquals(1, vs.getCompose().getInclude().size()); assertEquals(1, vs.getCompose().getInclude().get(0).getValueSet().size()); - assertEquals("http://loinc.org/fhir/loinc-group-LG1695-8", vs.getCompose().getInclude().get(0).getValueSet().get(0).getValueAsString()); + assertEquals("http://loinc.org/vs/LG1695-8", vs.getCompose().getInclude().get(0).getValueSet().get(0).getValueAsString()); // Group - Child vs = valueSets.get("LG1695-8"); ourLog.info(FhirContext.forR4().newXmlParser().setPrettyPrint(true).encodeResourceToString(vs)); assertEquals("1,4-Dichlorobenzene|MCnc|Pt|ANYBldSerPl", vs.getName()); - assertEquals("http://loinc.org/fhir/loinc-group-LG1695-8", vs.getUrl()); + assertEquals("http://loinc.org/vs/LG1695-8", vs.getUrl()); assertEquals(1, vs.getCompose().getInclude().size()); assertEquals(2, vs.getCompose().getInclude().get(0).getConcept().size()); assertEquals("17424-3", vs.getCompose().getInclude().get(0).getConcept().get(0).getCode());