From 5f4355017d099aebdc5cac91632c205c63d5053e Mon Sep 17 00:00:00 2001 From: jamesagnew Date: Sun, 15 Dec 2019 07:45:29 -0500 Subject: [PATCH] More test logging --- .../ca/uhn/fhir/jpa/search/SearchCoordinatorSvcImpl.java | 5 ++++- .../ca/uhn/fhir/jpa/search/SearchCoordinatorSvcImplTest.java | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/SearchCoordinatorSvcImpl.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/SearchCoordinatorSvcImpl.java index 190c558d3cc..804c739efb9 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/SearchCoordinatorSvcImpl.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/SearchCoordinatorSvcImpl.java @@ -932,7 +932,10 @@ public class SearchCoordinatorSvcImpl implements ISearchCoordinatorSvc { private void doSaveSearch() { - Search newSearch = mySearchCacheSvc.save(mySearch); + // This is an attempt to track down an intermittent test + // failure in testAsyncSearchLargeResultSetBigCountSameCoordinator + Object searchObj = mySearchCacheSvc.save(mySearch); + Search newSearch = (Search) searchObj; // mySearchDao.save is not supposed to return null, but in unit tests // it can if the mock search dao isn't set up to handle that diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/search/SearchCoordinatorSvcImplTest.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/search/SearchCoordinatorSvcImplTest.java index fe7ba6a3511..1a3e3fd7efe 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/search/SearchCoordinatorSvcImplTest.java +++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/search/SearchCoordinatorSvcImplTest.java @@ -349,7 +349,10 @@ public class SearchCoordinatorSvcImplTest { List pids = createPidSequence(800); IResultIterator iter = new SlowIterator(pids.iterator(), 2); when(mySearchBuilder.createQuery(same(params), any(), any())).thenReturn(iter); - when(mySearchCacheSvc.save(any())).thenAnswer(t -> t.getArguments()[0]); + when(mySearchCacheSvc.save(any())).thenAnswer(t ->{ + ourLog.info("Saving search"); + return t.getArgument( 0, Search.class); + }); doAnswer(loadPids()).when(mySearchBuilder).loadResourcesByPid(any(Collection.class), any(Collection.class), any(List.class), anyBoolean(), any()); IBundleProvider result = mySvc.registerSearch(myCallingDao, params, "Patient", new CacheControlDirective(), null);