killbill-memoizeit
Changes
entitlement/src/test/java/com/ning/billing/entitlement/engine/dao/MockEntitlementDaoMemory.java 2(+1 -1)
invoice/src/test/java/com/ning/billing/invoice/api/migration/MockModuleNoEntitlement.java 59(+59 -0)
invoice/src/test/java/com/ning/billing/invoice/api/migration/TestDefaultInvoiceMigrationApi.java 234(+114 -120)
Details
diff --git a/api/src/main/java/com/ning/billing/util/api/TagDefinitionUserApi.java b/api/src/main/java/com/ning/billing/util/api/TagDefinitionUserApi.java
index 0bd985c..125eed1 100644
--- a/api/src/main/java/com/ning/billing/util/api/TagDefinitionUserApi.java
+++ b/api/src/main/java/com/ning/billing/util/api/TagDefinitionUserApi.java
@@ -17,7 +17,7 @@
package com.ning.billing.util.api;
import java.util.List;
-import java.util.UUID;
+
import com.ning.billing.util.tag.TagDefinition;
public interface TagDefinitionUserApi {
@@ -50,4 +50,13 @@ public interface TagDefinitionUserApi {
* @throws TagDefinitionApiException
*/
public void deleteTagDefinition(String definitionName) throws TagDefinitionApiException;
+
+
+ /**
+ *
+ * @param name
+ * @return the tag with this definition
+ * @throws TagDefinitionApiException
+ */
+ public TagDefinition getTagDefinition(String name) throws TagDefinitionApiException;
}
diff --git a/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegration.java b/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegration.java
index 78655e1..8b4cd27 100644
--- a/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegration.java
+++ b/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestIntegration.java
@@ -169,6 +169,7 @@ public class TestIntegration {
lifecycle.fireShutdownSequencePriorEventUnRegistration();
busService.getBus().unregister(busHandler);
lifecycle.fireShutdownSequencePostEventUnRegistration();
+ helper.stopMysql();
}
diff --git a/entitlement/src/test/java/com/ning/billing/entitlement/api/TestApiBase.java b/entitlement/src/test/java/com/ning/billing/entitlement/api/TestApiBase.java
index 094faba..0f2cc1d 100644
--- a/entitlement/src/test/java/com/ning/billing/entitlement/api/TestApiBase.java
+++ b/entitlement/src/test/java/com/ning/billing/entitlement/api/TestApiBase.java
@@ -121,7 +121,7 @@ public abstract class TestApiBase {
} catch (Exception e) {
log.warn("Failed to tearDown test properly ", e);
}
-
+ //if(helper != null) { helper.stopMysql(); }
}
@BeforeClass(alwaysRun=true)
diff --git a/entitlement/src/test/java/com/ning/billing/entitlement/engine/dao/MockEntitlementDaoMemory.java b/entitlement/src/test/java/com/ning/billing/entitlement/engine/dao/MockEntitlementDaoMemory.java
index 085afb9..31879e0 100644
--- a/entitlement/src/test/java/com/ning/billing/entitlement/engine/dao/MockEntitlementDaoMemory.java
+++ b/entitlement/src/test/java/com/ning/billing/entitlement/engine/dao/MockEntitlementDaoMemory.java
@@ -29,11 +29,11 @@ import org.joda.time.DateTime;
import org.skife.jdbi.v2.sqlobject.mixins.Transmogrifier;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+
import com.google.inject.Inject;
import com.ning.billing.catalog.api.ProductCategory;
import com.ning.billing.catalog.api.TimeUnit;
import com.ning.billing.config.EntitlementConfig;
-import com.ning.billing.entitlement.api.billing.EntitlementBillingApiException;
import com.ning.billing.entitlement.api.migration.AccountMigrationData;
import com.ning.billing.entitlement.api.migration.AccountMigrationData.BundleMigrationData;
import com.ning.billing.entitlement.api.migration.AccountMigrationData.SubscriptionMigrationData;
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
new file mode 100644
index 0000000..4701bc8
--- /dev/null
+++ b/invoice/src/test/java/com/ning/billing/invoice/api/migration/MockModuleNoEntitlement.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2010-2011 Ning, Inc.
+ *
+ * Ning licenses this file to you under the Apache License, version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.ning.billing.invoice.api.migration;
+
+import com.ning.billing.entitlement.api.billing.EntitlementBillingApi;
+import com.ning.billing.entitlement.engine.dao.EntitlementDao;
+import com.ning.billing.invoice.MockModule;
+import com.ning.billing.invoice.glue.InvoiceModule;
+import com.ning.billing.invoice.notification.DefaultNextBillingDateNotifier;
+import com.ning.billing.invoice.notification.DefaultNextBillingDatePoster;
+import com.ning.billing.invoice.notification.NextBillingDateNotifier;
+import com.ning.billing.invoice.notification.NextBillingDatePoster;
+import com.ning.billing.mock.BrainDeadProxyFactory;
+import com.ning.billing.mock.BrainDeadProxyFactory.ZombieControl;
+
+public class MockModuleNoEntitlement extends MockModule {
+
+ @Override
+ protected void installEntitlementModule() {
+ EntitlementBillingApi entitlementApi = BrainDeadProxyFactory.createBrainDeadProxyFor(EntitlementBillingApi.class);
+ ((ZombieControl)entitlementApi).addResult("setChargedThroughDateFromTransaction", BrainDeadProxyFactory.ZOMBIE_VOID);
+ bind(EntitlementBillingApi.class).toInstance(entitlementApi);
+ bind(EntitlementDao.class).toInstance(BrainDeadProxyFactory.createBrainDeadProxyFor(EntitlementDao.class));
+
+ }
+
+ @Override
+ protected void installInvoiceModule() {
+ install(new InvoiceModule(){
+
+ @Override
+ protected void installNotifier() {
+ bind(NextBillingDateNotifier.class).toInstance(BrainDeadProxyFactory.createBrainDeadProxyFor(NextBillingDateNotifier.class));
+ NextBillingDatePoster poster = BrainDeadProxyFactory.createBrainDeadProxyFor(NextBillingDatePoster.class);
+ ((ZombieControl)poster).addResult("insertNextBillingNotification",BrainDeadProxyFactory.ZOMBIE_VOID);
+ bind(NextBillingDatePoster.class).toInstance(poster);
+ }
+
+
+ });
+
+
+ }
+
+}
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 111f84d..ff60d06 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
@@ -50,7 +50,6 @@ import com.ning.billing.entitlement.api.billing.EntitlementBillingApi;
import com.ning.billing.entitlement.api.user.Subscription;
import com.ning.billing.entitlement.api.user.SubscriptionTransition.SubscriptionTransitionType;
import com.ning.billing.invoice.InvoiceDispatcher;
-import com.ning.billing.invoice.MockModule;
import com.ning.billing.invoice.TestInvoiceDispatcher;
import com.ning.billing.invoice.api.Invoice;
import com.ning.billing.invoice.api.InvoiceMigrationApi;
@@ -58,101 +57,96 @@ import com.ning.billing.invoice.api.InvoicePaymentApi;
import com.ning.billing.invoice.api.InvoiceUserApi;
import com.ning.billing.invoice.dao.InvoiceDao;
import com.ning.billing.invoice.model.InvoiceGenerator;
-import com.ning.billing.invoice.notification.NextBillingDateNotifier;
import com.ning.billing.mock.BrainDeadProxyFactory;
import com.ning.billing.mock.BrainDeadProxyFactory.ZombieControl;
import com.ning.billing.util.bus.BusService;
+import com.ning.billing.util.bus.DefaultBusService;
import com.ning.billing.util.clock.ClockMock;
import com.ning.billing.util.globallocker.GlobalLocker;
-@Guice(modules = {MockModule.class})
+@Guice(modules = {MockModuleNoEntitlement.class})
public class TestDefaultInvoiceMigrationApi {
Logger log = LoggerFactory.getLogger(TestDefaultInvoiceMigrationApi.class);
-
- @Inject
- InvoiceUserApi invoiceUserApi;
-
- @Inject
- InvoicePaymentApi invoicePaymentApi;
-
- @Inject
- private InvoiceGenerator generator;
- @Inject
- private InvoiceDao invoiceDao;
- @Inject
- private GlobalLocker locker;
-
- @Inject
- private MysqlTestingHelper helper;
-
- @Inject
- NextBillingDateNotifier notifier;
-
- @Inject
- private BusService busService;
-
- @Inject
- private InvoiceMigrationApi migrationApi;
-
-
-
- private UUID accountId ;
- private UUID subscriptionId ;
- private DateTime now;
-
- private UUID migrationInvoiceId;
- private UUID regularInvoiceId;
-
- private static final BigDecimal MIGRATION_INVOICE_AMOUNT = new BigDecimal("100.00");
- private static final Currency MIGRATION_INVOICE_CURRENCY = Currency.USD;
-
-
-
- @BeforeClass(alwaysRun = true)
- public void setup() throws Exception
- {
- log.info("Starting set up");
+
+ @Inject
+ InvoiceUserApi invoiceUserApi;
+
+ @Inject
+ InvoicePaymentApi invoicePaymentApi;
+
+ @Inject
+ private InvoiceGenerator generator;
+ @Inject
+ private InvoiceDao invoiceDao;
+ @Inject
+ private GlobalLocker locker;
+
+ @Inject
+ private MysqlTestingHelper helper;
+
+ @Inject
+ private BusService busService;
+
+ @Inject
+ private InvoiceMigrationApi migrationApi;
+
+
+
+ private UUID accountId ;
+ private UUID subscriptionId ;
+ private DateTime now;
+
+ private UUID migrationInvoiceId;
+ private UUID regularInvoiceId;
+
+ private static final BigDecimal MIGRATION_INVOICE_AMOUNT = new BigDecimal("100.00");
+ private static final Currency MIGRATION_INVOICE_CURRENCY = Currency.USD;
+
+
+
+ @BeforeClass(alwaysRun = true)
+ public void setup() throws Exception
+ {
+ log.info("Starting set up");
accountId = UUID.randomUUID();
- subscriptionId = UUID.randomUUID();
- now = new ClockMock().getUTCNow();
-
- final String accountDdl = IOUtils.toString(TestInvoiceDispatcher.class.getResourceAsStream("/com/ning/billing/account/ddl.sql"));
- final String entitlementDdl = IOUtils.toString(TestInvoiceDispatcher.class.getResourceAsStream("/com/ning/billing/entitlement/ddl.sql"));
- final String invoiceDdl = IOUtils.toString(TestInvoiceDispatcher.class.getResourceAsStream("/com/ning/billing/invoice/ddl.sql"));
- final String utilDdl = IOUtils.toString(TestInvoiceDispatcher.class.getResourceAsStream("/com/ning/billing/util/ddl.sql"));
-
- helper.startMysql();
-
- helper.initDb(accountDdl);
- helper.initDb(entitlementDdl);
- helper.initDb(invoiceDdl);
- helper.initDb(utilDdl);
-
- notifier.initialize();
- notifier.start();
-
- busService.getBus().start();
-
- migrationInvoiceId = createAndCheckMigrationInvoice();
- regularInvoiceId = generateRegularInvoice();
- }
-
- @AfterClass(alwaysRun = true)
- public void tearDown() {
- helper.stopMysql();
- }
-
+ subscriptionId = UUID.randomUUID();
+ now = new ClockMock().getUTCNow();
+
+ final String invoiceDdl = IOUtils.toString(TestInvoiceDispatcher.class.getResourceAsStream("/com/ning/billing/invoice/ddl.sql"));
+ final String utilDdl = IOUtils.toString(TestInvoiceDispatcher.class.getResourceAsStream("/com/ning/billing/util/ddl.sql"));
+
+ helper.startMysql();
+
+ helper.initDb(invoiceDdl);
+ helper.initDb(utilDdl);
+
+ busService.getBus().start();
+
+ migrationInvoiceId = createAndCheckMigrationInvoice();
+ regularInvoiceId = generateRegularInvoice();
+ }
+
+ @AfterClass(alwaysRun = true)
+ public void tearDown() {
+ try {
+ ((DefaultBusService) busService).stopBus();
+ helper.stopMysql();
+ } catch (Exception e) {
+ log.warn("Failed to tearDown test properly ", e);
+ }
+ }
+
private UUID createAndCheckMigrationInvoice(){
UUID migrationInvoiceId = migrationApi.createMigrationInvoice(accountId, now, MIGRATION_INVOICE_AMOUNT, MIGRATION_INVOICE_CURRENCY);
Assert.assertNotNull(migrationInvoiceId);
//Double check it was created and values are correct
-
+
Invoice invoice = invoiceDao.getById(migrationInvoiceId);
Assert.assertNotNull(invoice);
-
+
Assert.assertEquals(invoice.getAccountId(), accountId);
Assert.assertEquals(invoice.getTargetDate().compareTo(now), 0); //temp to avoid tz test artifact
-// Assert.assertEquals(invoice.getTargetDate(),now);
+ // Assert.assertEquals(invoice.getTargetDate(),now);
Assert.assertEquals(invoice.getNumberOfItems(), 1);
Assert.assertEquals(invoice.getInvoiceItems().get(0).getAmount().compareTo(MIGRATION_INVOICE_AMOUNT), 0 );
Assert.assertEquals(invoice.getBalance().compareTo(MIGRATION_INVOICE_AMOUNT),0);
@@ -161,55 +155,55 @@ public class TestDefaultInvoiceMigrationApi {
return migrationInvoiceId;
}
-
+
private UUID generateRegularInvoice() throws Exception {
- AccountUserApi accountUserApi = BrainDeadProxyFactory.createBrainDeadProxyFor(AccountUserApi.class);
- Account account = BrainDeadProxyFactory.createBrainDeadProxyFor(Account.class);
- ((ZombieControl)accountUserApi).addResult("getAccountById", account);
- ((ZombieControl)account).addResult("getCurrency", Currency.USD);
- ((ZombieControl)account).addResult("getId", accountId);
-
- Subscription subscription = BrainDeadProxyFactory.createBrainDeadProxyFor(Subscription.class);
- ((ZombieControl)subscription).addResult("getId", subscriptionId);
- SortedSet<BillingEvent> events = new TreeSet<BillingEvent>();
- Plan plan = MockPlan.createBicycleNoTrialEvergreen1USD();
- PlanPhase planPhase = MockPlanPhase.create1USDMonthlyEvergreen();
+ AccountUserApi accountUserApi = BrainDeadProxyFactory.createBrainDeadProxyFor(AccountUserApi.class);
+ Account account = BrainDeadProxyFactory.createBrainDeadProxyFor(Account.class);
+ ((ZombieControl)accountUserApi).addResult("getAccountById", account);
+ ((ZombieControl)account).addResult("getCurrency", Currency.USD);
+ ((ZombieControl)account).addResult("getId", accountId);
+
+ Subscription subscription = BrainDeadProxyFactory.createBrainDeadProxyFor(Subscription.class);
+ ((ZombieControl)subscription).addResult("getId", subscriptionId);
+ SortedSet<BillingEvent> events = new TreeSet<BillingEvent>();
+ Plan plan = MockPlan.createBicycleNoTrialEvergreen1USD();
+ PlanPhase planPhase = MockPlanPhase.create1USDMonthlyEvergreen();
DateTime effectiveDate = new DateTime().minusDays(1);
- Currency currency = Currency.USD;
+ Currency currency = Currency.USD;
BigDecimal fixedPrice = null;
events.add(new DefaultBillingEvent(subscription, effectiveDate,plan, planPhase,
- fixedPrice, BigDecimal.ONE, currency, BillingPeriod.MONTHLY, 1,
- BillingModeType.IN_ADVANCE, "", 1L, SubscriptionTransitionType.CREATE));
+ fixedPrice, BigDecimal.ONE, currency, BillingPeriod.MONTHLY, 1,
+ BillingModeType.IN_ADVANCE, "", 1L, SubscriptionTransitionType.CREATE));
- EntitlementBillingApi entitlementBillingApi = BrainDeadProxyFactory.createBrainDeadProxyFor(EntitlementBillingApi.class);
- ((ZombieControl)entitlementBillingApi).addResult("getBillingEventsForAccount", events);
+ EntitlementBillingApi entitlementBillingApi = BrainDeadProxyFactory.createBrainDeadProxyFor(EntitlementBillingApi.class);
+ ((ZombieControl)entitlementBillingApi).addResult("getBillingEventsForAccount", events);
- DateTime target = new DateTime();
+ DateTime target = new DateTime();
- InvoiceDispatcher dispatcher = new InvoiceDispatcher(generator, accountUserApi, entitlementBillingApi, invoiceDao, locker);
+ InvoiceDispatcher dispatcher = new InvoiceDispatcher(generator, accountUserApi, entitlementBillingApi, invoiceDao, locker);
- Invoice invoice = dispatcher.processAccount(accountId, target, true);
- Assert.assertNotNull(invoice);
+ Invoice invoice = dispatcher.processAccount(accountId, target, true);
+ Assert.assertNotNull(invoice);
- List<Invoice> invoices = invoiceDao.getInvoicesByAccount(accountId);
- Assert.assertEquals(invoices.size(),0);
+ List<Invoice> invoices = invoiceDao.getInvoicesByAccount(accountId);
+ Assert.assertEquals(invoices.size(),0);
+
+ invoice = dispatcher.processAccount(accountId, target, false);
+ Assert.assertNotNull(invoice);
- invoice = dispatcher.processAccount(accountId, target, false);
- Assert.assertNotNull(invoice);
+ invoices = invoiceDao.getInvoicesByAccount(accountId);
+ Assert.assertEquals(invoices.size(),1);
- invoices = invoiceDao.getInvoicesByAccount(accountId);
- Assert.assertEquals(invoices.size(),1);
-
- return invoice.getId();
+ return invoice.getId();
}
-
+
// Check migration invoice is NOT returned for all user api invoice calls
- @Test(groups={"slow"},enabled=false)
+ @Test(groups={"slow"},enabled=true)
public void testUserApiAccess(){
List<Invoice> byAccount = invoiceUserApi.getInvoicesByAccount(accountId);
Assert.assertEquals(byAccount.size(),1);
Assert.assertEquals(byAccount.get(0).getId(), regularInvoiceId);
-
+
List<Invoice> byAccountAndDate = invoiceUserApi.getInvoicesByAccount(accountId, now.minusDays(1));
Assert.assertEquals(byAccountAndDate.size(),1);
Assert.assertEquals(byAccountAndDate.get(0).getId(), regularInvoiceId);
@@ -220,31 +214,31 @@ public class TestDefaultInvoiceMigrationApi {
}
-
+
// Check migration invoice IS returned for payment api calls
- @Test(groups={"slow"},enabled=false)
+ @Test(groups={"slow"},enabled=true)
public void testPaymentApi(){
List<Invoice> allByAccount = invoicePaymentApi.getAllInvoicesByAccount(accountId);
Assert.assertEquals(allByAccount.size(),2);
Assert.assertTrue(checkContains(allByAccount, regularInvoiceId));
Assert.assertTrue(checkContains(allByAccount, migrationInvoiceId));
}
-
-
+
+
// Account balance should reflect total of migration and non-migration invoices
- @Test(groups={"slow"},enabled=false)
+ @Test(groups={"slow"},enabled=true)
public void testBalance(){
Invoice migrationInvoice = invoiceDao.getById(migrationInvoiceId);
Invoice regularInvoice = invoiceDao.getById(regularInvoiceId);
BigDecimal balanceOfAllInvoices = migrationInvoice.getBalance().add(regularInvoice.getBalance());
-
+
BigDecimal accountBalance = invoiceUserApi.getAccountBalance(accountId);
System.out.println("Account balance: " + accountBalance + " should equal the Balance Of All Invoices: " + balanceOfAllInvoices);
Assert.assertEquals(accountBalance.compareTo(balanceOfAllInvoices), 0);
-
-
+
+
}
-
+
private boolean checkContains(List<Invoice> invoices, UUID invoiceId) {
for(Invoice invoice : invoices) {
if(invoice.getId().equals(invoiceId)) {
diff --git a/invoice/src/test/java/com/ning/billing/invoice/dao/InvoiceDaoTestBase.java b/invoice/src/test/java/com/ning/billing/invoice/dao/InvoiceDaoTestBase.java
index eabcc26..9249420 100644
--- a/invoice/src/test/java/com/ning/billing/invoice/dao/InvoiceDaoTestBase.java
+++ b/invoice/src/test/java/com/ning/billing/invoice/dao/InvoiceDaoTestBase.java
@@ -42,6 +42,7 @@ public abstract class InvoiceDaoTestBase extends InvoicingTestBase {
protected RecurringInvoiceItemSqlDao recurringInvoiceItemDao;
protected InvoicePaymentSqlDao invoicePaymentDao;
protected InvoiceModuleWithEmbeddedDb module;
+ private BusService busService;
@BeforeClass(alwaysRun = true)
protected void setup() throws IOException {
@@ -65,8 +66,8 @@ public abstract class InvoiceDaoTestBase extends InvoicingTestBase {
recurringInvoiceItemDao = module.getInvoiceItemSqlDao();
invoicePaymentDao = module.getInvoicePaymentSqlDao();
-
- BusService busService = injector.getInstance(BusService.class);
+
+ busService = injector.getInstance(BusService.class);
((DefaultBusService) busService).startBus();
assertTrue(true);
@@ -105,6 +106,7 @@ public abstract class InvoiceDaoTestBase extends InvoicingTestBase {
@AfterClass(alwaysRun = true)
protected void tearDown() {
+ ((DefaultBusService) busService).stopBus();
module.stopDb();
assertTrue(true);
}
diff --git a/invoice/src/test/java/com/ning/billing/invoice/MockModule.java b/invoice/src/test/java/com/ning/billing/invoice/MockModule.java
index ec96f60..db31602 100644
--- a/invoice/src/test/java/com/ning/billing/invoice/MockModule.java
+++ b/invoice/src/test/java/com/ning/billing/invoice/MockModule.java
@@ -58,13 +58,20 @@ public class MockModule extends AbstractModule {
install(new GlobalLockerModule());
install(new NotificationQueueModule());
- install(new InvoiceModule());
install(new AccountModule());
- install(new EntitlementModule());
+ installEntitlementModule();
install(new CatalogModule());
install(new BusModule());
+ installInvoiceModule();
}
+
+ protected void installEntitlementModule() {
+ install(new EntitlementModule());
+ }
+
+ protected void installInvoiceModule() {
+ install(new InvoiceModule());
+ }
-
}
diff --git a/invoice/src/test/java/com/ning/billing/invoice/notification/TestNextBillingDateNotifier.java b/invoice/src/test/java/com/ning/billing/invoice/notification/TestNextBillingDateNotifier.java
index fdc5076..d82c2d9 100644
--- a/invoice/src/test/java/com/ning/billing/invoice/notification/TestNextBillingDateNotifier.java
+++ b/invoice/src/test/java/com/ning/billing/invoice/notification/TestNextBillingDateNotifier.java
@@ -34,6 +34,7 @@ import org.skife.jdbi.v2.TransactionStatus;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testng.Assert;
+import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
@@ -191,4 +192,10 @@ public class TestNextBillingDateNotifier {
Assert.assertEquals(listener.getEventCount(), 1);
Assert.assertEquals(listener.getLatestSubscriptionId(), subscriptionId);
}
+
+ @AfterClass(alwaysRun = true)
+ public void tearDown() {
+ helper.stopMysql();
+ }
+
}
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 209d889..e81b916 100644
--- a/invoice/src/test/java/com/ning/billing/invoice/TestInvoiceDispatcher.java
+++ b/invoice/src/test/java/com/ning/billing/invoice/TestInvoiceDispatcher.java
@@ -25,7 +25,10 @@ import java.util.UUID;
import org.apache.commons.io.IOUtils;
import org.joda.time.DateTime;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.testng.Assert;
+import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeSuite;
import org.testng.annotations.Guice;
import org.testng.annotations.Test;
@@ -33,12 +36,10 @@ import org.testng.annotations.Test;
import com.google.inject.Inject;
import com.ning.billing.account.api.Account;
import com.ning.billing.account.api.AccountUserApi;
-import com.ning.billing.catalog.MockInternationalPrice;
import com.ning.billing.catalog.MockPlan;
import com.ning.billing.catalog.MockPlanPhase;
import com.ning.billing.catalog.api.BillingPeriod;
import com.ning.billing.catalog.api.Currency;
-import com.ning.billing.catalog.api.InternationalPrice;
import com.ning.billing.catalog.api.Plan;
import com.ning.billing.catalog.api.PlanPhase;
import com.ning.billing.dbi.MysqlTestingHelper;
@@ -57,106 +58,119 @@ import com.ning.billing.invoice.notification.NextBillingDateNotifier;
import com.ning.billing.mock.BrainDeadProxyFactory;
import com.ning.billing.mock.BrainDeadProxyFactory.ZombieControl;
import com.ning.billing.util.bus.BusService;
+import com.ning.billing.util.bus.DefaultBusService;
import com.ning.billing.util.globallocker.GlobalLocker;
-import sun.security.util.BigInt;
@Guice(modules = {MockModule.class})
public class TestInvoiceDispatcher {
+ Logger log = LoggerFactory.getLogger(TestInvoiceDispatcher.class);
- @Inject
- InvoiceUserApi invoiceUserApi;
- @Inject
- private InvoiceGenerator generator;
- @Inject
- private InvoiceDao invoiceDao;
- @Inject
- private GlobalLocker locker;
+ @Inject
+ InvoiceUserApi invoiceUserApi;
+ @Inject
+ private InvoiceGenerator generator;
+ @Inject
+ private InvoiceDao invoiceDao;
+ @Inject
+ private GlobalLocker locker;
- @Inject
- private MysqlTestingHelper helper;
+ @Inject
+ private MysqlTestingHelper helper;
- @Inject
- NextBillingDateNotifier notifier;
+ @Inject
+ NextBillingDateNotifier notifier;
- @Inject
- private BusService busService;
+ @Inject
+ private BusService busService;
- @BeforeSuite(alwaysRun = true)
- public void setup() throws IOException
- {
+ @BeforeSuite(alwaysRun = true)
+ public void setup() throws IOException
+ {
- final String accountDdl = IOUtils.toString(TestInvoiceDispatcher.class.getResourceAsStream("/com/ning/billing/account/ddl.sql"));
- final String entitlementDdl = IOUtils.toString(TestInvoiceDispatcher.class.getResourceAsStream("/com/ning/billing/entitlement/ddl.sql"));
- final String invoiceDdl = IOUtils.toString(TestInvoiceDispatcher.class.getResourceAsStream("/com/ning/billing/invoice/ddl.sql"));
-// final String paymentDdl = IOUtils.toString(TestInvoiceDispatcher.class.getResourceAsStream("/com/ning/billing/payment/ddl.sql"));
- final String utilDdl = IOUtils.toString(TestInvoiceDispatcher.class.getResourceAsStream("/com/ning/billing/util/ddl.sql"));
+ final String accountDdl = IOUtils.toString(TestInvoiceDispatcher.class.getResourceAsStream("/com/ning/billing/account/ddl.sql"));
+ final String entitlementDdl = IOUtils.toString(TestInvoiceDispatcher.class.getResourceAsStream("/com/ning/billing/entitlement/ddl.sql"));
+ final String invoiceDdl = IOUtils.toString(TestInvoiceDispatcher.class.getResourceAsStream("/com/ning/billing/invoice/ddl.sql"));
+ // final String paymentDdl = IOUtils.toString(TestInvoiceDispatcher.class.getResourceAsStream("/com/ning/billing/payment/ddl.sql"));
+ final String utilDdl = IOUtils.toString(TestInvoiceDispatcher.class.getResourceAsStream("/com/ning/billing/util/ddl.sql"));
- helper.startMysql();
+ helper.startMysql();
- helper.initDb(accountDdl);
- helper.initDb(entitlementDdl);
- helper.initDb(invoiceDdl);
-// helper.initDb(paymentDdl);
- helper.initDb(utilDdl);
- notifier.initialize();
- notifier.start();
+ helper.initDb(accountDdl);
+ helper.initDb(entitlementDdl);
+ helper.initDb(invoiceDdl);
+ // helper.initDb(paymentDdl);
+ helper.initDb(utilDdl);
+ notifier.initialize();
+ notifier.start();
- busService.getBus().start();
- }
+ busService.getBus().start();
+ }
+ @AfterClass(alwaysRun = true)
+ public void tearDown() {
+ try {
+ ((DefaultBusService) busService).stopBus();
+ notifier.stop();
+ helper.stopMysql();
+ } catch (Exception e) {
+ log.warn("Failed to tearDown test properly ", e);
+ }
- @Test(groups={"fast"}, enabled=true)
- public void testDryrunInvoice() throws InvoiceApiException {
- UUID accountId = UUID.randomUUID();
- UUID subscriptionId = UUID.randomUUID();
+ }
- AccountUserApi accountUserApi = BrainDeadProxyFactory.createBrainDeadProxyFor(AccountUserApi.class);
- Account account = BrainDeadProxyFactory.createBrainDeadProxyFor(Account.class);
- ((ZombieControl)accountUserApi).addResult("getAccountById", account);
- ((ZombieControl)account).addResult("getCurrency", Currency.USD);
- ((ZombieControl)account).addResult("getId", accountId);
+ @Test(groups={"fast"}, enabled=true)
+ public void testDryrunInvoice() throws InvoiceApiException {
+ UUID accountId = UUID.randomUUID();
+ UUID subscriptionId = UUID.randomUUID();
- Subscription subscription = BrainDeadProxyFactory.createBrainDeadProxyFor(Subscription.class);
- ((ZombieControl)subscription).addResult("getId", subscriptionId);
- SortedSet<BillingEvent> events = new TreeSet<BillingEvent>();
- Plan plan = MockPlan.createBicycleNoTrialEvergreen1USD();
- PlanPhase planPhase = MockPlanPhase.create1USDMonthlyEvergreen();
- DateTime effectiveDate = new DateTime().minusDays(1);
- Currency currency = Currency.USD;
- BigDecimal fixedPrice = null;
- events.add(new DefaultBillingEvent(subscription, effectiveDate,plan, planPhase,
- fixedPrice, BigDecimal.ONE, currency, BillingPeriod.MONTHLY, 1,
- BillingModeType.IN_ADVANCE, "", 1L, SubscriptionTransitionType.CREATE));
+ AccountUserApi accountUserApi = BrainDeadProxyFactory.createBrainDeadProxyFor(AccountUserApi.class);
+ Account account = BrainDeadProxyFactory.createBrainDeadProxyFor(Account.class);
+ ((ZombieControl)accountUserApi).addResult("getAccountById", account);
+ ((ZombieControl)account).addResult("getCurrency", Currency.USD);
+ ((ZombieControl)account).addResult("getId", accountId);
- EntitlementBillingApi entitlementBillingApi = BrainDeadProxyFactory.createBrainDeadProxyFor(EntitlementBillingApi.class);
- ((ZombieControl)entitlementBillingApi).addResult("getBillingEventsForAccount", events);
+ Subscription subscription = BrainDeadProxyFactory.createBrainDeadProxyFor(Subscription.class);
+ ((ZombieControl)subscription).addResult("getId", subscriptionId);
+ SortedSet<BillingEvent> events = new TreeSet<BillingEvent>();
+ Plan plan = MockPlan.createBicycleNoTrialEvergreen1USD();
+ PlanPhase planPhase = MockPlanPhase.create1USDMonthlyEvergreen();
+ DateTime effectiveDate = new DateTime().minusDays(1);
+ Currency currency = Currency.USD;
+ BigDecimal fixedPrice = null;
+ events.add(new DefaultBillingEvent(subscription, effectiveDate,plan, planPhase,
+ fixedPrice, BigDecimal.ONE, currency, BillingPeriod.MONTHLY, 1,
+ BillingModeType.IN_ADVANCE, "", 1L, SubscriptionTransitionType.CREATE));
- DateTime target = new DateTime();
+ EntitlementBillingApi entitlementBillingApi = BrainDeadProxyFactory.createBrainDeadProxyFor(EntitlementBillingApi.class);
+ ((ZombieControl)entitlementBillingApi).addResult("getBillingEventsForAccount", events);
- InvoiceDispatcher dispatcher = new InvoiceDispatcher(generator, accountUserApi, entitlementBillingApi, invoiceDao, locker);
+ DateTime target = new DateTime();
- Invoice invoice = dispatcher.processAccount(accountId, target, true);
- Assert.assertNotNull(invoice);
+ InvoiceDispatcher dispatcher = new InvoiceDispatcher(generator, accountUserApi, entitlementBillingApi, invoiceDao, locker);
- List<Invoice> invoices = invoiceDao.getInvoicesByAccount(accountId);
- Assert.assertEquals(invoices.size(),0);
+ Invoice invoice = dispatcher.processAccount(accountId, target, true);
+ Assert.assertNotNull(invoice);
- // Try it again to double check
- invoice = dispatcher.processAccount(accountId, target, true);
- Assert.assertNotNull(invoice);
+ List<Invoice> invoices = invoiceDao.getInvoicesByAccount(accountId);
+ Assert.assertEquals(invoices.size(),0);
- invoices = invoiceDao.getInvoicesByAccount(accountId);
- Assert.assertEquals(invoices.size(),0);
+ // Try it again to double check
+ invoice = dispatcher.processAccount(accountId, target, true);
+ Assert.assertNotNull(invoice);
- // This time no dry run
- invoice = dispatcher.processAccount(accountId, target, false);
- Assert.assertNotNull(invoice);
+ invoices = invoiceDao.getInvoicesByAccount(accountId);
+ Assert.assertEquals(invoices.size(),0);
- invoices = invoiceDao.getInvoicesByAccount(accountId);
- Assert.assertEquals(invoices.size(),1);
+ // This time no dry run
+ invoice = dispatcher.processAccount(accountId, target, false);
+ Assert.assertNotNull(invoice);
+
+ invoices = invoiceDao.getInvoicesByAccount(accountId);
+ Assert.assertEquals(invoices.size(),1);
+
+ }
- }
}
diff --git a/util/src/main/java/com/ning/billing/util/tag/api/DefaultTagDefinitionUserApi.java b/util/src/main/java/com/ning/billing/util/tag/api/DefaultTagDefinitionUserApi.java
index 452eb5e..8489993 100644
--- a/util/src/main/java/com/ning/billing/util/tag/api/DefaultTagDefinitionUserApi.java
+++ b/util/src/main/java/com/ning/billing/util/tag/api/DefaultTagDefinitionUserApi.java
@@ -50,4 +50,10 @@ public class DefaultTagDefinitionUserApi implements TagDefinitionUserApi {
public void deleteTagDefinition(final String definitionName) throws TagDefinitionApiException {
dao.deleteAllTagsForDefinition(definitionName);
}
+
+ @Override
+ public TagDefinition getTagDefinition(String name)
+ throws TagDefinitionApiException {
+ return dao.getByName(name);
+ }
}
diff --git a/util/src/test/java/com/ning/billing/mock/BrainDeadProxyFactory.java b/util/src/test/java/com/ning/billing/mock/BrainDeadProxyFactory.java
index 2998d07..7404331 100644
--- a/util/src/test/java/com/ning/billing/mock/BrainDeadProxyFactory.java
+++ b/util/src/test/java/com/ning/billing/mock/BrainDeadProxyFactory.java
@@ -27,6 +27,8 @@ import org.slf4j.LoggerFactory;
public class BrainDeadProxyFactory {
private static final Logger log = LoggerFactory.getLogger(BrainDeadProxyFactory.class);
+
+ public static final Object ZOMBIE_VOID = new Object();
public static interface ZombieControl {
@@ -59,7 +61,12 @@ public class BrainDeadProxyFactory {
} else {
Object result = results.get(method.getName());
- if (result != null) {
+ if (result == ZOMBIE_VOID) {
+ return (Void) null;
+ } else if (result != null) {
+ if(result instanceof Throwable) {
+ throw ((Throwable) result);
+ }
return result;
} else {
log.error(String.format("No result for Method: '%s' on Class '%s'",method.getName(), method.getDeclaringClass().getName()));
diff --git a/util/src/test/java/com/ning/billing/util/notificationq/dao/TestNotificationSqlDao.java b/util/src/test/java/com/ning/billing/util/notificationq/dao/TestNotificationSqlDao.java
index cb01e00..4c812cb 100644
--- a/util/src/test/java/com/ning/billing/util/notificationq/dao/TestNotificationSqlDao.java
+++ b/util/src/test/java/com/ning/billing/util/notificationq/dao/TestNotificationSqlDao.java
@@ -59,8 +59,6 @@ public class TestNotificationSqlDao {
private NotificationSqlDao dao;
private void startMysql() throws IOException, ClassNotFoundException, SQLException {
-
-
final String ddl = IOUtils.toString(NotificationSqlDao.class.getResourceAsStream("/com/ning/billing/util/ddl.sql"));
helper.startMysql();
helper.initDb(ddl);
diff --git a/util/src/test/java/com/ning/billing/util/notificationq/TestNotificationQueue.java b/util/src/test/java/com/ning/billing/util/notificationq/TestNotificationQueue.java
index fbcf8f9..73257bb 100644
--- a/util/src/test/java/com/ning/billing/util/notificationq/TestNotificationQueue.java
+++ b/util/src/test/java/com/ning/billing/util/notificationq/TestNotificationQueue.java
@@ -39,6 +39,7 @@ import org.skife.jdbi.v2.tweak.HandleCallback;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testng.Assert;
+import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeSuite;
import org.testng.annotations.BeforeTest;
import org.testng.annotations.Guice;
@@ -86,6 +87,11 @@ public class TestNotificationQueue {
startMysql();
dao = dbi.onDemand(DummySqlTest.class);
}
+
+ @AfterClass(alwaysRun = true)
+ public void tearDown() {
+ helper.stopMysql();
+ }
@BeforeTest
public void beforeTest() {