honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add tests for #192

This commit is contained in:
jamesagnew 2015-07-18 17:14:34 -04:00
parent 5a450227b2
commit af0db664db
3 changed files with 196 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
hapi-fhir-structures-dstu/src/test/java/ca/uhn/fhir/rest/param/TokenOrListParamTest.java
View File

@ -1,37 +1,65 @@
package ca.uhn.fhir.rest.param;
import static org.junit.Assert.*;
import ca.uhn.fhir.model.dstu.composite.CodingDt;
import ca.uhn.fhir.rest.method.QualifiedParamList;
import org.junit.Test;
import java.util.ArrayList;
import java.util.List;
public class TokenOrListParamTest {
@Test
public void whenParamListHasAnyMatchingCodingsForCodingList_doesCodingListMatch_shouldBeTrue() {
TokenOrListParam params = new TokenOrListParam();
params.add("http://foo.org", "53");
params.add("http://bar.org", "52");
@Test
public void testWhenParamListHasAnyMatchingCodingsForCodingList_doesCodingListMatch_shouldBeTrue() {
TokenOrListParam params = new TokenOrListParam();
params.add("http://foo.org", "53");
params.add("http://bar.org", "52");
List<CodingDt> codings = new ArrayList<CodingDt>();
codings.add(new CodingDt("http://baz.org", "53"));
codings.add(new CodingDt("http://bar.org", "52"));
List<CodingDt> codings = new ArrayList<CodingDt>();
codings.add(new CodingDt("http://baz.org", "53"));
codings.add(new CodingDt("http://bar.org", "52"));
assertTrue(params.doesCodingListMatch(codings));
}
assertTrue(params.doesCodingListMatch(codings));
}
@Test
public void whenParamListHasNoMatchingCodingsForCodingList_doesCodingListMatch_shouldBeFalse() {
TokenOrListParam params = new TokenOrListParam();
params.add("http://foo.org", "53");
params.add("http://bar.org", "52");
@Test
public void testWhenParamListHasNoMatchingCodingsForCodingList_doesCodingListMatch_shouldBeFalse() {
TokenOrListParam params = new TokenOrListParam();
params.add("http://foo.org", "53");
params.add("http://bar.org", "52");
List<CodingDt> codings = new ArrayList<CodingDt>();
codings.add(new CodingDt("http://baz.org", "53"));
codings.add(new CodingDt("http://bar.org", "11"));
List<CodingDt> codings = new ArrayList<CodingDt>();
codings.add(new CodingDt("http://baz.org", "53"));
codings.add(new CodingDt("http://bar.org", "11"));
assertFalse(params.doesCodingListMatch(codings));
}
assertFalse(params.doesCodingListMatch(codings));
}
@Test
public void testWhenParamListHasNoMatchingCodingsForCodingList_doesCodingListMatch_shouldBeFalse2() {
TokenOrListParam params = new TokenOrListParam();
params.add("http://foo.org", "53");
params.add("http://bar.org", "52");
List<CodingDt> codings = new ArrayList<CodingDt>();
codings.add(new CodingDt("http://baz.org", "53"));
codings.add(new CodingDt("http://bar.org", "11"));
assertFalse(params.doesCodingListMatch(codings));
}
/**
* See #192
*/
@Test
public void testParseExcaped() {
TokenOrListParam params = new TokenOrListParam();
params.setValuesAsQueryTokens(QualifiedParamList.singleton("system|code-include-but-not-end-with-comma\\,suffix"));
assertEquals(1, params.getListAsCodings().size());
assertEquals("system", params.getListAsCodings().get(0).getSystemElement().getValue());
assertEquals("code-include-but-not-end-with-comma,suffix", params.getListAsCodings().get(0).getCodeElement().getValue());
}
}

3
hapi-fhir-structures-dstu/src/test/java/ca/uhn/fhir/rest/server/StringParameterTest.java
View File

@ -28,9 +28,6 @@ import ca.uhn.fhir.rest.annotation.Search;
import ca.uhn.fhir.rest.param.StringParam;
import ca.uhn.fhir.util.PortUtil;
/**
* Created by dsotnikov on 2/25/2014.
*/
public class StringParameterTest {
private static CloseableHttpClient ourClient;

147
hapi-fhir-structures-dstu/src/test/java/ca/uhn/fhir/rest/server/TokenParameterTest.java Normal file
View File

@ -0,0 +1,147 @@
package ca.uhn.fhir.rest.server;
import static org.junit.Assert.*;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.TimeUnit;
import org.apache.commons.io.IOUtils;
import org.apache.http.HttpResponse;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.servlet.ServletHandler;
import org.eclipse.jetty.servlet.ServletHolder;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
import ca.uhn.fhir.context.FhirContext;
import ca.uhn.fhir.model.api.IResource;
import ca.uhn.fhir.model.dstu.resource.Patient;
import ca.uhn.fhir.rest.annotation.OptionalParam;
import ca.uhn.fhir.rest.annotation.RequiredParam;
import ca.uhn.fhir.rest.annotation.Search;
import ca.uhn.fhir.rest.param.StringParam;
import ca.uhn.fhir.rest.param.TokenOrListParam;
import ca.uhn.fhir.util.PortUtil;
import ca.uhn.fhir.util.UrlUtil;
public class TokenParameterTest {
private static CloseableHttpClient ourClient;
private static FhirContext ourCtx = FhirContext.forDstu1();
private static int ourPort;
private static Server ourServer;
private static TokenOrListParam ourLastOrList;
@Before
public void before() {
ourLastOrList = null;
}
/**
* Test #192
*/
@Test
public void testOrListWithEscapedValue() throws Exception {
HttpGet httpGet = new HttpGet("http://localhost:" + ourPort + "/Patient?identifier=" + UrlUtil.escape("system|code-include-but-not-end-with-comma\\,suffix"));
HttpResponse status = ourClient.execute(httpGet);
IOUtils.closeQuietly(status.getEntity().getContent());
assertEquals(200, status.getStatusLine().getStatusCode());
assertEquals(1, ourLastOrList.getListAsCodings().size());
assertEquals("system", ourLastOrList.getListAsCodings().get(0).getSystemElement().getValue());
assertEquals("code-include-but-not-end-with-comma,suffix", ourLastOrList.getListAsCodings().get(0).getCodeElement().getValue());
}
@AfterClass
public static void afterClass() throws Exception {
ourServer.stop();
}
@BeforeClass
public static void beforeClass() throws Exception {
ourPort = PortUtil.findFreePort();
ourServer = new Server(ourPort);
DummyPatientResourceProvider patientProvider = new DummyPatientResourceProvider();
ServletHandler proxyHandler = new ServletHandler();
RestfulServer servlet = new RestfulServer(ourCtx);
servlet.setFhirContext(ourCtx);
servlet.setResourceProviders(patientProvider);
ServletHolder servletHolder = new ServletHolder(servlet);
proxyHandler.addServletWithMapping(servletHolder, "/*");
ourServer.setHandler(proxyHandler);
ourServer.start();
PoolingHttpClientConnectionManager connectionManager = new PoolingHttpClientConnectionManager(5000, TimeUnit.MILLISECONDS);
HttpClientBuilder builder = HttpClientBuilder.create();
builder.setConnectionManager(connectionManager);
ourClient = builder.build();
}
/**
* Created by dsotnikov on 2/25/2014.
*/
public static class DummyPatientResourceProvider implements IResourceProvider {
@Search
public List<Patient> findPatientByString(@RequiredParam(name = Patient.SP_IDENTIFIER) final TokenOrListParam theIdentifiers) {
ArrayList<Patient> retVal = new ArrayList<Patient>();
ourLastOrList = theIdentifiers;
return retVal;
}
@Search
public List<Patient> findPatientByStringParam(@RequiredParam(name = "str") StringParam theParam) {
ArrayList<Patient> retVal = new ArrayList<Patient>();
if (theParam.isExact() && theParam.getValue().equals("aaa")) {
Patient patient = new Patient();
patient.setId("1");
retVal.add(patient);
}
if (!theParam.isExact() && theParam.getValue().toLowerCase().equals("aaa")) {
Patient patient = new Patient();
patient.setId("2");
retVal.add(patient);
}
return retVal;
}
@Search
public List<Patient> findPatientWithOptional(@OptionalParam(name = "ccc") StringParam theParam) {
ArrayList<Patient> retVal = new ArrayList<Patient>();
if (theParam.isExact() && theParam.getValue().equals("aaa")) {
Patient patient = new Patient();
patient.setId("1");
retVal.add(patient);
}
if (!theParam.isExact() && theParam.getValue().toLowerCase().equals("aaa")) {
Patient patient = new Patient();
patient.setId("2");
retVal.add(patient);
}
return retVal;
}
@Override
public Class<? extends IResource> getResourceType() {
return Patient.class;
}
}
}