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

Make busywait more clear

This commit is contained in:
James Agnew 2019-01-23 16:21:13 -05:00
parent 7d1d5a102c
commit e819b83a94
2 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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