killbill-memoizeit

diff --git a/overdue/src/test/java/com/ning/billing/overdue/applicator/TestOverdueStateApplicator.java b/overdue/src/test/java/com/ning/billing/overdue/applicator/TestOverdueStateApplicator.java
index a31c78f..87347a3 100644
--- a/overdue/src/test/java/com/ning/billing/overdue/applicator/TestOverdueStateApplicator.java
+++ b/overdue/src/test/java/com/ning/billing/overdue/applicator/TestOverdueStateApplicator.java
@@ -23,6 +23,7 @@ import java.util.UUID;
 import java.util.concurrent.Callable;
 
 import org.mockito.Mockito;
+import org.testng.Assert;
 import org.testng.annotations.Test;
 
 import com.google.inject.Inject;
@@ -34,7 +35,6 @@ import com.ning.billing.overdue.OverdueTestBase;
 import com.ning.billing.overdue.config.OverdueConfig;
 import com.ning.billing.util.bus.Bus;
 import com.ning.billing.util.config.XMLLoader;
-import junit.framework.Assert;
 
 import static com.jayway.awaitility.Awaitility.await;
 import static java.util.concurrent.TimeUnit.SECONDS;
@@ -49,7 +49,7 @@ public class TestOverdueStateApplicator extends OverdueTestBase {
     @Inject
     Bus bus;
 
-    @Test(groups = {"slow"}, enabled = true)
+    @Test(groups = "slow")
     public void testApplicator() throws Exception {
         bus.register(listener);
         bus.start();
@@ -83,16 +83,13 @@ public class TestOverdueStateApplicator extends OverdueTestBase {
         await().atMost(10, SECONDS).until(new Callable<Boolean>() {
             @Override
             public Boolean call() throws Exception {
-                List<OverdueChangeEvent> events = listener.getEventsReceived();
+                final List<OverdueChangeEvent> events = listener.getEventsReceived();
                 return events.size() == 1;
             }
         });
-        List<OverdueChangeEvent> events = listener.getEventsReceived();
+        final List<OverdueChangeEvent> events = listener.getEventsReceived();
         Assert.assertEquals(1, events.size());
         Assert.assertEquals(state, events.get(0).getNextOverdueStateName());
         listener.clearEventsReceived();
-
     }
-
-
 }

diff --git a/overdue/src/test/java/com/ning/billing/overdue/calculator/TestBillingStateCalculator.java b/overdue/src/test/java/com/ning/billing/overdue/calculator/TestBillingStateCalculator.java
index 3ec4785..57426a3 100644
--- a/overdue/src/test/java/com/ning/billing/overdue/calculator/TestBillingStateCalculator.java
+++ b/overdue/src/test/java/com/ning/billing/overdue/calculator/TestBillingStateCalculator.java
@@ -32,11 +32,12 @@ import com.ning.billing.entitlement.api.user.SubscriptionBundle;
 import com.ning.billing.invoice.api.Invoice;
 import com.ning.billing.invoice.api.InvoiceItem;
 import com.ning.billing.invoice.api.InvoiceUserApi;
+import com.ning.billing.overdue.OverdueTestSuite;
 import com.ning.billing.overdue.config.api.BillingState;
 import com.ning.billing.util.clock.Clock;
 import com.ning.billing.util.clock.ClockMock;
 
-public class TestBillingStateCalculator {
+public class TestBillingStateCalculator extends OverdueTestSuite {
     Clock clock = new ClockMock();
     InvoiceUserApi invoiceApi = Mockito.mock(InvoiceUserApi.class);
     DateTime now;
@@ -69,7 +70,7 @@ public class TestBillingStateCalculator {
         return invoice;
     }
 
-    @Test(groups = {"fast"}, enabled = true)
+    @Test(groups = "fast")
     public void testUnpaidInvoices() {
         final BillingStateCalculator<SubscriptionBundle> calc = createBSCalc();
         final SortedSet<Invoice> invoices = calc.unpaidInvoicesForAccount(new UUID(0L, 0L));
@@ -79,17 +80,15 @@ public class TestBillingStateCalculator {
         Assert.assertEquals(new BigDecimal("100.0").compareTo(invoices.last().getBalance()), 0);
     }
 
-    @Test(groups = {"fast"}, enabled = true)
+    @Test(groups = "fast")
     public void testSum() {
-
         final BillingStateCalculator<SubscriptionBundle> calc = createBSCalc();
         final SortedSet<Invoice> invoices = calc.unpaidInvoicesForAccount(new UUID(0L, 0L));
         Assert.assertEquals(new BigDecimal("110.0").compareTo(calc.sumBalance(invoices)), 0);
     }
 
-    @Test(groups = {"fast"}, enabled = true)
+    @Test(groups = "fast")
     public void testEarliest() {
-
         final BillingStateCalculator<SubscriptionBundle> calc = createBSCalc();
         final SortedSet<Invoice> invoices = calc.unpaidInvoicesForAccount(new UUID(0L, 0L));
         Assert.assertEquals(calc.earliest(invoices).getInvoiceDate(), now);

diff --git a/overdue/src/test/java/com/ning/billing/overdue/calculator/TestBillingStateCalculatorBundle.java b/overdue/src/test/java/com/ning/billing/overdue/calculator/TestBillingStateCalculatorBundle.java
index 2d7eebb..67b63ab 100644
--- a/overdue/src/test/java/com/ning/billing/overdue/calculator/TestBillingStateCalculatorBundle.java
+++ b/overdue/src/test/java/com/ning/billing/overdue/calculator/TestBillingStateCalculatorBundle.java
@@ -46,7 +46,6 @@ import com.ning.billing.util.clock.Clock;
 import com.ning.billing.util.clock.ClockMock;
 
 public class TestBillingStateCalculatorBundle extends TestBillingStateCalculator {
-
     private List<InvoiceItem> createInvoiceItems(final UUID[] bundleIds) {
         final List<InvoiceItem> result = new ArrayList<InvoiceItem>();
         for (final UUID id : bundleIds) {
@@ -57,7 +56,7 @@ public class TestBillingStateCalculatorBundle extends TestBillingStateCalculator
         return result;
     }
 
-    @Test(groups = {"fast"}, enabled = true)
+    @Test(groups = "fast")
     public void testUnpaidInvoiceForBundle() {
         final UUID thisBundleId = new UUID(0L, 0L);
         final UUID thatBundleId = new UUID(0L, 1L);
@@ -89,7 +88,7 @@ public class TestBillingStateCalculatorBundle extends TestBillingStateCalculator
         Assert.assertEquals(new BigDecimal("10000.0").compareTo(resultinvoices.last().getBalance()), 0);
     }
 
-    @Test(groups = {"fast"}, enabled = true)
+    @Test(groups = "fast")
     public void testcalculateBillingStateForBundle() throws Exception {
         final UUID thisBundleId = new UUID(0L, 0L);
         final UUID thatBundleId = new UUID(0L, 1L);
@@ -136,7 +135,7 @@ public class TestBillingStateCalculatorBundle extends TestBillingStateCalculator
 
     }
 
-    @Test(groups = {"fast"}, enabled = true)
+    @Test(groups = "fast")
     public void testcalculateBillingStateForBundleNoOverdueInvoices() throws Exception {
         final UUID thisBundleId = new UUID(0L, 0L);
 

diff --git a/overdue/src/test/java/com/ning/billing/overdue/config/CreateOverdueConfigSchema.java b/overdue/src/test/java/com/ning/billing/overdue/config/CreateOverdueConfigSchema.java
index b801a2d..61e2fbe 100644
--- a/overdue/src/test/java/com/ning/billing/overdue/config/CreateOverdueConfigSchema.java
+++ b/overdue/src/test/java/com/ning/billing/overdue/config/CreateOverdueConfigSchema.java
@@ -23,10 +23,6 @@ import java.io.Writer;
 import com.ning.billing.util.config.XMLSchemaGenerator;
 
 public class CreateOverdueConfigSchema {
-
-    /**
-     * @param args
-     */
     public static void main(final String[] args) throws Exception {
         if (args.length != 1) {
             System.err.println("Usage: <filepath>");
@@ -37,7 +33,5 @@ public class CreateOverdueConfigSchema {
         final Writer w = new FileWriter(f);
         w.write(XMLSchemaGenerator.xmlSchemaAsString(OverdueConfig.class));
         w.close();
-
     }
-
 }

diff --git a/overdue/src/test/java/com/ning/billing/overdue/config/io/TestReadConfig.java b/overdue/src/test/java/com/ning/billing/overdue/config/io/TestReadConfig.java
index 75b3239..bc65015 100644
--- a/overdue/src/test/java/com/ning/billing/overdue/config/io/TestReadConfig.java
+++ b/overdue/src/test/java/com/ning/billing/overdue/config/io/TestReadConfig.java
@@ -19,13 +19,13 @@ package com.ning.billing.overdue.config.io;
 import org.testng.annotations.Test;
 
 import com.google.common.io.Resources;
+import com.ning.billing.overdue.OverdueTestSuite;
 import com.ning.billing.overdue.config.OverdueConfig;
 import com.ning.billing.util.config.XMLLoader;
 
-public class TestReadConfig {
-    @Test(enabled = true)
+public class TestReadConfig extends OverdueTestSuite {
+    @Test(groups = "fast")
     public void testConfigLoad() throws Exception {
         XMLLoader.getObjectFromString(Resources.getResource("OverdueConfig.xml").toExternalForm(), OverdueConfig.class);
     }
-
 }

diff --git a/overdue/src/test/java/com/ning/billing/overdue/config/TestCondition.java b/overdue/src/test/java/com/ning/billing/overdue/config/TestCondition.java
index 508dcb4..dad1a9e 100644
--- a/overdue/src/test/java/com/ning/billing/overdue/config/TestCondition.java
+++ b/overdue/src/test/java/com/ning/billing/overdue/config/TestCondition.java
@@ -27,6 +27,7 @@ import org.testng.Assert;
 import org.testng.annotations.Test;
 
 import com.ning.billing.junction.api.Blockable;
+import com.ning.billing.overdue.OverdueTestSuite;
 import com.ning.billing.overdue.config.api.BillingState;
 import com.ning.billing.overdue.config.api.PaymentResponse;
 import com.ning.billing.util.config.XMLLoader;
@@ -35,12 +36,11 @@ import com.ning.billing.util.tag.DefaultControlTag;
 import com.ning.billing.util.tag.DescriptiveTag;
 import com.ning.billing.util.tag.Tag;
 
-public class TestCondition {
-
+public class TestCondition extends OverdueTestSuite {
     @XmlRootElement(name = "condition")
     private static class MockCondition extends DefaultCondition<Blockable> {}
 
-    @Test(groups = {"fast"}, enabled = true)
+    @Test(groups = "fast")
     public void testNumberOfUnpaidInvoicesEqualsOrExceeds() throws Exception {
         final String xml =
                 "<condition>" +
@@ -59,7 +59,7 @@ public class TestCondition {
         Assert.assertTrue(c.evaluate(state2, new DateTime()));
     }
 
-    @Test(groups = {"fast"}, enabled = true)
+    @Test(groups = "fast")
     public void testTotalUnpaidInvoiceBalanceEqualsOrExceeds() throws Exception {
         final String xml =
                 "<condition>" +
@@ -78,8 +78,7 @@ public class TestCondition {
         Assert.assertTrue(c.evaluate(state2, new DateTime()));
     }
 
-
-    @Test(groups = {"fast"}, enabled = true)
+    @Test(groups = "fast")
     public void testTimeSinceEarliestUnpaidInvoiceEqualsOrExceeds() throws Exception {
         final String xml =
                 "<condition>" +
@@ -100,7 +99,7 @@ public class TestCondition {
         Assert.assertTrue(c.evaluate(state2, now));
     }
 
-    @Test(groups = {"fast"}, enabled = true)
+    @Test(groups = "fast")
     public void testResponseForLastFailedPaymentIn() throws Exception {
         final String xml =
                 "<condition>" +
@@ -121,7 +120,7 @@ public class TestCondition {
         Assert.assertTrue(c.evaluate(state2, now));
     }
 
-    @Test(groups = {"fast"}, enabled = true)
+    @Test(groups = "fast")
     public void testHasControlTag() throws Exception {
         final String xml =
                 "<condition>" +
@@ -136,15 +135,13 @@ public class TestCondition {
         final BillingState<Blockable> state0 = new BillingState<Blockable>(new UUID(0L, 1L), 0, BigDecimal.ZERO, null, unpaidInvoiceId, PaymentResponse.LOST_OR_STOLEN_CARD, new Tag[]{new DefaultControlTag(ControlTagType.AUTO_INVOICING_OFF), new DescriptiveTag("Tag")});
         final BillingState<Blockable> state1 = new BillingState<Blockable>(new UUID(0L, 1L), 1, new BigDecimal("100.00"), now.minusDays(10), unpaidInvoiceId, PaymentResponse.INSUFFICIENT_FUNDS, new Tag[]{new DefaultControlTag(ControlTagType.OVERDUE_ENFORCEMENT_OFF)});
         final BillingState<Blockable> state2 = new BillingState<Blockable>(new UUID(0L, 1L), 1, new BigDecimal("200.00"), now.minusDays(20), unpaidInvoiceId,
-                                                                     PaymentResponse.DO_NOT_HONOR,
-                                                                     new Tag[]{new DefaultControlTag(ControlTagType.OVERDUE_ENFORCEMENT_OFF),
-                                                                             new DefaultControlTag(ControlTagType.AUTO_INVOICING_OFF),
-                                                                             new DescriptiveTag("Tag")});
+                                                                           PaymentResponse.DO_NOT_HONOR,
+                                                                           new Tag[]{new DefaultControlTag(ControlTagType.OVERDUE_ENFORCEMENT_OFF),
+                                                                                   new DefaultControlTag(ControlTagType.AUTO_INVOICING_OFF),
+                                                                                   new DescriptiveTag("Tag")});
 
         Assert.assertTrue(!c.evaluate(state0, now));
         Assert.assertTrue(c.evaluate(state1, now));
         Assert.assertTrue(c.evaluate(state2, now));
     }
-
-
 }

diff --git a/overdue/src/test/java/com/ning/billing/overdue/config/TestOverdueConfig.java b/overdue/src/test/java/com/ning/billing/overdue/config/TestOverdueConfig.java
index 58aabcf..2b2c264 100644
--- a/overdue/src/test/java/com/ning/billing/overdue/config/TestOverdueConfig.java
+++ b/overdue/src/test/java/com/ning/billing/overdue/config/TestOverdueConfig.java
@@ -21,11 +21,11 @@ import java.io.InputStream;
 
 import org.testng.annotations.Test;
 
+import com.ning.billing.overdue.OverdueTestSuite;
 import com.ning.billing.util.config.XMLLoader;
 
-public class TestOverdueConfig {
-
-    @Test
+public class TestOverdueConfig extends OverdueTestSuite {
+    @Test(groups = "fast")
     public void testParseConfig() throws Exception {
         final String xml = "<overdueConfig>" +
                 "   <bundleOverdueStates>" +
@@ -59,7 +59,5 @@ public class TestOverdueConfig {
                 "</overdueConfig>";
         final InputStream is = new ByteArrayInputStream(xml.getBytes());
         final OverdueConfig c = XMLLoader.getObjectFromStreamNoValidation(is, OverdueConfig.class);
-
     }
-
 }

diff --git a/overdue/src/test/java/com/ning/billing/overdue/notification/TestOverdueCheckNotifier.java b/overdue/src/test/java/com/ning/billing/overdue/notification/TestOverdueCheckNotifier.java
index 53b28bc..5965e02 100644
--- a/overdue/src/test/java/com/ning/billing/overdue/notification/TestOverdueCheckNotifier.java
+++ b/overdue/src/test/java/com/ning/billing/overdue/notification/TestOverdueCheckNotifier.java
@@ -33,6 +33,7 @@ import org.testng.annotations.Test;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import com.google.inject.Stage;
+import com.ning.billing.KillbillTestSuiteWithEmbeddedDB;
 import com.ning.billing.catalog.DefaultCatalogService;
 import com.ning.billing.catalog.api.CatalogService;
 import com.ning.billing.config.CatalogConfig;
@@ -51,6 +52,7 @@ import com.ning.billing.ovedue.notification.DefaultOverdueCheckNotifier;
 import com.ning.billing.ovedue.notification.DefaultOverdueCheckPoster;
 import com.ning.billing.ovedue.notification.OverdueCheckPoster;
 import com.ning.billing.overdue.OverdueProperties;
+import com.ning.billing.overdue.OverdueTestSuiteWithEmbeddedDB;
 import com.ning.billing.overdue.glue.DefaultOverdueModule;
 import com.ning.billing.overdue.listener.OverdueListener;
 import com.ning.billing.util.bus.Bus;
@@ -73,12 +75,11 @@ import com.ning.billing.util.tag.dao.TagDao;
 import static com.jayway.awaitility.Awaitility.await;
 import static java.util.concurrent.TimeUnit.MINUTES;
 
-public class TestOverdueCheckNotifier {
+public class TestOverdueCheckNotifier extends OverdueTestSuiteWithEmbeddedDB {
     private Clock clock;
     private DefaultOverdueCheckNotifier notifier;
 
     private Bus eventBus;
-    private MysqlTestingHelper helper;
     private OverdueListenerMock listener;
     private NotificationQueueService notificationQueueService;
 
@@ -103,14 +104,11 @@ public class TestOverdueCheckNotifier {
         public UUID getLatestSubscriptionId() {
             return latestSubscriptionId;
         }
-
     }
 
-    @BeforeClass(groups = {"slow"})
+    @BeforeClass(groups = "slow")
     public void setup() throws ServiceException, IOException, ClassNotFoundException, SQLException, EntitlementUserApiException {
-        //TestApiBase.loadSystemPropertiesFromClasspath("/entitlement.properties");
         final Injector g = Guice.createInjector(Stage.PRODUCTION, new MockInvoiceModule(), new MockPaymentModule(), new BusModule(), new DefaultOverdueModule() {
-
             protected void configure() {
                 super.configure();
                 bind(Clock.class).to(ClockMock.class).asEagerSingleton();
@@ -121,7 +119,7 @@ public class TestOverdueCheckNotifier {
                 final CatalogConfig catalogConfig = new ConfigurationObjectFactory(System.getProperties()).build(CatalogConfig.class);
                 bind(CatalogConfig.class).toInstance(catalogConfig);
                 bind(CatalogService.class).to(DefaultCatalogService.class).asEagerSingleton();
-                final MysqlTestingHelper helper = new MysqlTestingHelper();
+                final MysqlTestingHelper helper = KillbillTestSuiteWithEmbeddedDB.getMysqlTestingHelper();
                 bind(MysqlTestingHelper.class).toInstance(helper);
                 final IDBI dbi = helper.getDBI();
                 bind(IDBI.class).toInstance(dbi);
@@ -136,7 +134,6 @@ public class TestOverdueCheckNotifier {
         clock = g.getInstance(Clock.class);
 
         eventBus = g.getInstance(Bus.class);
-        helper = g.getInstance(MysqlTestingHelper.class);
         notificationQueueService = g.getInstance(NotificationQueueService.class);
 
         final OverdueProperties properties = g.getInstance(OverdueProperties.class);
@@ -149,22 +146,12 @@ public class TestOverdueCheckNotifier {
         notifier = new DefaultOverdueCheckNotifier(notificationQueueService,
                                                    properties, listener);
 
-        startMysql();
         eventBus.start();
         notifier.initialize();
         notifier.start();
     }
 
-    private void startMysql() throws IOException, ClassNotFoundException, SQLException {
-        final String ddl = IOUtils.toString(NotificationSqlDao.class.getResourceAsStream("/com/ning/billing/util/ddl.sql"));
-        final String testDdl = IOUtils.toString(NotificationSqlDao.class.getResourceAsStream("/com/ning/billing/util/ddl_test.sql"));
-
-        helper.startMysql();
-        helper.initDb(ddl);
-        helper.initDb(testDdl);
-    }
-
-    @Test(enabled = true, groups = "slow")
+    @Test(groups = "slow")
     public void test() throws Exception {
         final UUID subscriptionId = new UUID(0L, 1L);
         final Blockable blockable = Mockito.mock(Subscription.class);
@@ -193,6 +180,5 @@ public class TestOverdueCheckNotifier {
     public void tearDown() {
         eventBus.stop();
         notifier.stop();
-        helper.stopMysql();
     }
 }

diff --git a/overdue/src/test/java/com/ning/billing/overdue/OverdueTestBase.java b/overdue/src/test/java/com/ning/billing/overdue/OverdueTestBase.java
index 39e1286..9a01428 100644
--- a/overdue/src/test/java/com/ning/billing/overdue/OverdueTestBase.java
+++ b/overdue/src/test/java/com/ning/billing/overdue/OverdueTestBase.java
@@ -16,7 +16,6 @@
 
 package com.ning.billing.overdue;
 
-import java.io.IOException;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
@@ -34,9 +33,7 @@ import com.google.inject.Inject;
 import com.ning.billing.account.api.Account;
 import com.ning.billing.catalog.MockPlan;
 import com.ning.billing.catalog.MockPriceList;
-import com.ning.billing.catalog.api.BillingPeriod;
 import com.ning.billing.catalog.glue.CatalogModule;
-import com.ning.billing.dbi.MysqlTestingHelper;
 import com.ning.billing.entitlement.api.user.EntitlementUserApi;
 import com.ning.billing.entitlement.api.user.EntitlementUserApiException;
 import com.ning.billing.entitlement.api.user.Subscription;
@@ -53,7 +50,6 @@ import com.ning.billing.mock.glue.TestDbiModule;
 import com.ning.billing.overdue.applicator.ApplicatorMockJunctionModule;
 import com.ning.billing.overdue.applicator.ApplicatorMockJunctionModule.ApplicatorBlockingApi;
 import com.ning.billing.overdue.applicator.OverdueListenerTesterModule;
-import com.ning.billing.overdue.applicator.TestOverdueStateApplicator;
 import com.ning.billing.overdue.config.OverdueConfig;
 import com.ning.billing.overdue.glue.DefaultOverdueModule;
 import com.ning.billing.overdue.service.DefaultOverdueService;
@@ -61,11 +57,10 @@ import com.ning.billing.overdue.wrapper.OverdueWrapperFactory;
 import com.ning.billing.util.bus.BusService;
 import com.ning.billing.util.clock.ClockMock;
 import com.ning.billing.util.glue.NotificationQueueModule;
-import com.ning.billing.util.io.IOUtils;
 import com.ning.billing.util.notificationq.NotificationQueueService.NotificationQueueAlreadyExists;
 
 @Guice(modules = {DefaultOverdueModule.class, OverdueListenerTesterModule.class, MockClockModule.class, ApplicatorMockJunctionModule.class, CatalogModule.class, MockInvoiceModule.class, MockPaymentModule.class, NotificationQueueModule.class, TestDbiModule.class})
-public class OverdueTestBase {
+public abstract class OverdueTestBase extends OverdueTestSuiteWithEmbeddedDB {
     protected final String configXml =
             "<overdueConfig>" +
                     "   <bundleOverdueStates>" +
@@ -129,30 +124,18 @@ public class OverdueTestBase {
 
     protected Account account;
     protected SubscriptionBundle bundle;
-    protected String productName;
-    protected BillingPeriod term;
-    protected String planSetName;
 
     @Inject
     EntitlementUserApi entitlementApi;
 
     @Inject
     protected DefaultOverdueService service;
+
     @Inject
     protected BusService busService;
-    @Inject
-    protected MysqlTestingHelper helper;
-
-    protected void setupMySQL() throws IOException {
-        final String utilDdl = IOUtils.toString(TestOverdueStateApplicator.class.getResourceAsStream("/com/ning/billing/util/ddl.sql"));
-        helper.startMysql();
-        helper.initDb(utilDdl);
-    }
 
     @BeforeClass(groups = "slow")
     public void setup() throws Exception {
-
-        setupMySQL();
         service.registerForBus();
         try {
             service.initialize();
@@ -166,14 +149,11 @@ public class OverdueTestBase {
 
     @AfterClass(groups = "slow")
     public void tearDown() throws Exception {
-        helper.stopMysql();
         service.stop();
     }
 
     @BeforeMethod(groups = "slow")
     public void setupTest() throws Exception {
-        // Pre test cleanup
-        helper.cleanupAllTables();
         clock.resetDeltaFromReality();
     }
 

diff --git a/overdue/src/test/java/com/ning/billing/overdue/OverdueTestSuite.java b/overdue/src/test/java/com/ning/billing/overdue/OverdueTestSuite.java
new file mode 100644
index 0000000..e0fb28c
--- /dev/null
+++ b/overdue/src/test/java/com/ning/billing/overdue/OverdueTestSuite.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2010-2012 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.overdue;
+
+import com.ning.billing.KillbillTestSuite;
+
+public abstract class OverdueTestSuite extends KillbillTestSuite {
+}

diff --git a/overdue/src/test/java/com/ning/billing/overdue/OverdueTestSuiteWithEmbeddedDB.java b/overdue/src/test/java/com/ning/billing/overdue/OverdueTestSuiteWithEmbeddedDB.java
new file mode 100644
index 0000000..17380be
--- /dev/null
+++ b/overdue/src/test/java/com/ning/billing/overdue/OverdueTestSuiteWithEmbeddedDB.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2010-2012 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.overdue;
+
+import com.ning.billing.KillbillTestSuiteWithEmbeddedDB;
+
+public abstract class OverdueTestSuiteWithEmbeddedDB extends KillbillTestSuiteWithEmbeddedDB {
+}

diff --git a/overdue/src/test/java/com/ning/billing/overdue/wrapper/TestOverdueWrapper.java b/overdue/src/test/java/com/ning/billing/overdue/wrapper/TestOverdueWrapper.java
index 84e7467..108a420 100644
--- a/overdue/src/test/java/com/ning/billing/overdue/wrapper/TestOverdueWrapper.java
+++ b/overdue/src/test/java/com/ning/billing/overdue/wrapper/TestOverdueWrapper.java
@@ -30,7 +30,7 @@ import com.ning.billing.overdue.config.OverdueConfig;
 import com.ning.billing.util.config.XMLLoader;
 
 public class TestOverdueWrapper extends OverdueTestBase {
-    @Test(groups = {"fast"}, enabled = true)
+    @Test(groups = "slow")
     public void testWrapperBasic() throws Exception {
         final InputStream is = new ByteArrayInputStream(configXml.getBytes());
         config = XMLLoader.getObjectFromStreamNoValidation(is, OverdueConfig.class);
@@ -46,7 +46,6 @@ public class TestOverdueWrapper extends OverdueTestBase {
         wrapper.refresh();
         checkStateApplied(state);
 
-
         state = config.getBundleStateSet().findState("OD2");
         bundle = createBundle(clock.getUTCNow().minusDays(41));
         wrapper = overdueWrapperFactory.createOverdueWrapperFor(bundle);
@@ -58,15 +57,12 @@ public class TestOverdueWrapper extends OverdueTestBase {
         wrapper = overdueWrapperFactory.createOverdueWrapperFor(bundle);
         wrapper.refresh();
         checkStateApplied(state);
-
     }
 
-    @Test(groups = {"fast"}, enabled = true)
+    @Test(groups = "slow")
     public void testWrapperNoConfig() throws Exception {
-
         overdueWrapperFactory.setOverdueConfig(null);
 
-
         final SubscriptionBundle bundle;
         final OverdueWrapper<SubscriptionBundle> wrapper;
         final OverdueState<SubscriptionBundle> state;
@@ -78,10 +74,8 @@ public class TestOverdueWrapper extends OverdueTestBase {
         wrapper = overdueWrapperFactory.createOverdueWrapperFor(bundle);
         final OverdueState<SubscriptionBundle> result = wrapper.refresh();
 
-
         Assert.assertEquals(result.getName(), state.getName());
         Assert.assertEquals(result.blockChanges(), state.blockChanges());
         Assert.assertEquals(result.disableEntitlementAndChangesBlocked(), state.disableEntitlementAndChangesBlocked());
-
     }
 }

diff --git a/util/src/test/java/com/ning/billing/mock/glue/TestDbiModule.java b/util/src/test/java/com/ning/billing/mock/glue/TestDbiModule.java
index 76dea1d..634631a 100644
--- a/util/src/test/java/com/ning/billing/mock/glue/TestDbiModule.java
+++ b/util/src/test/java/com/ning/billing/mock/glue/TestDbiModule.java
@@ -20,15 +20,14 @@ import org.skife.config.ConfigurationObjectFactory;
 import org.skife.jdbi.v2.IDBI;
 
 import com.google.inject.AbstractModule;
+import com.ning.billing.KillbillTestSuiteWithEmbeddedDB;
 import com.ning.billing.dbi.DBIProvider;
 import com.ning.billing.dbi.DbiConfig;
 import com.ning.billing.dbi.MysqlTestingHelper;
 
 public class TestDbiModule extends AbstractModule {
-
     protected void configure() {
-
-        final MysqlTestingHelper helper = new MysqlTestingHelper();
+        final MysqlTestingHelper helper = KillbillTestSuiteWithEmbeddedDB.getMysqlTestingHelper();
         bind(MysqlTestingHelper.class).toInstance(helper);
         if (helper.isUsingLocalInstance()) {
             bind(IDBI.class).toProvider(DBIProvider.class).asEagerSingleton();
@@ -38,6 +37,5 @@ public class TestDbiModule extends AbstractModule {
             final IDBI dbi = helper.getDBI();
             bind(IDBI.class).toInstance(dbi);
         }
-
     }
 }