-
Notifications
You must be signed in to change notification settings - Fork 29
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
run $expand on type instead of instance if url is preset (#483)
* run $expand on type instead of instance if url is preset * update to always expand at type level * format * add tests * orElseThrow --------- Co-authored-by: taha.attari@smilecdr.com <taha.attari@smilecdr.com>
- Loading branch information
1 parent
16a4d5a
commit c8d5317
Showing
2 changed files
with
193 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
149 changes: 149 additions & 0 deletions
149
...tility/src/test/java/org/opencds/cqf/fhir/utility/client/TerminologyServerClientTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,149 @@ | ||
| package org.opencds.cqf.fhir.utility.client; | ||
|
|
||
| import static org.junit.jupiter.api.Assertions.assertEquals; | ||
| import static org.junit.jupiter.api.Assertions.assertNotNull; | ||
| import static org.junit.jupiter.api.Assertions.assertNull; | ||
| import static org.junit.jupiter.api.Assertions.assertTrue; | ||
| import static org.mockito.ArgumentMatchers.any; | ||
| import static org.mockito.ArgumentMatchers.anyString; | ||
| import static org.mockito.Mockito.mock; | ||
| import static org.mockito.Mockito.when; | ||
|
|
||
| import ca.uhn.fhir.context.FhirContext; | ||
| import ca.uhn.fhir.rest.client.impl.GenericClient; | ||
| import org.junit.jupiter.api.Test; | ||
| import org.mockito.ArgumentCaptor; | ||
| import org.mockito.internal.stubbing.defaultanswers.ReturnsDeepStubs; | ||
|
|
||
| public class TerminologyServerClientTest { | ||
| private static final String url = "www.test.com"; | ||
| private static final String version = "1.0"; | ||
| private static final String authoritativeSource = "www.source.com/ValueSet"; | ||
| private static final String username = "username"; | ||
| private static final String password = "password"; | ||
| private static final String urlParamName = "url"; | ||
| private static final String versionParamName = "valueSetVersion"; | ||
|
|
||
| @Test | ||
| void testR4UrlAndVersion() { | ||
| var vs = new org.hl7.fhir.r4.model.ValueSet(); | ||
| vs.setUrl(url); | ||
| var capt = ArgumentCaptor.forClass(org.hl7.fhir.r4.model.Parameters.class); | ||
| var clientMock = mock(GenericClient.class, new ReturnsDeepStubs()); | ||
| var contextMock = mock(FhirContext.class); | ||
| when(contextMock.newRestfulGenericClient(any())).thenReturn(clientMock); | ||
| when(clientMock | ||
| .operation() | ||
| .onType(anyString()) | ||
| .named(anyString()) | ||
| .withParameters(capt.capture()) | ||
| .returnResourceType(any()) | ||
| .execute()) | ||
| .thenReturn(vs); | ||
|
|
||
| var client = new TerminologyServerClient(contextMock); | ||
| client.expand(vs, authoritativeSource, new org.hl7.fhir.r4.model.Parameters(), username, password); | ||
| assertNotNull(capt.getValue()); | ||
| var params = capt.getValue(); | ||
| assertEquals( | ||
| url, | ||
| ((org.hl7.fhir.r4.model.UriType) | ||
| params.getParameter(urlParamName).getValue()) | ||
| .getValue()); | ||
| assertNull(params.getParameter(versionParamName)); | ||
|
|
||
| // when the valueset has a version it should be in params | ||
| vs.setVersion(version); | ||
| client.expand(vs, authoritativeSource, new org.hl7.fhir.r4.model.Parameters(), username, password); | ||
| params = capt.getAllValues().get(1); | ||
| assertEquals( | ||
| version, | ||
| ((org.hl7.fhir.r4.model.StringType) | ||
| params.getParameter(versionParamName).getValue()) | ||
| .getValue()); | ||
| } | ||
|
|
||
| @Test | ||
| void testR5UrlAndVersion() { | ||
| var vs = new org.hl7.fhir.r5.model.ValueSet(); | ||
| vs.setUrl(url); | ||
| var capt = ArgumentCaptor.forClass(org.hl7.fhir.r5.model.Parameters.class); | ||
| var clientMock = mock(GenericClient.class, new ReturnsDeepStubs()); | ||
| var contextMock = mock(FhirContext.class); | ||
| when(contextMock.newRestfulGenericClient(any())).thenReturn(clientMock); | ||
| when(clientMock | ||
| .operation() | ||
| .onType(anyString()) | ||
| .named(anyString()) | ||
| .withParameters(capt.capture()) | ||
| .returnResourceType(any()) | ||
| .execute()) | ||
| .thenReturn(vs); | ||
|
|
||
| var client = new TerminologyServerClient(contextMock); | ||
| client.expand(vs, authoritativeSource, new org.hl7.fhir.r5.model.Parameters(), username, password); | ||
| assertNotNull(capt.getValue()); | ||
| var params = capt.getValue(); | ||
| assertEquals( | ||
| url, | ||
| ((org.hl7.fhir.r5.model.UriType) | ||
| params.getParameter(urlParamName).getValue()) | ||
| .getValue()); | ||
| assertNull(params.getParameter(versionParamName)); | ||
|
|
||
| // when the valueset has a version it should be in params | ||
| vs.setVersion(version); | ||
| client.expand(vs, authoritativeSource, new org.hl7.fhir.r5.model.Parameters(), username, password); | ||
| params = capt.getAllValues().get(1); | ||
| assertEquals( | ||
| version, | ||
| ((org.hl7.fhir.r5.model.StringType) | ||
| params.getParameter(versionParamName).getValue()) | ||
| .getValue()); | ||
| } | ||
|
|
||
| @Test | ||
| void testDstu3UrlAndVersion() { | ||
| var vs = new org.hl7.fhir.dstu3.model.ValueSet(); | ||
| vs.setUrl(url); | ||
| var capt = ArgumentCaptor.forClass(org.hl7.fhir.dstu3.model.Parameters.class); | ||
| var clientMock = mock(GenericClient.class, new ReturnsDeepStubs()); | ||
| var contextMock = mock(FhirContext.class); | ||
| when(contextMock.newRestfulGenericClient(any())).thenReturn(clientMock); | ||
| when(clientMock | ||
| .operation() | ||
| .onType(anyString()) | ||
| .named(anyString()) | ||
| .withParameters(capt.capture()) | ||
| .returnResourceType(any()) | ||
| .execute()) | ||
| .thenReturn(vs); | ||
|
|
||
| var client = new TerminologyServerClient(contextMock); | ||
| client.expand(vs, authoritativeSource, new org.hl7.fhir.dstu3.model.Parameters(), username, password); | ||
| assertNotNull(capt.getValue()); | ||
| var params = capt.getValue(); | ||
| assertEquals( | ||
| url, | ||
| ((org.hl7.fhir.dstu3.model.UriType) params.getParameter().stream() | ||
| .filter(p -> p.getName().equals(urlParamName)) | ||
| .findAny() | ||
| .orElseThrow() | ||
| .getValue()) | ||
| .getValue()); | ||
| assertTrue(!params.getParameter().stream().anyMatch(p -> p.getName().equals(versionParamName))); | ||
|
|
||
| // when the valueset has a version it should be in params | ||
| vs.setVersion(version); | ||
| client.expand(vs, authoritativeSource, new org.hl7.fhir.dstu3.model.Parameters(), username, password); | ||
| params = capt.getAllValues().get(1); | ||
| assertEquals( | ||
| version, | ||
| ((org.hl7.fhir.dstu3.model.StringType) params.getParameter().stream() | ||
| .filter(p -> p.getName().equals(versionParamName)) | ||
| .findFirst() | ||
| .orElseThrow() | ||
| .getValue()) | ||
| .getValue()); | ||
| } | ||
| } |