From 028febfe45f2360a7de8b1324053107e3d6809e4 Mon Sep 17 00:00:00 2001
From: Ken Stevens <khstevens@gmail.com>
Date: Tue, 1 Oct 2019 21:16:06 -0400
Subject: [PATCH] await cleanup

---
 hapi-fhir-jpaserver-subscription/pom.xml      | 20 ++++++++++++-------
 .../cache/BaseSubscriptionRegistryTest.java   |  7 ++++++-
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/hapi-fhir-jpaserver-subscription/pom.xml b/hapi-fhir-jpaserver-subscription/pom.xml
index 3f6c9a97187..3dc314827db 100644
--- a/hapi-fhir-jpaserver-subscription/pom.xml
+++ b/hapi-fhir-jpaserver-subscription/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+			xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
@@ -116,12 +117,17 @@
 			<artifactId>jackson-databind</artifactId>
 			<scope>test</scope>
 		</dependency>
-        <dependency>
-            <groupId>ca.uhn.hapi.fhir</groupId>
-            <artifactId>hapi-fhir-test-utilities</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
+		<dependency>
+			<groupId>ca.uhn.hapi.fhir</groupId>
+			<artifactId>hapi-fhir-test-utilities</artifactId>
+			<version>${project.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.awaitility</groupId>
+			<artifactId>awaitility</artifactId>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 	<build>
 		<pluginManagement>
diff --git a/hapi-fhir-jpaserver-subscription/src/test/java/ca/uhn/fhir/jpa/subscription/module/cache/BaseSubscriptionRegistryTest.java b/hapi-fhir-jpaserver-subscription/src/test/java/ca/uhn/fhir/jpa/subscription/module/cache/BaseSubscriptionRegistryTest.java
index 79d613fda21..e7a43b63148 100644
--- a/hapi-fhir-jpaserver-subscription/src/test/java/ca/uhn/fhir/jpa/subscription/module/cache/BaseSubscriptionRegistryTest.java
+++ b/hapi-fhir-jpaserver-subscription/src/test/java/ca/uhn/fhir/jpa/subscription/module/cache/BaseSubscriptionRegistryTest.java
@@ -6,6 +6,7 @@ import org.hl7.fhir.dstu3.model.Subscription;
 import org.junit.After;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import static org.awaitility.Awaitility.await;
 import static org.junit.Assert.assertEquals;
 
 public abstract class BaseSubscriptionRegistryTest extends BaseSubscriptionDstu3Test {
@@ -21,7 +22,11 @@ public abstract class BaseSubscriptionRegistryTest extends BaseSubscriptionDstu3
 	@After
 	public void clearRegistryAfter() {
 		mySubscriptionRegistry.unregisterAllSubscriptions();
-		assertRegistrySize(0);
+		await().until(this::registryEmpty);
+	}
+
+	public boolean registryEmpty() {
+		return mySubscriptionChannelRegistry.size() == 0;
 	}
 
 	protected Subscription createSubscription() {