killbill-memoizeit

junction, beatrix: Fix minor issues found in tests. See 1229580

6/19/2018 12:05:15 AM

stephane brossier

Commit: 6f59e0c

Tree: 35b9118

Parents: 1229580

Changes

beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestIntegration.java 7(+4 -3)

junction/src/main/java/org/killbill/billing/junction/plumbing/billing/DefaultBillingEvent.java 2(+1 -1)

Details

beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestIntegration.java 7(+4 -3)

diff --git a/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestIntegration.java b/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestIntegration.java
index bb9e84c..6abcdad 100644
--- a/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestIntegration.java
+++ b/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestIntegration.java
@@ -1094,15 +1094,16 @@ public class TestIntegration extends TestIntegrationBase {
         clock.addDays(30);
         assertListenerStatus();
         invoiceChecker.checkInvoice(account.getId(), 2, callContext,
-                                    new ExpectedInvoiceItemCheck(new LocalDate(2015, 10, 1), new LocalDate(2016, 10, 1), InvoiceItemType.RECURRING, new BigDecimal("2399.95")));
+                                    new ExpectedInvoiceItemCheck(new LocalDate(2015, 10, 1), new LocalDate(2016, 10, 1), InvoiceItemType.RECURRING, new BigDecimal("2399.95")),
+                                    new ExpectedInvoiceItemCheck(new LocalDate(2015, 9, 1), new LocalDate(2015, 10, 1), InvoiceItemType.USAGE, BigDecimal.ZERO));
 
         // 2015-11-1
-        busHandler.pushExpectedEvent(NextEvent.NULL_INVOICE);
+        busHandler.pushExpectedEvent(NextEvent.INVOICE);
         clock.addMonths(1);
         assertListenerStatus();
 
         // 2015-12-1
-        busHandler.pushExpectedEvent(NextEvent.NULL_INVOICE);
+        busHandler.pushExpectedEvent(NextEvent.INVOICE);
         clock.addMonths(1);
         assertListenerStatus();

junction/src/main/java/org/killbill/billing/junction/plumbing/billing/DefaultBillingEvent.java 2(+1 -1)

diff --git a/junction/src/main/java/org/killbill/billing/junction/plumbing/billing/DefaultBillingEvent.java b/junction/src/main/java/org/killbill/billing/junction/plumbing/billing/DefaultBillingEvent.java
index 8af71c9..f7285c5 100644
--- a/junction/src/main/java/org/killbill/billing/junction/plumbing/billing/DefaultBillingEvent.java
+++ b/junction/src/main/java/org/killbill/billing/junction/plumbing/billing/DefaultBillingEvent.java
@@ -129,7 +129,7 @@ public class DefaultBillingEvent implements BillingEvent {
         this.usages = initializeUsage(isActive);
         this.isDisableEvent = isDisableEvent;
         this.nextPlanPhase = isDisableEvent ? null : planPhase;
-        this.catalogEffectiveDate = ((DefaultPlan) plan).getCatalogEffectiveDate();
+        this.catalogEffectiveDate = plan != null ? ((DefaultPlan) plan).getCatalogEffectiveDate() : null;
 
     }