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

Fix tests to cover other scenarios

This commit is contained in:
Tadgh 2020-07-06 14:57:28 -07:00
parent f82a53e6f9
commit b7e5705f57
1 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/provider/EmpiProviderClearLinkR4Test.java
View File

@ -1,20 +1,17 @@
package ca.uhn.fhir.jpa.empi.provider; package ca.uhn.fhir.jpa.empi.provider;
import ca.uhn.fhir.jpa.entity.EmpiLink; import ca.uhn.fhir.jpa.entity.EmpiLink;
import ca.uhn.fhir.rest.server.exceptions.ResourceVersionConflictException;
import org.hl7.fhir.r4.model.Person; import org.hl7.fhir.r4.model.Person;
import org.hl7.fhir.r4.model.Practitioner; import org.hl7.fhir.r4.model.Practitioner;
import org.hl7.fhir.r4.model.StringType; import org.hl7.fhir.r4.model.StringType;
import org.junit.Before; import org.junit.jupiter.api.BeforeEach;
import org.junit.Test; import org.junit.jupiter.api.Test;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
import java.util.List; import java.util.List;
import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.hasSize;
import static org.hamcrest.Matchers.matchesPattern;
import static org.junit.Assert.fail;
public class EmpiProviderClearLinkR4Test extends BaseLinkR4Test { public class EmpiProviderClearLinkR4Test extends BaseLinkR4Test {
@ -22,7 +19,7 @@ public class EmpiProviderClearLinkR4Test extends BaseLinkR4Test {
protected Practitioner myPractitioner; protected Practitioner myPractitioner;
protected StringType myPractitionerId; protected StringType myPractitionerId;
@Before @BeforeEach
public void before() { public void before() {
super.before(); super.before();
myPractitioner = createPractitionerAndUpdateLinks(new Practitioner()); myPractitioner = createPractitionerAndUpdateLinks(new Practitioner());
@ -33,7 +30,6 @@ public class EmpiProviderClearLinkR4Test extends BaseLinkR4Test {
public void testClearAllLinks() { public void testClearAllLinks() {
assertLinkCount(2); assertLinkCount(2);
myEmpiProviderR4.clearEmpiLinks(null); myEmpiProviderR4.clearEmpiLinks(null);
assertLinkCount(0);
assertNoLinksExist(); assertNoLinksExist();
} }
@ -54,20 +50,14 @@ public class EmpiProviderClearLinkR4Test extends BaseLinkR4Test {
public void testClearPatientLinks() { public void testClearPatientLinks() {
assertLinkCount(2); assertLinkCount(2);
myEmpiProviderR4.clearEmpiLinks(new StringType("patient")); myEmpiProviderR4.clearEmpiLinks(new StringType("patient"));
assertLinkCount(1); assertNoPatientLinksExist();
assertNoLinksExist();
} }
@Test @Test
public void testClearPractitionerLinks() { public void testClearPractitionerLinks() {
myEmpiProviderR4.updateLink(myPersonId, myPatientId, MATCH_RESULT, myRequestDetails); assertLinkCount(2);
try { myEmpiProviderR4.clearEmpiLinks(new StringType("patient"));
myEmpiProviderR4.updateLink(myPersonId, myPatientId, NO_MATCH_RESULT, myRequestDetails); assertNoPractitionerLinksExist();
fail();
} catch (ResourceVersionConflictException e) {
assertThat(e.getMessage(), matchesPattern("Requested resource Person/\\d+/_history/1 is not the latest version. Latest version is Person/\\d+/_history/2"));
}
} }
@Test @Test