honeymoose/hapi-fhir
1
0
Fork 0
mirror of https://github.com/hapifhir/hapi-fhir.git synced 2025-03-09 14:33:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

One more test fix

Browse Source
This commit is contained in:
James Agnew 2018-11-19 10:27:16 -05:00
parent 2e1d5e4124
commit 719339fc14
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3SearchWithLuceneDisabledTest.java
View File

@ -150,9 +150,7 @@ public class FhirResourceDaoDstu3SearchWithLuceneDisabledTest extends BaseJpaTes
@Before
public void beforePurgeDatabase() {
runInTransaction(() -> {
purgeDatabase(myDaoConfig, mySystemDao, myResourceReindexingSvc, mySearchCoordinatorSvc, mySearchParamRegistry);
});
purgeDatabase(myDaoConfig, mySystemDao, myResourceReindexingSvc, mySearchCoordinatorSvc, mySearchParamRegistry);
}
@Before

8
hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/EmailSubscriptionDstu2Test.java
View File

@ -1,5 +1,6 @@
package ca.uhn.fhir.jpa.subscription;
import ca.uhn.fhir.jpa.config.BaseConfig;
import ca.uhn.fhir.jpa.dao.IFhirResourceDao;
import ca.uhn.fhir.jpa.provider.BaseResourceProviderDstu2Test;
import ca.uhn.fhir.jpa.subscription.email.JavaMailEmailSender;
@ -16,12 +17,12 @@ import ca.uhn.fhir.rest.api.MethodOutcome;
import com.icegreen.greenmail.util.GreenMail;
import com.icegreen.greenmail.util.GreenMailUtil;
import com.icegreen.greenmail.util.ServerSetup;
import com.icegreen.greenmail.util.ServerSetupTest;
import org.hl7.fhir.instance.model.api.IIdType;
import org.junit.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.core.task.AsyncTaskExecutor;
import javax.mail.internet.InternetAddress;
@ -31,7 +32,7 @@ import java.util.Arrays;
import java.util.List;
import java.util.concurrent.Callable;
import static org.junit.Assert.*;
import static org.junit.Assert.assertEquals;
public class EmailSubscriptionDstu2Test extends BaseResourceProviderDstu2Test {
@ -44,6 +45,7 @@ public class EmailSubscriptionDstu2Test extends BaseResourceProviderDstu2Test {
@Autowired
private List<IFhirResourceDao<?>> myResourceDaos;
@Autowired
@Qualifier(BaseConfig.TASK_EXECUTOR_NAME)
private AsyncTaskExecutor myAsyncTaskExecutor;
@After
@ -142,7 +144,7 @@ public class EmailSubscriptionDstu2Test extends BaseResourceProviderDstu2Test {
Observation observation1 = sendObservation(code, "SNOMED-CT");
waitForSize(2, 60000, new Callable<Number>(){
waitForSize(2, 60000, new Callable<Number>() {
@Override
public Number call() {
int length = ourTestSmtp.getReceivedMessages().length;

2
hapi-fhir-structures-r4/src/test/java/ca/uhn/fhir/rest/server/DeleteConditionalR4Test.java
View File

@ -63,7 +63,7 @@ public class DeleteConditionalR4Test {
.delete()
.resourceConditionalByType(Patient.class)
.where(Patient.IDENTIFIER.exactly().systemAndIdentifier("SOMESYS", "SOMEID")).execute();
assertTrue(ourLastRequestWasDelete);
assertEquals(null, ourLastIdParam);
assertEquals("Patient?identifier=SOMESYS%7CSOMEID", ourLastConditionalUrl);