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

Test fixes

This commit is contained in:
James Agnew 2019-10-28 10:58:14 -04:00
parent d321a8276a
commit 2b8426114f
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,7 @@
package ca.uhn.fhir.jpa.subscription; package ca.uhn.fhir.jpa.subscription;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.messaging.Message; import org.springframework.messaging.Message;
import org.springframework.messaging.MessageChannel; import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.support.ChannelInterceptor; import org.springframework.messaging.support.ChannelInterceptor;
@ -14,11 +16,12 @@ public class CountingInterceptor implements ChannelInterceptor {
public int getSentCount(String theContainingKeyword) { public int getSentCount(String theContainingKeyword) {
return (int)mySent.stream().filter(t -> t.contains(theContainingKeyword)).count(); return (int)mySent.stream().filter(t -> t.contains(theContainingKeyword)).count();
} }
private static final Logger ourLog = LoggerFactory.getLogger(CountingInterceptor.class);
@Override @Override
public void afterSendCompletion(Message<?> message, MessageChannel channel, boolean sent, Exception ex) { public void afterSendCompletion(Message<?> theMessage, MessageChannel theChannel, boolean theSent, Exception theException) {
if (sent) { ourLog.info("Counting another instance: {}", theMessage);
mySent.add(message.toString()); if (theSent) {
mySent.add(theMessage.toString());
} }
} }

4
hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/resthook/RestHookTestR4Test.java
View File

@ -305,9 +305,9 @@ public class RestHookTestR4Test extends BaseSubscriptionsR4Test {
.addExtension(JpaConstants.EXT_SUBSCRIPTION_RESTHOOK_STRIP_VERSION_IDS, new BooleanType("true")); .addExtension(JpaConstants.EXT_SUBSCRIPTION_RESTHOOK_STRIP_VERSION_IDS, new BooleanType("true"));
ourLog.info("** About to update subscription"); ourLog.info("** About to update subscription");
int modCount = (int) myCountingInterceptor.getSentCount("Observation"); int modCount = (int) myCountingInterceptor.getSentCount("Subscription");
ourClient.update().resource(subscription1).execute(); ourClient.update().resource(subscription1).execute();
waitForSize(modCount + 1, () -> myCountingInterceptor.getSentCount("Observation"), () -> myCountingInterceptor.toString()); waitForSize(modCount + 2, () -> myCountingInterceptor.getSentCount("Subscription"), () -> myCountingInterceptor.toString());
ourLog.info("** About to send observation"); ourLog.info("** About to send observation");
Observation observation2 = sendObservation(code, "SNOMED-CT"); Observation observation2 = sendObservation(code, "SNOMED-CT");

5
hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/resthook/RestHookTestR5Test.java
View File

@ -303,9 +303,10 @@ public class RestHookTestR5Test extends BaseSubscriptionsR5Test {
.addExtension(JpaConstants.EXT_SUBSCRIPTION_RESTHOOK_STRIP_VERSION_IDS, new BooleanType("true")); .addExtension(JpaConstants.EXT_SUBSCRIPTION_RESTHOOK_STRIP_VERSION_IDS, new BooleanType("true"));
ourLog.info("** About to update subscription"); ourLog.info("** About to update subscription");
int modCount = myCountingInterceptor.getSentCount("Observation"); int modCount = myCountingInterceptor.getSentCount("Subscription");
ourLog.info("** About to send another...");
ourClient.update().resource(subscription1).execute(); ourClient.update().resource(subscription1).execute();
waitForSize(modCount + 1, () -> myCountingInterceptor.getSentCount("Observation"), () -> myCountingInterceptor.toString()); waitForSize(modCount + 2, () -> myCountingInterceptor.getSentCount("Subscription"), () -> myCountingInterceptor.toString());
ourLog.info("** About to send observation"); ourLog.info("** About to send observation");
Observation observation2 = sendObservation(code, "SNOMED-CT"); Observation observation2 = sendObservation(code, "SNOMED-CT");