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

Fix failing tests

This commit is contained in:
jamesagnew 2018-05-24 06:33:13 -04:00
parent b0b98a9a28
commit 09eb52ed27
3 changed files with 64 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hapi-fhir-validation/src/main/java/org/hl7/fhir/dstu3/hapi/validation/FhirInstanceValidator.java
View File

@ -98,6 +98,10 @@ public class FhirInstanceValidator extends BaseValidatorBridge implements IValid
return profile; return profile;
} }
public void flushCaches() {
myWrappedWorkerContext = null;
}
/** /**
* Returns the "best practice" warning level (default is {@link BestPracticeWarningLevel#Hint}). * Returns the "best practice" warning level (default is {@link BestPracticeWarningLevel#Hint}).
* <p> * <p>
@ -183,8 +187,6 @@ public class FhirInstanceValidator extends BaseValidatorBridge implements IValid
myStructureDefintion = theStructureDefintion; myStructureDefintion = theStructureDefintion;
} }
protected List<ValidationMessage> validate(final FhirContext theCtx, String theInput, EncodingEnum theEncoding) { protected List<ValidationMessage> validate(final FhirContext theCtx, String theInput, EncodingEnum theEncoding) {
WorkerContextWrapper wrappedWorkerContext = myWrappedWorkerContext; WorkerContextWrapper wrappedWorkerContext = myWrappedWorkerContext;
@ -507,13 +509,13 @@ public class FhirInstanceValidator extends BaseValidatorBridge implements IValid
} }
@Override @Override
public String getVersion() { public UcumService getUcumService() {
return myWrap.getVersion(); throw new UnsupportedOperationException();
} }
@Override @Override
public UcumService getUcumService() { public String getVersion() {
throw new UnsupportedOperationException(); return myWrap.getVersion();
} }
@Override @Override

121
hapi-fhir-validation/src/test/java/org/hl7/fhir/dstu3/hapi/validation/FhirInstanceValidatorDstu3Test.java
View File

@ -1,10 +1,6 @@
package org.hl7.fhir.dstu3.hapi.validation; package org.hl7.fhir.dstu3.hapi.validation;
import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.FhirContext;
import ca.uhn.fhir.model.dstu2.composite.PeriodDt;
import ca.uhn.fhir.model.dstu2.valueset.ProcedureStatusEnum;
import ca.uhn.fhir.model.primitive.DateTimeDt;
import ca.uhn.fhir.util.StopWatch;
import ca.uhn.fhir.util.TestUtil; import ca.uhn.fhir.util.TestUtil;
import ca.uhn.fhir.validation.FhirValidator; import ca.uhn.fhir.validation.FhirValidator;
import ca.uhn.fhir.validation.ResultSeverityEnum; import ca.uhn.fhir.validation.ResultSeverityEnum;
@ -27,7 +23,6 @@ import org.hl7.fhir.dstu3.model.ValueSet.ConceptSetComponent;
import org.hl7.fhir.dstu3.model.ValueSet.ValueSetExpansionComponent; import org.hl7.fhir.dstu3.model.ValueSet.ValueSetExpansionComponent;
import org.hl7.fhir.dstu3.utils.FHIRPathEngine; import org.hl7.fhir.dstu3.utils.FHIRPathEngine;
import org.hl7.fhir.instance.model.api.IBaseResource; import org.hl7.fhir.instance.model.api.IBaseResource;
import org.junit.*; import org.junit.*;
import org.junit.rules.TestRule; import org.junit.rules.TestRule;
import org.junit.rules.TestWatcher; import org.junit.rules.TestWatcher;
@ -35,8 +30,6 @@ import org.junit.runner.Description;
import org.mockito.invocation.InvocationOnMock; import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer; import org.mockito.stubbing.Answer;
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.util.*; import java.util.*;
@ -74,54 +67,6 @@ public class FhirInstanceValidatorDstu3Test {
myValidConcepts.add(theSystem + "___" + theCode); myValidConcepts.add(theSystem + "___" + theCode);
} }
@Test
public void testStress() throws IOException {
String input = IOUtils.toString(new FileReader("/home/james/Downloads/history.json"));
FhirValidator val = ourCtx.newValidator();
val.registerValidatorModule(new FhirInstanceValidator(myDefaultValidationSupport));
val.validateWithResult(input);
StopWatch sw = new StopWatch();
int loops = 100;
for (int i = 0; i < loops; i++) {
val.validateWithResult(input);
}
ourLog.info("Validated {} times AVG {}ms/val", loops, sw.getMillisPerOperation(loops));
}
/**
* See #873
*/
@Test
public void testCompareTimesWithDifferentTimezones() {
Procedure procedure = new Procedure();
procedure.setStatus(Procedure.ProcedureStatus.COMPLETED);
procedure.getSubject().setReference("Patient/1");
procedure.getCode().setText("Some proc");
Period period = new Period();
period.setStartElement(new DateTimeType("2000-01-01T00:00:01+05:00"));
period.setEndElement(new DateTimeType("2000-01-01T00:00:00+04:00"));
assertThat(period.getStart().getTime(), lessThan(period.getEnd().getTime()));
procedure.setPerformed(period);
FhirValidator val = ourCtx.newValidator();
val.registerValidatorModule(new FhirInstanceValidator(myDefaultValidationSupport));
ValidationResult result = val.validateWithResult(procedure);
String encoded = ourCtx.newJsonParser().setPrettyPrint(true).encodeResourceToString(result.toOperationOutcome());
ourLog.info(encoded);
assertTrue(result.isSuccessful());
}
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@Before @Before
public void before() { public void before() {
@ -278,6 +223,33 @@ public class FhirInstanceValidatorDstu3Test {
return retVal; return retVal;
} }
/**
* See #873
*/
@Test
public void testCompareTimesWithDifferentTimezones() {
Procedure procedure = new Procedure();
procedure.setStatus(Procedure.ProcedureStatus.COMPLETED);
procedure.getSubject().setReference("Patient/1");
procedure.getCode().setText("Some proc");
Period period = new Period();
period.setStartElement(new DateTimeType("2000-01-01T00:00:01+05:00"));
period.setEndElement(new DateTimeType("2000-01-01T00:00:00+04:00"));
assertThat(period.getStart().getTime(), lessThan(period.getEnd().getTime()));
procedure.setPerformed(period);
FhirValidator val = ourCtx.newValidator();
val.registerValidatorModule(new FhirInstanceValidator(myDefaultValidationSupport));
ValidationResult result = val.validateWithResult(procedure);
String encoded = ourCtx.newJsonParser().setPrettyPrint(true).encodeResourceToString(result.toOperationOutcome());
ourLog.info(encoded);
assertTrue(result.isSuccessful());
}
/** /**
* See #531 * See #531
*/ */
@ -330,6 +302,25 @@ public class FhirInstanceValidatorDstu3Test {
assertEquals(0, outcome.size()); assertEquals(0, outcome.size());
} }
/**
* An invalid local reference should not cause a ServiceException.
*/
@Test
public void testInvalidLocalReference() {
Questionnaire resource = new Questionnaire();
resource.setStatus(PublicationStatus.ACTIVE);
QuestionnaireItemComponent item = new QuestionnaireItemComponent();
item.setLinkId("linkId-1");
item.setType(QuestionnaireItemType.CHOICE);
item.setOptions(new Reference("#invalid-ref"));
resource.addItem(item);
ValidationResult output = myVal.validateWithResult(resource);
List<SingleValidationMessage> nonInfo = logResultsAndReturnNonInformationalOnes(output);
assertThat(nonInfo, hasSize(2));
}
@Test @Test
public void testIsNoTerminologyChecks() { public void testIsNoTerminologyChecks() {
assertFalse(myInstanceVal.isNoTerminologyChecks()); assertFalse(myInstanceVal.isNoTerminologyChecks());
@ -534,7 +525,6 @@ public class FhirInstanceValidatorDstu3Test {
} }
@Test @Test
public void testValidateRawJsonResource() { public void testValidateRawJsonResource() {
//@formatter:off //@formatter:off
@ -764,25 +754,6 @@ public class FhirInstanceValidatorDstu3Test {
assertThat(nonInfo, empty()); assertThat(nonInfo, empty());
} }
/**
* An invalid local reference should not cause a ServiceException.
*/
@Test
public void testInvalidLocalReference() {
Questionnaire resource = new Questionnaire();
resource.setStatus(PublicationStatus.ACTIVE);
QuestionnaireItemComponent item = new QuestionnaireItemComponent();
item.setLinkId("linkId-1");
item.setType(QuestionnaireItemType.CHOICE);
item.setOptions(new Reference("#invalid-ref"));
resource.addItem(item);
ValidationResult output = myVal.validateWithResult(resource);
List<SingleValidationMessage> nonInfo = logResultsAndReturnNonInformationalOnes(output);
assertThat(nonInfo, hasSize(2));
}
/** /**
* See #370 * See #370
*/ */

15
hapi-fhir-validation/src/test/java/org/hl7/fhir/dstu3/hapi/validation/QuestionnaireResponseValidatorDstu3Test.java
View File

@ -36,6 +36,7 @@ import static org.junit.Assert.*;
import static org.mockito.Matchers.any; import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq; import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
public class QuestionnaireResponseValidatorDstu3Test { public class QuestionnaireResponseValidatorDstu3Test {
@ -86,11 +87,9 @@ public class QuestionnaireResponseValidatorDstu3Test {
codeSystem.setContent(CodeSystemContentMode.COMPLETE); codeSystem.setContent(CodeSystemContentMode.COMPLETE);
codeSystem.setUrl("http://codesystems.com/system"); codeSystem.setUrl("http://codesystems.com/system");
codeSystem.addConcept().setCode("code0"); codeSystem.addConcept().setCode("code0");
when(myValSupport.fetchCodeSystem(any(FhirContext.class), eq("http://codesystems.com/system"))).thenReturn(codeSystem);
ValueSet options = new ValueSet(); ValueSet options = new ValueSet();
options.getCompose().addInclude().setSystem("http://codesystems.com/system").addConcept().setCode("code0"); options.getCompose().addInclude().setSystem("http://codesystems.com/system").addConcept().setCode("code0");
when(myValSupport.fetchResource(any(FhirContext.class), eq(ValueSet.class), eq("http://somevalueset"))).thenReturn(options);
int itemCnt = 16; int itemCnt = 16;
QuestionnaireItemType[] questionnaireItemTypes = new QuestionnaireItemType[itemCnt]; QuestionnaireItemType[] questionnaireItemTypes = new QuestionnaireItemType[itemCnt];
@ -132,7 +131,16 @@ public class QuestionnaireResponseValidatorDstu3Test {
for (int i = 0; i < itemCnt; i++) { for (int i = 0; i < itemCnt; i++) {
if (questionnaireItemTypes[i] == null) continue; if (questionnaireItemTypes[i] == null) continue;
String linkId = "link" + i; String linkId = "link" + i;
reset(myValSupport);
Questionnaire q = new Questionnaire(); Questionnaire q = new Questionnaire();
when(myValSupport.fetchResource(any(FhirContext.class), eq(Questionnaire.class),
eq("http://example.com/Questionnaire/q1"))).thenReturn(q);
when(myValSupport.fetchCodeSystem(any(FhirContext.class), eq("http://codesystems.com/system"))).thenReturn(codeSystem);
when(myValSupport.fetchResource(any(FhirContext.class), eq(ValueSet.class), eq("http://somevalueset"))).thenReturn(options);
myInstanceVal.flushCaches();
q.getItem().clear();
QuestionnaireItemComponent questionnaireItemComponent = QuestionnaireItemComponent questionnaireItemComponent =
q.addItem().setLinkId(linkId).setRequired(true).setType(questionnaireItemTypes[i]); q.addItem().setLinkId(linkId).setRequired(true).setType(questionnaireItemTypes[i]);
if (i == 10 || i == 11) { if (i == 10 || i == 11) {
@ -147,9 +155,6 @@ public class QuestionnaireResponseValidatorDstu3Test {
qa.getQuestionnaire().setReference("http://example.com/Questionnaire/q1"); qa.getQuestionnaire().setReference("http://example.com/Questionnaire/q1");
qa.addItem().setLinkId(linkId).addAnswer().setValue(answerValues[i]); qa.addItem().setLinkId(linkId).addAnswer().setValue(answerValues[i]);
when(myValSupport.fetchResource(any(FhirContext.class), eq(Questionnaire.class),
eq(qa.getQuestionnaire().getReference()))).thenReturn(q);
ValidationResult errors = myVal.validateWithResult(qa); ValidationResult errors = myVal.validateWithResult(qa);
ourLog.info(errors.toString()); ourLog.info(errors.toString());