diff --git a/entitlement/src/test/java/com/ning/billing/entitlement/api/TestDefaultEntitlement.java b/entitlement/src/test/java/com/ning/billing/entitlement/api/TestDefaultEntitlement.java
index 2f77d9a..0f66229 100644
--- a/entitlement/src/test/java/com/ning/billing/entitlement/api/TestDefaultEntitlement.java
+++ b/entitlement/src/test/java/com/ning/billing/entitlement/api/TestDefaultEntitlement.java
@@ -18,7 +18,6 @@ package com.ning.billing.entitlement.api;
import org.joda.time.DateTime;
import org.joda.time.LocalDate;
-import org.testng.Assert;
import org.testng.annotations.Test;
import com.ning.billing.account.api.Account;
@@ -33,178 +32,129 @@ import com.ning.billing.entitlement.api.Entitlement.EntitlementActionPolicy;
import com.ning.billing.entitlement.api.Entitlement.EntitlementState;
import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertNull;
import static org.testng.Assert.assertTrue;
public class TestDefaultEntitlement extends EntitlementTestSuiteWithEmbeddedDB {
-
@Test(groups = "slow")
- public void testCancelWithEntitlementDate() {
-
- try {
- final LocalDate initialDate = new LocalDate(2013, 8, 7);
- clock.setDay(initialDate);
-
- final Account account = accountApi.createAccount(getAccountData(7), callContext);
+ public void testCancelWithEntitlementDate() throws AccountApiException, EntitlementApiException {
+ final LocalDate initialDate = new LocalDate(2013, 8, 7);
+ clock.setDay(initialDate);
- final PlanPhaseSpecifier spec = new PlanPhaseSpecifier("Shotgun", ProductCategory.BASE, BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, null);
+ final Account account = accountApi.createAccount(getAccountData(7), callContext);
- // Create entitlement and check each field
- final Entitlement entitlement = entitlementApi.createBaseEntitlement(account.getId(), spec, account.getExternalKey(), initialDate, callContext);
- assertEquals(entitlement.getState(), EntitlementState.ACTIVE);
+ final PlanPhaseSpecifier spec = new PlanPhaseSpecifier("Shotgun", ProductCategory.BASE, BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, null);
- clock.addDays(5);
- final LocalDate cancelDate = new LocalDate(clock.getUTCNow());
- entitlement.cancelEntitlementWithDate(cancelDate, true, callContext);
- final Entitlement entitlement2 = entitlementApi.getEntitlementForId(entitlement.getId(), callContext);
- assertEquals(entitlement2.getState(), EntitlementState.CANCELLED);
- assertEquals(entitlement2.getEffectiveEndDate(), cancelDate);
+ // Create entitlement and check each field
+ final Entitlement entitlement = entitlementApi.createBaseEntitlement(account.getId(), spec, account.getExternalKey(), initialDate, callContext);
+ assertEquals(entitlement.getState(), EntitlementState.ACTIVE);
- } catch (EntitlementApiException e) {
- Assert.fail("Test failed " + e.getMessage());
- } catch (AccountApiException e) {
- Assert.fail("Test failed " + e.getMessage());
- }
+ clock.addDays(5);
+ final LocalDate cancelDate = new LocalDate(clock.getUTCNow());
+ entitlement.cancelEntitlementWithDate(cancelDate, true, callContext);
+ final Entitlement entitlement2 = entitlementApi.getEntitlementForId(entitlement.getId(), callContext);
+ assertEquals(entitlement2.getState(), EntitlementState.CANCELLED);
+ assertEquals(entitlement2.getEffectiveEndDate(), cancelDate);
}
-
@Test(groups = "slow")
- public void testCancelWithEntitlementDateInFuture() {
-
- try {
- final LocalDate initialDate = new LocalDate(2013, 8, 7);
- clock.setDay(initialDate);
+ public void testCancelWithEntitlementDateInFuture() throws AccountApiException, EntitlementApiException {
+ final LocalDate initialDate = new LocalDate(2013, 8, 7);
+ clock.setDay(initialDate);
- final Account account = accountApi.createAccount(getAccountData(7), callContext);
+ final Account account = accountApi.createAccount(getAccountData(7), callContext);
- final PlanPhaseSpecifier spec = new PlanPhaseSpecifier("Shotgun", ProductCategory.BASE, BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, null);
+ final PlanPhaseSpecifier spec = new PlanPhaseSpecifier("Shotgun", ProductCategory.BASE, BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, null);
- // Create entitlement and check each field
- final Entitlement entitlement = entitlementApi.createBaseEntitlement(account.getId(), spec, account.getExternalKey(), initialDate, callContext);
- assertEquals(entitlement.getState(), EntitlementState.ACTIVE);
+ // Create entitlement and check each field
+ final Entitlement entitlement = entitlementApi.createBaseEntitlement(account.getId(), spec, account.getExternalKey(), initialDate, callContext);
+ assertEquals(entitlement.getState(), EntitlementState.ACTIVE);
- clock.addDays(5);
- final LocalDate cancelDate = new LocalDate(clock.getUTCToday().plusDays(1));
- entitlement.cancelEntitlementWithDate(cancelDate, true, callContext);
- final Entitlement entitlement2 = entitlementApi.getEntitlementForId(entitlement.getId(), callContext);
- assertEquals(entitlement2.getState(), EntitlementState.ACTIVE);
- assertEquals(entitlement2.getEffectiveEndDate(), cancelDate);
+ clock.addDays(5);
+ final LocalDate cancelDate = new LocalDate(clock.getUTCToday().plusDays(1));
+ entitlement.cancelEntitlementWithDate(cancelDate, true, callContext);
+ final Entitlement entitlement2 = entitlementApi.getEntitlementForId(entitlement.getId(), callContext);
+ assertEquals(entitlement2.getState(), EntitlementState.ACTIVE);
+ assertEquals(entitlement2.getEffectiveEndDate(), cancelDate);
- clock.addDays(1);
- final Entitlement entitlement3 = entitlementApi.getEntitlementForId(entitlement.getId(), callContext);
- assertEquals(entitlement3.getState(), EntitlementState.CANCELLED);
- assertEquals(entitlement3.getEffectiveEndDate(), cancelDate);
-
- } catch (EntitlementApiException e) {
- Assert.fail("Test failed " + e.getMessage());
- } catch (AccountApiException e) {
- Assert.fail("Test failed " + e.getMessage());
- }
+ clock.addDays(1);
+ final Entitlement entitlement3 = entitlementApi.getEntitlementForId(entitlement.getId(), callContext);
+ assertEquals(entitlement3.getState(), EntitlementState.CANCELLED);
+ assertEquals(entitlement3.getEffectiveEndDate(), cancelDate);
}
-
@Test(groups = "slow")
- public void testUncancel() {
-
- try {
- final LocalDate initialDate = new LocalDate(2013, 8, 7);
- clock.setDay(initialDate);
-
- final Account account = accountApi.createAccount(getAccountData(7), callContext);
+ public void testUncancel() throws AccountApiException, EntitlementApiException {
+ final LocalDate initialDate = new LocalDate(2013, 8, 7);
+ clock.setDay(initialDate);
- final PlanPhaseSpecifier spec = new PlanPhaseSpecifier("Shotgun", ProductCategory.BASE, BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, null);
+ final Account account = accountApi.createAccount(getAccountData(7), callContext);
- // Create entitlement and check each field
- final Entitlement entitlement = entitlementApi.createBaseEntitlement(account.getId(), spec, account.getExternalKey(), initialDate, callContext);
- assertEquals(entitlement.getState(), EntitlementState.ACTIVE);
+ final PlanPhaseSpecifier spec = new PlanPhaseSpecifier("Shotgun", ProductCategory.BASE, BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, null);
- clock.addDays(5);
- final LocalDate cancelDate = new LocalDate(clock.getUTCToday().plusDays(1));
- entitlement.cancelEntitlementWithDate(cancelDate, true, callContext);
- final Entitlement entitlement2 = entitlementApi.getEntitlementForId(entitlement.getId(), callContext);
- assertEquals(entitlement2.getState(), EntitlementState.ACTIVE);
- assertEquals(entitlement2.getEffectiveEndDate(), cancelDate);
+ // Create entitlement and check each field
+ final Entitlement entitlement = entitlementApi.createBaseEntitlement(account.getId(), spec, account.getExternalKey(), initialDate, callContext);
+ assertEquals(entitlement.getState(), EntitlementState.ACTIVE);
- entitlement2.uncancelEntitlement(callContext);
+ clock.addDays(5);
+ final LocalDate cancelDate = new LocalDate(clock.getUTCToday().plusDays(1));
+ entitlement.cancelEntitlementWithDate(cancelDate, true, callContext);
+ final Entitlement entitlement2 = entitlementApi.getEntitlementForId(entitlement.getId(), callContext);
+ assertEquals(entitlement2.getState(), EntitlementState.ACTIVE);
+ assertEquals(entitlement2.getEffectiveEndDate(), cancelDate);
- clock.addDays(1);
- final Entitlement entitlement3 = entitlementApi.getEntitlementForId(entitlement.getId(), callContext);
- assertEquals(entitlement3.getState(), EntitlementState.ACTIVE);
+ entitlement2.uncancelEntitlement(callContext);
- } catch (EntitlementApiException e) {
- Assert.fail("Test failed " + e.getMessage());
- } catch (AccountApiException e) {
- Assert.fail("Test failed " + e.getMessage());
- }
+ clock.addDays(1);
+ final Entitlement entitlement3 = entitlementApi.getEntitlementForId(entitlement.getId(), callContext);
+ assertEquals(entitlement3.getState(), EntitlementState.ACTIVE);
}
@Test(groups = "slow")
- public void testCancelWithEntitlementPolicyEOTAndNOCTD() {
+ public void testCancelWithEntitlementPolicyEOTAndNOCTD() throws AccountApiException, EntitlementApiException, SubscriptionApiException {
+ final LocalDate initialDate = new LocalDate(2013, 8, 7);
+ clock.setDay(initialDate);
- try {
+ final Account account = accountApi.createAccount(getAccountData(7), callContext);
- final LocalDate initialDate = new LocalDate(2013, 8, 7);
- clock.setDay(initialDate);
+ final PlanPhaseSpecifier spec = new PlanPhaseSpecifier("Shotgun", ProductCategory.BASE, BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, null);
- final Account account = accountApi.createAccount(getAccountData(7), callContext);
+ // Create entitlement and check each field
+ final Entitlement entitlement = entitlementApi.createBaseEntitlement(account.getId(), spec, account.getExternalKey(), initialDate, callContext);
- final PlanPhaseSpecifier spec = new PlanPhaseSpecifier("Shotgun", ProductCategory.BASE, BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, null);
-
- // Create entitlement and check each field
- final Entitlement entitlement = entitlementApi.createBaseEntitlement(account.getId(), spec, account.getExternalKey(), initialDate, callContext);
-
- final Entitlement cancelledEntitlement = entitlement.cancelEntitlementWithPolicy(EntitlementActionPolicy.END_OF_TERM, callContext);
- assertEquals(cancelledEntitlement.getState(), EntitlementState.CANCELLED);
- assertEquals(cancelledEntitlement.getEffectiveEndDate(), initialDate);
-
- } catch (EntitlementApiException e) {
- Assert.fail("Test failed " + e.getMessage());
- } catch (AccountApiException e) {
- Assert.fail("Test failed " + e.getMessage());
- }
+ final Entitlement cancelledEntitlement = entitlement.cancelEntitlementWithPolicy(EntitlementActionPolicy.END_OF_TERM, callContext);
+ assertEquals(cancelledEntitlement.getState(), EntitlementState.CANCELLED);
+ assertEquals(cancelledEntitlement.getEffectiveEndDate(), initialDate);
}
-
@Test(groups = "slow")
- public void testCancelWithEntitlementPolicyEOTAndCTD() {
+ public void testCancelWithEntitlementPolicyEOTAndCTD() throws AccountApiException, EntitlementApiException, SubscriptionApiException {
+ final LocalDate initialDate = new LocalDate(2013, 8, 7);
+ clock.setDay(initialDate);
- try {
+ final Account account = accountApi.createAccount(getAccountData(7), callContext);
- final LocalDate initialDate = new LocalDate(2013, 8, 7);
- clock.setDay(initialDate);
+ final PlanPhaseSpecifier spec = new PlanPhaseSpecifier("Shotgun", ProductCategory.BASE, BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, null);
- final Account account = accountApi.createAccount(getAccountData(7), callContext);
+ // Create entitlement and check each field
+ final Entitlement entitlement = entitlementApi.createBaseEntitlement(account.getId(), spec, account.getExternalKey(), initialDate, callContext);
- final PlanPhaseSpecifier spec = new PlanPhaseSpecifier("Shotgun", ProductCategory.BASE, BillingPeriod.MONTHLY, PriceListSet.DEFAULT_PRICELIST_NAME, null);
+ final DateTime ctd = clock.getUTCNow().plusDays(30).plusMonths(1);
+ testListener.pushExpectedEvent(NextEvent.PHASE);
+ clock.addDays(32);
+ // Set manually since no invoice
+ subscriptionInternalApi.setChargedThroughDate(entitlement.getId(), ctd, internalCallContext);
+ assertTrue(testListener.isCompleted(5000));
- // Create entitlement and check each field
- final Entitlement entitlement = entitlementApi.createBaseEntitlement(account.getId(), spec, account.getExternalKey(), initialDate, callContext);
+ final Entitlement entitlement2 = entitlementApi.getEntitlementForId(entitlement.getId(), callContext);
+ final Entitlement entitlement3 = entitlement2.cancelEntitlementWithPolicy(EntitlementActionPolicy.END_OF_TERM, callContext);
+ assertEquals(entitlement3.getState(), EntitlementState.ACTIVE);
+ assertEquals(entitlement3.getEffectiveEndDate(), new LocalDate(ctd));
- final DateTime ctd = clock.getUTCNow().plusDays(30).plusMonths(1);
- testListener.pushExpectedEvent(NextEvent.PHASE);
- clock.addDays(32);
- // Set manually since no invoice
- subscriptionInternalApi.setChargedThroughDate(entitlement.getId(), ctd, internalCallContext);
- assertTrue(testListener.isCompleted(5000));
+ clock.addMonths(1);
- final Entitlement entitlement2 = entitlementApi.getEntitlementForId(entitlement.getId(), callContext);
- final Entitlement entitlement3 = entitlement2.cancelEntitlementWithPolicy(EntitlementActionPolicy.END_OF_TERM, callContext);
- assertEquals(entitlement3.getState(), EntitlementState.ACTIVE);
- assertEquals(entitlement3.getEffectiveEndDate(), new LocalDate(ctd));
-
- clock.addMonths(1);
-
- final Entitlement entitlement4 = entitlementApi.getEntitlementForId(entitlement.getId(), callContext);
- assertEquals(entitlement4.getState(), EntitlementState.CANCELLED);
- assertEquals(entitlement4.getEffectiveEndDate(), new LocalDate(ctd));
-
- } catch (EntitlementApiException e) {
- Assert.fail("Test failed " + e.getMessage());
- } catch (AccountApiException e) {
- Assert.fail("Test failed " + e.getMessage());
- }
+ final Entitlement entitlement4 = entitlementApi.getEntitlementForId(entitlement.getId(), callContext);
+ assertEquals(entitlement4.getState(), EntitlementState.CANCELLED);
+ assertEquals(entitlement4.getEffectiveEndDate(), new LocalDate(ctd));
}
-
}
