killbill-memoizeit

diff --git a/analytics/src/test/java/com/ning/billing/analytics/api/user/TestDefaultAnalyticsUserApi.java b/analytics/src/test/java/com/ning/billing/analytics/api/user/TestDefaultAnalyticsUserApi.java
index 998e67a..783ef2c 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/api/user/TestDefaultAnalyticsUserApi.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/api/user/TestDefaultAnalyticsUserApi.java
@@ -59,7 +59,6 @@ import com.ning.billing.catalog.api.Product;
 import com.ning.billing.catalog.api.ProductCategory;
 import com.ning.billing.entitlement.api.user.Subscription;
 import com.ning.billing.mock.MockPlan;
-import com.ning.billing.payment.api.PaymentApi;
 import com.ning.billing.util.callcontext.InternalCallContextFactory;
 import com.ning.billing.util.callcontext.TenantContext;
 import com.ning.billing.util.clock.Clock;
@@ -82,7 +81,7 @@ public class TestDefaultAnalyticsUserApi extends AnalyticsTestSuiteWithEmbeddedD
     private BusinessOverdueStatusSqlDao overdueStatusSqlDao;
     private BusinessInvoicePaymentSqlDao invoicePaymentSqlDao;
 
-    @BeforeMethod(groups = "slow")
+    @BeforeMethod(groups = "mysql")
     public void setUp() throws Exception {
         final IDBI dbi = helper.getDBI();
         accountSqlDao = dbi.onDemand(BusinessAccountSqlDao.class);
@@ -108,7 +107,7 @@ public class TestDefaultAnalyticsUserApi extends AnalyticsTestSuiteWithEmbeddedD
                                                        new InternalCallContextFactory(dbi, clock));
     }
 
-    @Test(groups = "slow")
+    @Test(groups = "mysql")
     public void testAccountsCreatedOverTime() throws Exception {
         final BusinessAccountModelDao account = new BusinessAccountModelDao(UUID.randomUUID(), UUID.randomUUID().toString(), UUID.randomUUID().toString(), BigDecimal.ONE, clock.getUTCToday(),
                                                                             BigDecimal.TEN, "ERROR_NOT_ENOUGH_FUNDS", "CreditCard", "Visa", "FRANCE", "USD", clock.getUTCNow(), clock.getUTCNow());
@@ -121,7 +120,7 @@ public class TestDefaultAnalyticsUserApi extends AnalyticsTestSuiteWithEmbeddedD
         Assert.assertEquals(data.getValues().get(0), (double) 1);
     }
 
-    @Test(groups = "slow")
+    @Test(groups = "mysql")
     public void testSubscriptionsCreatedOverTime() throws Exception {
         final String productType = "subscription";
         final Product product = new MockProduct("platinum", productType, ProductCategory.BASE);

diff --git a/pom.xml b/pom.xml
index a7e3aae..9c4f724 100644
--- a/pom.xml
+++ b/pom.xml
@@ -569,7 +569,7 @@
                 <version>2.11</version>
                 <configuration>
                     <useManifestOnlyJar>false</useManifestOnlyJar>
-                    <groups>fast,slow</groups>
+                    <groups>fast,slow,mysql</groups>
                     <systemPropertyVariables>
                         <log4j.configuration>file:${project.basedir}/src/test/resources/log4j.xml</log4j.configuration>
                     </systemPropertyVariables>
@@ -602,7 +602,7 @@
     </build>
     <profiles>
         <profile>
-            <id>localtest</id>
+            <id>h2</id>
             <build>
                 <plugins>
                     <plugin>
@@ -611,6 +611,27 @@
                         <version>2.11</version>
                         <configuration>
                             <groups>fast,slow</groups>
+                            <excludedGroups>mysql</excludedGroups>
+                            <systemPropertyVariables>
+                                <com.ning.billing.dbi.test.h2>true</com.ning.billing.dbi.test.h2>
+                                <file.encoding>UTF-8</file.encoding>
+                                <user.timezone>GMT</user.timezone>
+                            </systemPropertyVariables>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>localtest</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <version>2.11</version>
+                        <configuration>
+                            <groups>fast,slow,mysql</groups>
                             <useManifestOnlyJar>false</useManifestOnlyJar>
                             <systemPropertyVariables>
                                 <log4j.configuration>file:${project.basedir}/src/test/resources/log4j.xml
@@ -635,8 +656,9 @@
                         <artifactId>maven-surefire-plugin</artifactId>
                         <version>2.11</version>
                         <configuration>
-                            <groups>fast</groups>
+                            <groups>fast,slow</groups>
                             <systemPropertyVariables>
+                                <com.ning.billing.dbi.test.h2>true</com.ning.billing.dbi.test.h2>
                                 <file.encoding>UTF-8</file.encoding>
                                 <user.timezone>GMT</user.timezone>
                             </systemPropertyVariables>

diff --git a/util/src/test/java/com/ning/billing/KillbillTestSuiteWithEmbeddedDB.java b/util/src/test/java/com/ning/billing/KillbillTestSuiteWithEmbeddedDB.java
index cde037c..20d2451 100644
--- a/util/src/test/java/com/ning/billing/KillbillTestSuiteWithEmbeddedDB.java
+++ b/util/src/test/java/com/ning/billing/KillbillTestSuiteWithEmbeddedDB.java
@@ -55,14 +55,14 @@ public class KillbillTestSuiteWithEmbeddedDB extends KillbillTestSuite {
         return helper.getDBI();
     }
 
-    @BeforeSuite(groups = "slow")
+    @BeforeSuite(groups = {"slow", "mysql"})
     public void startMysqlBeforeTestSuite() throws IOException, ClassNotFoundException, SQLException, URISyntaxException {
         helper.start();
         helper.initDb();
         helper.cleanupAllTables();
     }
 
-    @BeforeMethod(groups = "slow")
+    @BeforeMethod(groups = {"slow", "mysql"})
     public void cleanupTablesBetweenMethods() {
         try {
             helper.cleanupAllTables();
@@ -70,7 +70,7 @@ public class KillbillTestSuiteWithEmbeddedDB extends KillbillTestSuite {
         }
     }
 
-    @AfterSuite(groups = "slow")
+    @AfterSuite(groups = {"slow", "mysql"})
     public void shutdownMysqlAfterTestSuite() throws IOException, ClassNotFoundException, SQLException, URISyntaxException {
         if (hasFailed()) {
             log.error("**********************************************************************************************");

diff --git a/util/src/test/java/com/ning/billing/util/globallocker/TestMysqlGlobalLocker.java b/util/src/test/java/com/ning/billing/util/globallocker/TestMysqlGlobalLocker.java
index a006e58..9f787d0 100644
--- a/util/src/test/java/com/ning/billing/util/globallocker/TestMysqlGlobalLocker.java
+++ b/util/src/test/java/com/ning/billing/util/globallocker/TestMysqlGlobalLocker.java
@@ -41,14 +41,14 @@ public class TestMysqlGlobalLocker extends UtilTestSuiteWithEmbeddedDB {
     @Inject
     private IDBI dbi;
 
-    @BeforeMethod(groups = "slow")
+    @BeforeMethod(groups = "mysql")
     public void setup() throws IOException {
         final String testDdl = IOUtils.toString(TestMysqlGlobalLocker.class.getResourceAsStream("/com/ning/billing/util/ddl_test.sql"));
         helper.initDb(testDdl);
     }
 
     // Used as a manual test to validate the simple DAO by stepping through that locking is done and release correctly
-    @Test(groups = "slow")
+    @Test(groups = "mysql")
     public void testSimpleLocking() {
         final String lockName = UUID.randomUUID().toString();