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

Fix incomplete test

This commit is contained in:
dotasek.dev 2024-01-30 11:53:56 -05:00
parent 14f2837b2b
commit b1973d6eb2
1 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
org.hl7.fhir.validation/src/test/java/org/hl7/fhir/validation/cli/services/ValidationServiceTest.java
View File

@ -60,9 +60,7 @@ class ValidationServiceTest {
SessionCache sessionCache = Mockito.spy(new PassiveExpiringSessionCache()); SessionCache sessionCache = Mockito.spy(new PassiveExpiringSessionCache());
ValidationService myService = new ValidationService(sessionCache); ValidationService myService = new ValidationService(sessionCache);
String resource = IOUtils.toString(getFileFromResourceAsStream("detected_issues.json"), StandardCharsets.UTF_8); List<FileInfo> filesToValidate = getFilesToValidate();
List<FileInfo> filesToValidate = new ArrayList<>();
filesToValidate.add(new FileInfo().setFileName("test_resource.json").setFileContent(resource).setFileType(Manager.FhirFormat.JSON.getExtension()));
ValidationRequest request = new ValidationRequest().setCliContext(new CliContext().setTxServer(FhirSettings.getTxFhirDevelopment()).setTxCache(getTerminologyCacheDirectory("validationService"))).setFilesToValidate(filesToValidate); ValidationRequest request = new ValidationRequest().setCliContext(new CliContext().setTxServer(FhirSettings.getTxFhirDevelopment()).setTxCache(getTerminologyCacheDirectory("validationService"))).setFilesToValidate(filesToValidate);
// Validation run 1...nothing cached yet // Validation run 1...nothing cached yet
@ -91,17 +89,33 @@ class ValidationServiceTest {
CliContext baseContext = new CliContext().setBaseEngine("myDummyKey").setSv("4.0.1").setTxServer(FhirSettings.getTxFhirDevelopment()).setTxCache(getTerminologyCacheDirectory("validationService")); CliContext baseContext = new CliContext().setBaseEngine("myDummyKey").setSv("4.0.1").setTxServer(FhirSettings.getTxFhirDevelopment()).setTxCache(getTerminologyCacheDirectory("validationService"));
myService.putBaseEngine("myDummyKey", baseContext); myService.putBaseEngine("myDummyKey", baseContext);
verify(myService, Mockito.times(1)).buildValidationEngine(any(), any(), any());
String resource = IOUtils.toString(getFileFromResourceAsStream("detected_issues.json"), StandardCharsets.UTF_8); {
List<FileInfo> filesToValidate = new ArrayList<>(); final List<FileInfo> filesToValidate = getFilesToValidate();
filesToValidate.add(new FileInfo().setFileName("test_resource.json").setFileContent(resource).setFileType(Manager.FhirFormat.JSON.getExtension())); final ValidationRequest request = new ValidationRequest().setCliContext(new CliContext()).setFilesToValidate(filesToValidate);
myService.validateSources(request);
ValidationRequest request = new ValidationRequest().setCliContext(new CliContext()).setFilesToValidate(filesToValidate); verify(myService, Mockito.times(0)).getBaseEngine("myDummyKey");
verify(myService, Mockito.times(2)).buildValidationEngine(any(), any(), any());
}
{
final List<FileInfo> filesToValidate = getFilesToValidate();
final ValidationRequest request = new ValidationRequest().setCliContext(new CliContext().setBaseEngine("myDummyKey")).setFilesToValidate(filesToValidate);
myService.validateSources(request); myService.validateSources(request);
verify(myService, Mockito.times(1)).getBaseEngine("myDummyKey"); verify(myService, Mockito.times(1)).getBaseEngine("myDummyKey");
verify(myService, Mockito.times(2)).buildValidationEngine(any(), any(), any());
}
}
private List<FileInfo> getFilesToValidate() throws IOException {
List<FileInfo> filesToValidate = new ArrayList<>();
String resource = IOUtils.toString(getFileFromResourceAsStream("detected_issues.json"), StandardCharsets.UTF_8);
filesToValidate.add(new FileInfo().setFileName("test_resource.json").setFileContent(resource).setFileType(Manager.FhirFormat.JSON.getExtension()));
return filesToValidate;
} }
private InputStream getFileFromResourceAsStream(String fileName) { private InputStream getFileFromResourceAsStream(String fileName) {