killbill-memoizeit

catalog: Continue cleanup from 2abcec09423e5 on test TestVersionedCatalog. …

3/4/2019 6:45:49 PM

See#1110.

Note that TestVersionedCatalog test the catalog apis directly, and not the way we invoke apis, therefore it is not affected by the change introduced on ac82838d2704f

stephane brossier

Commit: 090de97

Tree: 15675d9

Parents: ac82838

Changes

catalog/src/test/java/org/killbill/billing/catalog/TestVersionedCatalog.java 10(+3 -7)

Details

catalog/src/test/java/org/killbill/billing/catalog/TestVersionedCatalog.java 10(+3 -7)

diff --git a/catalog/src/test/java/org/killbill/billing/catalog/TestVersionedCatalog.java b/catalog/src/test/java/org/killbill/billing/catalog/TestVersionedCatalog.java
index 7376fcb..4a24cf6 100644
--- a/catalog/src/test/java/org/killbill/billing/catalog/TestVersionedCatalog.java
+++ b/catalog/src/test/java/org/killbill/billing/catalog/TestVersionedCatalog.java
@@ -83,10 +83,9 @@ public class TestVersionedCatalog extends CatalogTestSuiteNoDB {
         Plan plan = vc.findPlan("shotgun-quarterly", dt2, subscriptionStartDate);
         Assert.assertEquals(plan.getAllPhases()[1].getRecurring().getRecurringPrice().getPrice(Currency.USD), new BigDecimal("249.95"));
 
-        // We should see new price because the requested date is >= dt2a and there is no effectiveDateForExistingSubscriptions
-        // TODO
-        //plan = vc.findPlan("shotgun-quarterly", dt2a, subscriptionStartDate);
-        //Assert.assertEquals(plan.getAllPhases()[1].getRecurring().getRecurringPrice().getPrice(Currency.USD), new BigDecimal("259.95"));
+        // We still see old price because the requested date is >= dt2a and there is no effectiveDateForExistingSubscriptions
+        plan = vc.findPlan("shotgun-quarterly", dt2a, subscriptionStartDate);
+        Assert.assertEquals(plan.getAllPhases()[1].getRecurring().getRecurringPrice().getPrice(Currency.USD), new BigDecimal("249.95"));
     }
 
 
@@ -122,7 +121,6 @@ public class TestVersionedCatalog extends CatalogTestSuiteNoDB {
         plan = vc.findPlan("pistol-monthly", dEffectiveDateForExistingSubscriptions, subscriptionStartDate);
         Assert.assertEquals(plan.getAllPhases()[1].getRecurring().getRecurringPrice().getPrice(Currency.USD), new BigDecimal("39.95"));
 
-        // TODO WRONG
         plan = vc.findPlan("pistol-monthly", dt3, subscriptionStartDate);
         Assert.assertEquals(plan.getAllPhases()[1].getRecurring().getRecurringPrice().getPrice(Currency.USD), new BigDecimal("39.95"));
     }
@@ -155,8 +153,6 @@ public class TestVersionedCatalog extends CatalogTestSuiteNoDB {
         plan = vc.createOrFindPlan(pistolMonthly, null, dEffectiveDateForExistingSubscriptions, dt1);
         Assert.assertEquals(plan.getAllPhases()[1].getRecurring().getRecurringPrice().getPrice(Currency.USD), new BigDecimal("39.95"));
 
-
-        // TODO WRONG
         plan = vc.createOrFindPlan(pistolMonthly, null, dt3, dt1);
         Assert.assertEquals(plan.getAllPhases()[1].getRecurring().getRecurringPrice().getPrice(Currency.USD), new BigDecimal("39.95"));