killbill-memoizeit

subscription: fix flaky test testCancelUncancelFutureSubscription Signed-off-by:

4/25/2017 4:21:02 AM

Details

diff --git a/subscription/src/test/java/org/killbill/billing/subscription/api/user/TestUserApiCancel.java b/subscription/src/test/java/org/killbill/billing/subscription/api/user/TestUserApiCancel.java
index 72dd488..64c6bc1 100644
--- a/subscription/src/test/java/org/killbill/billing/subscription/api/user/TestUserApiCancel.java
+++ b/subscription/src/test/java/org/killbill/billing/subscription/api/user/TestUserApiCancel.java
@@ -414,11 +414,13 @@ public class TestUserApiCancel extends SubscriptionTestSuiteWithEmbeddedDB {
             subscription = (DefaultSubscriptionBase) subscriptionInternalApi.getSubscriptionFromId(subscription.getId(), internalCallContext);
             assertEquals(subscription.getState(), EntitlementState.PENDING);
 
+            testListener.pushExpectedEvents(NextEvent.UNCANCEL);
             subscription.uncancel(callContext);
+            assertListenerStatus();
         }
 
         // Now check we are on the right state (as if nothing had happened)
-        testListener.pushExpectedEvents(NextEvent.CREATE, NextEvent.UNCANCEL, NextEvent.UNCANCEL, NextEvent.UNCANCEL);
+        testListener.pushExpectedEvents(NextEvent.CREATE);
         clock.addDays(10);
         assertListenerStatus();