Personal-Twin/hapi-fhir-jpaserver-starter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Affected Issue(s): Fix failing test

Browse Source 
What this commit has achieved:
1. Fixed failing tests in `ExampleServerR4IT` due to:
```
org.awaitility.core.ConditionTimeoutException: Condition with ca.uhn.fhir.jpa.starter.ExampleServerR4IT was not fulfilled within 10 seconds.
```
default await time from Awaitility is 10 seconds
2. Added entries in `.gitignore` related to STS IDE
This commit is contained in:
Levi
2021-08-20 13:40:45 +07:00
committed by Jens Kristian Villadsen
parent e0c1258083
commit c83e196f96
2 changed files with 49 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.gitignore vendored
View File

@@ -119,6 +119,13 @@ local.properties
# STS (Spring Tool Suite) # STS (Spring Tool Suite)
.springBeans .springBeans
.apt_generated
.classpath
.factorypath
.project
.settings
.springBeans
.sts4-cache
# Code Recommenders # Code Recommenders
.recommenders/ .recommenders/

102
src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR4IT.java
View File

@@ -1,13 +1,16 @@
package ca.uhn.fhir.jpa.starter; package ca.uhn.fhir.jpa.starter;
import ca.uhn.fhir.context.FhirContext; import static ca.uhn.fhir.util.TestUtil.waitForSize;
import ca.uhn.fhir.rest.api.CacheControlDirective; import static java.lang.Thread.sleep;
import ca.uhn.fhir.rest.api.EncodingEnum; import static org.awaitility.Awaitility.await;
import ca.uhn.fhir.rest.api.MethodOutcome; import static org.junit.jupiter.api.Assertions.assertEquals;
import ca.uhn.fhir.rest.client.api.IGenericClient; import static org.junit.jupiter.api.Assertions.assertNotNull;
import ca.uhn.fhir.rest.client.api.ServerValidationModeEnum;
import ca.uhn.fhir.rest.client.interceptor.LoggingInterceptor; import java.net.URI;
import ca.uhn.fhir.util.BundleUtil; import java.time.Duration;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import org.eclipse.jetty.websocket.api.Session; import org.eclipse.jetty.websocket.api.Session;
import org.eclipse.jetty.websocket.client.ClientUpgradeRequest; import org.eclipse.jetty.websocket.client.ClientUpgradeRequest;
import org.eclipse.jetty.websocket.client.WebSocketClient; import org.eclipse.jetty.websocket.client.WebSocketClient;
@@ -19,38 +22,25 @@ import org.hl7.fhir.r4.model.Subscription;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.web.server.LocalServerPort; import org.springframework.boot.web.server.LocalServerPort;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import java.net.URI; import ca.uhn.fhir.context.FhirContext;
import java.util.List; import ca.uhn.fhir.rest.api.CacheControlDirective;
import java.util.concurrent.Future; import ca.uhn.fhir.rest.api.EncodingEnum;
import java.util.concurrent.TimeUnit; import ca.uhn.fhir.rest.api.MethodOutcome;
import ca.uhn.fhir.rest.client.api.IGenericClient;
import ca.uhn.fhir.rest.client.api.ServerValidationModeEnum;
import static ca.uhn.fhir.util.TestUtil.waitForSize; @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = Application.class, properties = {
import static java.lang.Thread.sleep; "spring.batch.job.enabled=false", "spring.datasource.url=jdbc:h2:mem:dbr4",
import static java.util.Comparator.comparing; "hapi.fhir.enable_repository_validating_interceptor=true", "hapi.fhir.fhir_version=r4",
import static org.awaitility.Awaitility.await; "hapi.fhir.subscription.websocket_enabled=true", "hapi.fhir.mdm_enabled=true",
import static org.awaitility.Awaitility.pollInSameThread; // Override is currently required when using MDM as the construction of the MDM
import static org.hamcrest.Matchers.equalTo; // beans are ambiguous as they are constructed multiple places. This is evident
import static org.junit.jupiter.api.Assertions.assertEquals; // when running in a spring boot environment
import static org.junit.jupiter.api.Assertions.assertNotNull; "spring.main.allow-bean-definition-overriding=true" })
class ExampleServerR4IT {
@ExtendWith(SpringExtension.class)
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = Application.class, properties =
{
"spring.batch.job.enabled=false",
"spring.datasource.url=jdbc:h2:mem:dbr4",
"hapi.fhir.enable_repository_validating_interceptor=true",
"hapi.fhir.fhir_version=r4",
"hapi.fhir.subscription.websocket_enabled=true",
"hapi.fhir.mdm_enabled=true",
//Override is currently required when using MDM as the construction of the MDM beans are ambiguous as they are constructed multiple places. This is evident when running in a spring boot environment
"spring.main.allow-bean-definition-overriding=true"
})
public class ExampleServerR4IT {
private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(ExampleServerR4IT.class); private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(ExampleServerR4IT.class);
private IGenericClient ourClient; private IGenericClient ourClient;
private FhirContext ourCtx; private FhirContext ourCtx;
@@ -58,7 +48,6 @@ public class ExampleServerR4IT {
@LocalServerPort @LocalServerPort
private int port; private int port;
@Test @Test
@Order(0) @Order(0)
void testCreateAndRead() { void testCreateAndRead() {
@@ -75,27 +64,17 @@ public class ExampleServerR4IT {
Patient pt2 = ourClient.read().resource(Patient.class).withId(id).execute(); Patient pt2 = ourClient.read().resource(Patient.class).withId(id).execute();
assertEquals(methodName, pt2.getName().get(0).getFamily()); assertEquals(methodName, pt2.getName().get(0).getFamily());
// Wait until the MDM message has been processed // Wait until the MDM message has been processed
await().until(() -> { await().atMost(1, TimeUnit.MINUTES).until(() -> getGoldenResourcePatient() != null);
sleep(1000);
return getGoldenResourcePatient() != null;
});
Patient goldenRecord = getGoldenResourcePatient(); Patient goldenRecord = getGoldenResourcePatient();
// Verify that a golden record Patient was created // Verify that a golden record Patient was created
assertNotNull(goldenRecord.getMeta().getTag("http://hapifhir.io/fhir/NamingSystem/mdm-record-status", "GOLDEN_RECORD")); assertNotNull(
goldenRecord.getMeta().getTag("http://hapifhir.io/fhir/NamingSystem/mdm-record-status", "GOLDEN_RECORD"));
} }
private List<Patient> getPatients() {
Bundle bundle = ourClient.search().forResource(Patient.class).cacheControl(new CacheControlDirective().setNoCache(true)).returnBundle(Bundle.class).execute();
List<Patient> retVal = BundleUtil.toListOfResourcesOfType(ourCtx, bundle, Patient.class);
retVal.sort(comparing(o -> ((Patient) o).getMeta().getLastUpdated()).reversed());
return retVal;
}
private Patient getGoldenResourcePatient() { private Patient getGoldenResourcePatient() {
Bundle bundle = ourClient.search() Bundle bundle = ourClient.search().forResource(Patient.class)
.forResource(Patient.class)
.withTag("http://hapifhir.io/fhir/NamingSystem/mdm-record-status", "GOLDEN_RECORD") .withTag("http://hapifhir.io/fhir/NamingSystem/mdm-record-status", "GOLDEN_RECORD")
.cacheControl(new CacheControlDirective().setNoCache(true)).returnBundle(Bundle.class).execute(); .cacheControl(new CacheControlDirective().setNoCache(true)).returnBundle(Bundle.class).execute();
if (bundle.getEntryFirstRep() != null) { if (bundle.getEntryFirstRep() != null) {
@@ -107,7 +86,7 @@ public class ExampleServerR4IT {
@Test @Test
@Order(1) @Order(1)
public void testWebsocketSubscription() throws Exception { void testWebsocketSubscription() throws Exception {
/* /*
* Create subscription * Create subscription
*/ */
@@ -125,14 +104,15 @@ public class ExampleServerR4IT {
IIdType mySubscriptionId = methodOutcome.getId(); IIdType mySubscriptionId = methodOutcome.getId();
// Wait for the subscription to be activated // Wait for the subscription to be activated
await().until(() -> activeSubscriptionCount() == 3); await().atMost(Duration.ofMinutes(1)).until(() -> activeSubscriptionCount() == 3);
/* /*
* Attach websocket * Attach websocket
*/ */
WebSocketClient myWebSocketClient = new WebSocketClient(); WebSocketClient myWebSocketClient = new WebSocketClient();
SocketImplementation mySocketImplementation = new SocketImplementation(mySubscriptionId.getIdPart(), EncodingEnum.JSON); SocketImplementation mySocketImplementation = new SocketImplementation(mySubscriptionId.getIdPart(),
EncodingEnum.JSON);
myWebSocketClient.start(); myWebSocketClient.start();
URI echoUri = new URI("ws://localhost:" + port + "/websocket"); URI echoUri = new URI("ws://localhost:" + port + "/websocket");
@@ -150,9 +130,6 @@ public class ExampleServerR4IT {
obs.setStatus(Observation.ObservationStatus.FINAL); obs.setStatus(Observation.ObservationStatus.FINAL);
ourClient.create().resource(obs).execute(); ourClient.create().resource(obs).execute();
// Give some time for the subscription to deliver
sleep(2000);
/* /*
* Ensure that we receive a ping on the websocket * Ensure that we receive a ping on the websocket
*/ */
@@ -165,10 +142,11 @@ public class ExampleServerR4IT {
} }
private int activeSubscriptionCount() { private int activeSubscriptionCount() {
return ourClient.search().forResource(Subscription.class).where(Subscription.STATUS.exactly().code("active")).cacheControl(new CacheControlDirective().setNoCache(true)).returnBundle(Bundle.class).execute().getEntry().size(); return ourClient.search().forResource(Subscription.class).where(Subscription.STATUS.exactly().code("active"))
.cacheControl(new CacheControlDirective().setNoCache(true)).returnBundle(Bundle.class).execute().getEntry()
.size();
} }
@BeforeEach @BeforeEach
void beforeEach() { void beforeEach() {
@@ -177,6 +155,10 @@ public class ExampleServerR4IT {
ourCtx.getRestfulClientFactory().setSocketTimeout(1200 * 1000); ourCtx.getRestfulClientFactory().setSocketTimeout(1200 * 1000);
String ourServerBase = "http://localhost:" + port + "/fhir/"; String ourServerBase = "http://localhost:" + port + "/fhir/";
ourClient = ourCtx.newRestfulGenericClient(ourServerBase); ourClient = ourCtx.newRestfulGenericClient(ourServerBase);
// ourClient.registerInterceptor(new LoggingInterceptor(false));
await().atMost(2, TimeUnit.MINUTES).until(() -> {
sleep(1000); // execute below function every 1 second
return activeSubscriptionCount() == 2; // 2 subscription based on mdm-rules.json
});
} }
} }