killbill-uncached

util: Fix flaky test (missing event handling)

12/10/2015 7:21:43 PM

stephane brossier

Commit: 1d1b6bb

Tree: c52fa7b

Parents: ca098c3

Changes

util/src/test/java/org/killbill/billing/util/tag/api/TestDefaultTagUserApi.java 8(+8 -0)

Details

util/src/test/java/org/killbill/billing/util/tag/api/TestDefaultTagUserApi.java 8(+8 -0)

diff --git a/util/src/test/java/org/killbill/billing/util/tag/api/TestDefaultTagUserApi.java b/util/src/test/java/org/killbill/billing/util/tag/api/TestDefaultTagUserApi.java
index 7042c2b..978f5bb 100644
--- a/util/src/test/java/org/killbill/billing/util/tag/api/TestDefaultTagUserApi.java
+++ b/util/src/test/java/org/killbill/billing/util/tag/api/TestDefaultTagUserApi.java
@@ -79,7 +79,10 @@ public class TestDefaultTagUserApi extends UtilTestSuiteWithEmbeddedDB {
             }
         });
 
+        eventsListener.pushExpectedEvent(NextEvent.TAG);
         tagUserApi.removeTags(accountId, ObjectType.ACCOUNT, ImmutableList.<UUID>of(ControlTagType.WRITTEN_OFF.getId()), callContext);
+        assertListenerStatus();
+
         List<Tag> remainingTags = tagUserApi.getTagsForObject(accountId, ObjectType.ACCOUNT, false, callContext);
         Assert.assertEquals(remainingTags.size(), 0);
 
@@ -88,13 +91,18 @@ public class TestDefaultTagUserApi extends UtilTestSuiteWithEmbeddedDB {
         // Add again the tag
         eventsListener.pushExpectedEvent(NextEvent.TAG);
         tagUserApi.addTags(accountId, ObjectType.ACCOUNT, ImmutableList.<UUID>of(ControlTagType.WRITTEN_OFF.getId()), callContext);
+        assertListenerStatus();
+
         remainingTags = tagUserApi.getTagsForObject(accountId, ObjectType.ACCOUNT, false, callContext);
         Assert.assertEquals(remainingTags.size(), 1);
 
         checkPagination(1);
 
         // Delete again
+        eventsListener.pushExpectedEvent(NextEvent.TAG);
         tagUserApi.removeTags(accountId, ObjectType.ACCOUNT, ImmutableList.<UUID>of(ControlTagType.WRITTEN_OFF.getId()), callContext);
+        assertListenerStatus();
+
         remainingTags = tagUserApi.getTagsForObject(accountId, ObjectType.ACCOUNT, false, callContext);
         Assert.assertEquals(remainingTags.size(), 0);