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

Merge remote-tracking branch 'origin/windows-fixes' into windows-fixes

This commit is contained in:
Ken Stevens 2019-01-23 17:14:51 -05:00
parent cfd67d88c7 e819b83a94
commit 67eaeb8af1
2 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/SystemProviderDstu2Test.java
View File

@ -212,7 +212,7 @@ public class SystemProviderDstu2Test extends BaseJpaDstu2Test {
myObservationDao.update(obs, mySrd);
// Try to wait for the indexing to complete
waitToParamsToIndex(ptId);
waitForSize(2, ()-> fetchSuggestionCount(ptId));
HttpGet get = new HttpGet(ourServerBase + "/$suggest-keywords?context=Patient/" + ptId.getIdPart() + "/$everything&searchParam=_content&text=zxc&_pretty=true&_format=xml");
try (CloseableHttpResponse http = ourHttpClient.execute(get)) {
@ -230,8 +230,7 @@ public class SystemProviderDstu2Test extends BaseJpaDstu2Test {
}
}
private void waitToParamsToIndex(IIdType thePtId) throws Exception {
waitForSize(2, ()->{
private Number fetchSuggestionCount(IIdType thePtId) throws IOException {
HttpGet get = new HttpGet(ourServerBase + "/$suggest-keywords?context=Patient/" + thePtId.getIdPart() + "/$everything&searchParam=_content&text=zxc&_pretty=true&_format=xml");
try (CloseableHttpResponse http = ourHttpClient.execute(get)) {
assertEquals(200, http.getStatusLine().getStatusCode());
@ -239,7 +238,6 @@ public class SystemProviderDstu2Test extends BaseJpaDstu2Test {
Parameters parameters = ourCtx.newXmlParser().parseResource(Parameters.class, output);
return parameters.getParameter().size();
}
});
}
@Test

6
hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/SystemProviderR4Test.java
View File

@ -280,7 +280,7 @@ public class SystemProviderR4Test extends BaseJpaR4Test {
myObservationDao.update(obs, mySrd);
// Try to wait for the indexing to complete
waitForParamsToIndex(ptId);
waitForSize(2, ()-> fetchSuggestionCount(ptId));
HttpGet get = new HttpGet(ourServerBase + "/$suggest-keywords?context=Patient/" + ptId.getIdPart() + "/$everything&searchParam=_content&text=zxc&_pretty=true&_format=xml");
CloseableHttpResponse http = ourHttpClient.execute(get);
@ -301,8 +301,7 @@ public class SystemProviderR4Test extends BaseJpaR4Test {
}
}
private void waitForParamsToIndex(IIdType thePtId) throws Exception {
waitForSize(2, ()->{
private Number fetchSuggestionCount(IIdType thePtId) throws IOException {
HttpGet get = new HttpGet(ourServerBase + "/$suggest-keywords?context=Patient/" + thePtId.getIdPart() + "/$everything&searchParam=_content&text=zxc&_pretty=true&_format=xml");
try (CloseableHttpResponse http = ourHttpClient.execute(get)) {
assertEquals(200, http.getStatusLine().getStatusCode());
@ -310,7 +309,6 @@ public class SystemProviderR4Test extends BaseJpaR4Test {
Parameters parameters = ourCtx.newXmlParser().parseResource(Parameters.class, output);
return parameters.getParameter().size();
}
});
}
@Test