killbill-aplcache

Fixed the tests

3/26/2012 6:20:13 PM

Martin Westhead

Commit: b0576a6

Tree: 7161536

Parents: 7120a8e

Changes

invoice/src/main/java/com/ning/billing/invoice/model/BillingEventSet.java 5(+4 -1)

invoice/src/test/java/com/ning/billing/invoice/api/migration/MockModuleNoEntitlement.java 3(+2 -1)

invoice/src/test/java/com/ning/billing/invoice/api/migration/TestDefaultInvoiceMigrationApi.java 4(+2 -2)

invoice/src/test/java/com/ning/billing/invoice/TestInvoiceDispatcher.java 2(+1 -1)

Details

invoice/src/main/java/com/ning/billing/invoice/model/BillingEventSet.java 5(+4 -1)

diff --git a/invoice/src/main/java/com/ning/billing/invoice/model/BillingEventSet.java b/invoice/src/main/java/com/ning/billing/invoice/model/BillingEventSet.java
index da95559..8cf1e1e 100644
--- a/invoice/src/main/java/com/ning/billing/invoice/model/BillingEventSet.java
+++ b/invoice/src/main/java/com/ning/billing/invoice/model/BillingEventSet.java
@@ -28,7 +28,10 @@ public class BillingEventSet extends ArrayList<BillingEvent> {
 
     public BillingEventSet(Collection<BillingEvent> events) {
         super();
-        addAll(events);
+        if(events != null) {
+            addAll(events);
+            
+        }
     }
 
     public boolean isLast(final BillingEvent event) {

invoice/src/test/java/com/ning/billing/invoice/api/migration/MockModuleNoEntitlement.java 3(+2 -1)

diff --git a/invoice/src/test/java/com/ning/billing/invoice/api/migration/MockModuleNoEntitlement.java b/invoice/src/test/java/com/ning/billing/invoice/api/migration/MockModuleNoEntitlement.java
index 4701bc8..300313c 100644
--- a/invoice/src/test/java/com/ning/billing/invoice/api/migration/MockModuleNoEntitlement.java
+++ b/invoice/src/test/java/com/ning/billing/invoice/api/migration/MockModuleNoEntitlement.java
@@ -32,7 +32,8 @@ public class MockModuleNoEntitlement extends MockModule {
 	@Override
 	protected void installEntitlementModule() {
 		EntitlementBillingApi entitlementApi = BrainDeadProxyFactory.createBrainDeadProxyFor(EntitlementBillingApi.class);
-		((ZombieControl)entitlementApi).addResult("setChargedThroughDateFromTransaction", BrainDeadProxyFactory.ZOMBIE_VOID);
+        ((ZombieControl)entitlementApi).addResult("setChargedThroughDateFromTransaction", BrainDeadProxyFactory.ZOMBIE_VOID);
+        ((ZombieControl)entitlementApi).addResult("getBillingEventsForAccountAndUpdateAccountBCD", BrainDeadProxyFactory.ZOMBIE_VOID);
 		bind(EntitlementBillingApi.class).toInstance(entitlementApi);
 		bind(EntitlementDao.class).toInstance(BrainDeadProxyFactory.createBrainDeadProxyFor(EntitlementDao.class));

invoice/src/test/java/com/ning/billing/invoice/api/migration/TestDefaultInvoiceMigrationApi.java 4(+2 -2)

diff --git a/invoice/src/test/java/com/ning/billing/invoice/api/migration/TestDefaultInvoiceMigrationApi.java b/invoice/src/test/java/com/ning/billing/invoice/api/migration/TestDefaultInvoiceMigrationApi.java
index 23561a1..5f24072 100644
--- a/invoice/src/test/java/com/ning/billing/invoice/api/migration/TestDefaultInvoiceMigrationApi.java
+++ b/invoice/src/test/java/com/ning/billing/invoice/api/migration/TestDefaultInvoiceMigrationApi.java
@@ -178,8 +178,8 @@ public class TestDefaultInvoiceMigrationApi {
 				BillingModeType.IN_ADVANCE, "", 1L, SubscriptionTransitionType.CREATE));
 
 		EntitlementBillingApi entitlementBillingApi = BrainDeadProxyFactory.createBrainDeadProxyFor(EntitlementBillingApi.class);
-		((ZombieControl)entitlementBillingApi).addResult("getBillingEventsForAccount", events);
-
+        ((ZombieControl)entitlementBillingApi).addResult("getBillingEventsForAccountAndUpdateAccountBCD", events);
+        
 		InvoiceDispatcher dispatcher = new InvoiceDispatcher(generator, accountUserApi, entitlementBillingApi, invoiceDao, locker);
 
 		Invoice invoice = dispatcher.processAccount(accountId, date_regular, true);

invoice/src/test/java/com/ning/billing/invoice/TestInvoiceDispatcher.java 2(+1 -1)

diff --git a/invoice/src/test/java/com/ning/billing/invoice/TestInvoiceDispatcher.java b/invoice/src/test/java/com/ning/billing/invoice/TestInvoiceDispatcher.java
index 26983fc..5ee2da2 100644
--- a/invoice/src/test/java/com/ning/billing/invoice/TestInvoiceDispatcher.java
+++ b/invoice/src/test/java/com/ning/billing/invoice/TestInvoiceDispatcher.java
@@ -141,7 +141,7 @@ public class TestInvoiceDispatcher {
 				BillingModeType.IN_ADVANCE, "", 1L, SubscriptionTransitionType.CREATE));
 
 		EntitlementBillingApi entitlementBillingApi = BrainDeadProxyFactory.createBrainDeadProxyFor(EntitlementBillingApi.class);
-		((ZombieControl)entitlementBillingApi).addResult("getBillingEventsForAccount", events);
+		((ZombieControl)entitlementBillingApi).addResult("getBillingEventsForAccountAndUpdateAccountBCD", events);
 
 		DateTime target = new DateTime();