killbill-uncached

beatrix: Add test assertion to demonstrate current issue when

3/8/2019 5:59:00 PM

Details

diff --git a/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestCatalogRetireElements.java b/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestCatalogRetireElements.java
index 80fb354..36f493e 100644
--- a/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestCatalogRetireElements.java
+++ b/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestCatalogRetireElements.java
@@ -17,6 +17,7 @@
 
 package org.killbill.billing.beatrix.integration;
 
+import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -26,6 +27,7 @@ import org.joda.time.LocalDate;
 import org.killbill.billing.ErrorCode;
 import org.killbill.billing.account.api.Account;
 import org.killbill.billing.api.TestApiListener.NextEvent;
+import org.killbill.billing.beatrix.util.InvoiceChecker.ExpectedInvoiceItemCheck;
 import org.killbill.billing.catalog.api.BillingPeriod;
 import org.killbill.billing.catalog.api.PhaseType;
 import org.killbill.billing.catalog.api.PlanPhaseSpecifier;
@@ -37,6 +39,7 @@ import org.killbill.billing.entitlement.api.Entitlement;
 import org.killbill.billing.entitlement.api.Entitlement.EntitlementState;
 import org.killbill.billing.entitlement.api.EntitlementApiException;
 import org.killbill.billing.invoice.api.Invoice;
+import org.killbill.billing.invoice.api.InvoiceItemType;
 import org.killbill.billing.payment.api.PluginProperty;
 import org.killbill.billing.platform.api.KillbillConfigSource;
 import org.testng.annotations.Test;
@@ -96,6 +99,14 @@ public class TestCatalogRetireElements extends TestIntegrationBase {
         bpEntitlement.changePlanWithDate(new DefaultEntitlementSpecifier(spec1), clock.getUTCToday(), ImmutableList.<PluginProperty>of(), callContext);
         assertListenerStatus();
 
+        invoiceChecker.checkInvoice(account.getId(), 4, callContext,
+                                    // Although we are now on V2 (price = 295.95) we still invoice at 249.95
+                                    new ExpectedInvoiceItemCheck(new LocalDate(2015, 12, 5), new LocalDate(2016, 1, 5), InvoiceItemType.RECURRING, new BigDecimal("249.95")),
+                                    new ExpectedInvoiceItemCheck(new LocalDate(2015, 12, 5), new LocalDate(2016, 1, 5), InvoiceItemType.REPAIR_ADJ, new BigDecimal("-500.00")),
+                                    new ExpectedInvoiceItemCheck(new LocalDate(2015, 12, 5), new LocalDate(2015, 12, 5), InvoiceItemType.CBA_ADJ, new BigDecimal("250.05")));
+
+
+
     }
 
 
diff --git a/beatrix/src/test/resources/catalogs/testCatalogRetireElements/WeaponsHireSmall-v2.xml b/beatrix/src/test/resources/catalogs/testCatalogRetireElements/WeaponsHireSmall-v2.xml
index d9fe488..82649c1 100644
--- a/beatrix/src/test/resources/catalogs/testCatalogRetireElements/WeaponsHireSmall-v2.xml
+++ b/beatrix/src/test/resources/catalogs/testCatalogRetireElements/WeaponsHireSmall-v2.xml
@@ -195,15 +195,15 @@
                     <recurringPrice>
                         <price>
                             <currency>USD</currency>
-                            <value>249.95</value>
+                            <value>295.95</value>
                         </price>
                         <price>
                             <currency>EUR</currency>
-                            <value>149.95</value>
+                            <value>249.95</value>
                         </price>
                         <price>
                             <currency>GBP</currency>
-                            <value>169.95</value>
+                            <value>269.95</value>
                         </price>
                     </recurringPrice>
                 </recurring>