More Travis work
This commit is contained in:
parent
0491dbe654
commit
9ac2a7321e
|
@ -6,7 +6,7 @@ import org.hl7.fhir.dstu21.model.Bundle;
|
|||
import org.hl7.fhir.dstu21.model.Patient;
|
||||
import org.junit.Test;
|
||||
|
||||
public class RuntimeResourceDefinitionTest {
|
||||
public class RuntimeResourceDefinitionDstu21Test {
|
||||
|
||||
private FhirContext ourCtx = FhirContext.forDstu2_1();
|
||||
|
|
@ -16,9 +16,9 @@ import ca.uhn.fhir.model.api.annotation.ResourceDef;
|
|||
import ca.uhn.fhir.model.primitive.StringDt;
|
||||
import ca.uhn.fhir.util.ElementUtil;
|
||||
|
||||
public class CustomTypeTest {
|
||||
public class CustomTypeDstu21Test {
|
||||
|
||||
private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(CustomTypeTest.class);
|
||||
private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(CustomTypeDstu21Test.class);
|
||||
|
||||
@Test
|
||||
public void testEncode() {
|
|
@ -45,12 +45,12 @@ import ca.uhn.fhir.rest.server.interceptor.RequestValidatingInterceptor;
|
|||
import ca.uhn.fhir.util.PortUtil;
|
||||
import ca.uhn.fhir.validation.IValidatorModule;
|
||||
|
||||
public class RequestValidatingInterceptorTest {
|
||||
public class RequestValidatingInterceptorDstu21Test {
|
||||
private static CloseableHttpClient ourClient;
|
||||
|
||||
private static FhirContext ourCtx = FhirContext.forDstu2_1();
|
||||
private static boolean ourLastRequestWasSearch;
|
||||
private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(RequestValidatingInterceptorTest.class);
|
||||
private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(RequestValidatingInterceptorDstu21Test.class);
|
||||
private static int ourPort;
|
||||
|
||||
private static Server ourServer;
|
|
@ -36,11 +36,11 @@ import ca.uhn.fhir.rest.server.interceptor.ResponseValidatingInterceptor;
|
|||
import ca.uhn.fhir.util.PortUtil;
|
||||
import ca.uhn.fhir.validation.IValidatorModule;
|
||||
|
||||
public class ResponseValidatingInterceptorTest {
|
||||
public class ResponseValidatingInterceptorDstu21Test {
|
||||
private static CloseableHttpClient ourClient;
|
||||
|
||||
private static FhirContext ourCtx = FhirContext.forDstu2_1();
|
||||
private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(ResponseValidatingInterceptorTest.class);
|
||||
private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(ResponseValidatingInterceptorDstu21Test.class);
|
||||
private static int ourPort;
|
||||
private static Server ourServer;
|
||||
private static RestfulServer ourServlet;
|
|
@ -44,11 +44,11 @@ import org.mockito.stubbing.Answer;
|
|||
|
||||
import ca.uhn.fhir.context.FhirContext;
|
||||
|
||||
public class FhirInstanceValidatorTest {
|
||||
public class FhirInstanceValidatorDstu21Test {
|
||||
|
||||
private static final DefaultProfileValidationSupport VALIDATION_SUPPORT = new DefaultProfileValidationSupport();
|
||||
private static FhirContext ourCtx = FhirContext.forDstu2_1();
|
||||
private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(FhirInstanceValidatorTest.class);
|
||||
private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(FhirInstanceValidatorDstu21Test.class);
|
||||
private DefaultProfileValidationSupport myDefaultValidationSupport = VALIDATION_SUPPORT;
|
||||
private FhirInstanceValidator myInstanceVal;
|
||||
private IValidationSupport myMockSupport;
|
||||
|
@ -207,7 +207,7 @@ public class FhirInstanceValidatorTest {
|
|||
|
||||
@Test
|
||||
public void testValidateBigRawJsonResource() throws Exception {
|
||||
InputStream stream = FhirInstanceValidatorTest.class.getResourceAsStream("/conformance.json.gz");
|
||||
InputStream stream = FhirInstanceValidatorDstu21Test.class.getResourceAsStream("/conformance.json.gz");
|
||||
stream = new GZIPInputStream(stream);
|
||||
String input = IOUtils.toString(stream);
|
||||
|
|
@ -34,10 +34,10 @@ import org.junit.Test;
|
|||
|
||||
import ca.uhn.fhir.context.FhirContext;
|
||||
|
||||
public class QuestionnaireResponseValidatorTest {
|
||||
public class QuestionnaireResponseValidatorDstu21Test {
|
||||
private static final FhirContext ourCtx = FhirContext.forDstu2_1();
|
||||
|
||||
private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(QuestionnaireResponseValidatorTest.class);
|
||||
private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(QuestionnaireResponseValidatorDstu21Test.class);
|
||||
private QuestionnaireResponseValidator myVal;
|
||||
|
||||
private IWorkerContext myWorkerCtx;
|
||||
|
@ -323,7 +323,7 @@ public class QuestionnaireResponseValidatorTest {
|
|||
|
||||
// @Test
|
||||
public void validateHealthConnexExample() throws Exception {
|
||||
String input = IOUtils.toString(QuestionnaireResponseValidatorTest.class.getResourceAsStream("/questionnaireanswers-0f431c50ddbe4fff8e0dd6b7323625fc.xml"));
|
||||
String input = IOUtils.toString(QuestionnaireResponseValidatorDstu21Test.class.getResourceAsStream("/questionnaireanswers-0f431c50ddbe4fff8e0dd6b7323625fc.xml"));
|
||||
|
||||
QuestionnaireResponse qa = ourCtx.newXmlParser().parseResource(QuestionnaireResponse.class, input);
|
||||
ArrayList<ValidationMessage> errors = new ArrayList<ValidationMessage>();
|
|
@ -25,9 +25,9 @@ import org.junit.Test;
|
|||
|
||||
import ca.uhn.fhir.context.FhirContext;
|
||||
|
||||
public class QuestionnaireResponseValidatorIntegrationTest {
|
||||
public class QuestionnaireResponseValidatorIntegrationDstu21Test {
|
||||
private static final FhirContext ourCtx = FhirContext.forDstu2_1();
|
||||
private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(QuestionnaireResponseValidatorIntegrationTest.class);
|
||||
private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(QuestionnaireResponseValidatorIntegrationDstu21Test.class);
|
||||
|
||||
private IValidationSupport myResourceLoaderMock;
|
||||
private FhirValidator myVal;
|
Loading…
Reference in New Issue