diff --git a/junction/src/main/java/com/ning/billing/junction/plumbing/billing/BlockingCalculator.java b/junction/src/main/java/com/ning/billing/junction/plumbing/billing/BlockingCalculator.java
index 3070fd2..1262b20 100644
--- a/junction/src/main/java/com/ning/billing/junction/plumbing/billing/BlockingCalculator.java
+++ b/junction/src/main/java/com/ning/billing/junction/plumbing/billing/BlockingCalculator.java
@@ -41,9 +41,11 @@ import com.ning.billing.entitlement.api.user.Subscription;
import com.ning.billing.junction.api.BlockingApi;
import com.ning.billing.junction.api.BlockingState;
+import com.google.common.annotations.VisibleForTesting;
import com.google.inject.Inject;
public class BlockingCalculator {
+
private static final AtomicLong globaltotalOrder = new AtomicLong();
private final BlockingApi blockingApi;
@@ -275,4 +277,8 @@ public class BlockingCalculator {
return result;
}
+ @VisibleForTesting
+ static AtomicLong getGlobalTotalOrder() {
+ return globaltotalOrder;
+ }
}
diff --git a/junction/src/test/java/com/ning/billing/junction/plumbing/billing/TestBlockingCalculator.java b/junction/src/test/java/com/ning/billing/junction/plumbing/billing/TestBlockingCalculator.java
index dc535de..03c8422 100644
--- a/junction/src/test/java/com/ning/billing/junction/plumbing/billing/TestBlockingCalculator.java
+++ b/junction/src/test/java/com/ning/billing/junction/plumbing/billing/TestBlockingCalculator.java
@@ -594,7 +594,8 @@ public class TestBlockingCalculator extends JunctionTestSuite {
assertEquals(result.getBillingMode(), event.getBillingMode());
assertEquals(result.getBillingPeriod(), event.getBillingPeriod());
assertEquals(result.getTransitionType(), SubscriptionTransitionType.START_BILLING_DISABLED);
- assertEquals(result.getTotalOrdering(), new Long(0));
+ // TODO - ugly, fragile
+ assertEquals(result.getTotalOrdering(), (Long) (BlockingCalculator.getGlobalTotalOrder().get() - 1));
}
@Test(groups = "fast")
@@ -614,7 +615,8 @@ public class TestBlockingCalculator extends JunctionTestSuite {
assertEquals(result.getBillingMode(), event.getBillingMode());
assertEquals(result.getBillingPeriod(), event.getBillingPeriod());
assertEquals(result.getTransitionType(), SubscriptionTransitionType.END_BILLING_DISABLED);
- assertEquals(result.getTotalOrdering(), new Long(0));
+ // TODO - ugly, fragile
+ assertEquals(result.getTotalOrdering(), (Long) (BlockingCalculator.getGlobalTotalOrder().get() - 1));
}
private class MockBillingEvent extends DefaultBillingEvent {
