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

Another test fix

This commit is contained in:
James Agnew 2018-05-10 06:25:18 -04:00
parent 43568a1f8d
commit 935938e92c
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/BaseJpaTest.java
View File

@ -159,16 +159,15 @@ public abstract class BaseJpaTest {
return retVal;
}
protected List<IIdType> toUnqualifiedVersionlessIds(IBundleProvider theFound) {
PersistedJpaBundleProvider provider = (PersistedJpaBundleProvider) theFound;
protected List<IIdType> toUnqualifiedVersionlessIds(IBundleProvider theProvider) {
List<IIdType> retVal = new ArrayList<>();
Integer size = provider.size();
Integer size = theProvider.size();
StopWatch sw = new StopWatch();
while (size == null) {
int timeout = 20000;
if (sw.getMillis() > timeout) {
String message = "Waited over " + timeout + "ms for search " + provider.getUuid();
String message = "Waited over " + timeout + "ms for search " + theProvider.getUuid();
ourLog.info(message);
fail(message);
}
@ -177,12 +176,16 @@ public abstract class BaseJpaTest {
} catch (InterruptedException theE) {
//ignore
}
provider.clearCachedDataForUnitTest();
size = provider.size();
if (theProvider instanceof PersistedJpaBundleProvider) {
PersistedJpaBundleProvider provider = (PersistedJpaBundleProvider) theFound;
provider.clearCachedDataForUnitTest();
}
size = theProvider.size();
}
ourLog.info("Found {} results", size);
List<IBaseResource> resources = provider.getResources(0, size);
List<IBaseResource> resources = theProvider.getResources(0, size);
for (IBaseResource next : resources) {
retVal.add(next.getIdElement().toUnqualifiedVersionless());
}