killbill-memoizeit

diff --git a/util/src/test/java/com/ning/billing/GuicyKillbillTestSuiteWithEmbeddedDB.java b/util/src/test/java/com/ning/billing/GuicyKillbillTestSuiteWithEmbeddedDB.java
index 1ac9403..fbd40aa 100644
--- a/util/src/test/java/com/ning/billing/GuicyKillbillTestSuiteWithEmbeddedDB.java
+++ b/util/src/test/java/com/ning/billing/GuicyKillbillTestSuiteWithEmbeddedDB.java
@@ -41,12 +41,12 @@ public class GuicyKillbillTestSuiteWithEmbeddedDB extends GuicyKillbillTestSuite
     @Inject
     protected IDBI dbi;
 
-    @BeforeSuite(groups = {"slow", "mysql"})
+    @BeforeSuite(groups = "slow")
     public void beforeSuite() throws Exception {
         DBTestingHelper.start();
     }
 
-    @BeforeMethod(groups = {"slow", "mysql"})
+    @BeforeMethod(groups = "slow")
     public void beforeMethod() throws Exception {
         try {
             DBTestingHelper.get().cleanupAllTables();
@@ -54,7 +54,7 @@ public class GuicyKillbillTestSuiteWithEmbeddedDB extends GuicyKillbillTestSuite
         }
     }
 
-    @AfterSuite(groups = {"slow", "mysql"})
+    @AfterSuite(groups = "slow")
     public void afterSuite() throws Exception {
         if (hasFailed()) {
             log.error("**********************************************************************************************");

diff --git a/util/src/test/java/com/ning/billing/KillbillTestSuiteWithEmbeddedDB.java b/util/src/test/java/com/ning/billing/KillbillTestSuiteWithEmbeddedDB.java
index 0ac8b85..5df635a 100644
--- a/util/src/test/java/com/ning/billing/KillbillTestSuiteWithEmbeddedDB.java
+++ b/util/src/test/java/com/ning/billing/KillbillTestSuiteWithEmbeddedDB.java
@@ -31,12 +31,12 @@ public class KillbillTestSuiteWithEmbeddedDB extends KillbillTestSuite {
 
     private static final Logger log = LoggerFactory.getLogger(KillbillTestSuiteWithEmbeddedDB.class);
 
-    @BeforeSuite(groups = {"slow", "mysql"})
+    @BeforeSuite(groups = "slow")
     public void startMysqlBeforeTestSuite() throws IOException, ClassNotFoundException, SQLException, URISyntaxException {
         DBTestingHelper.start();
     }
 
-    @BeforeMethod(groups = {"slow", "mysql"})
+    @BeforeMethod(groups = "slow")
     public void cleanupTablesBetweenMethods() {
         try {
             DBTestingHelper.get().cleanupAllTables();
@@ -44,7 +44,7 @@ public class KillbillTestSuiteWithEmbeddedDB extends KillbillTestSuite {
         }
     }
 
-    @AfterSuite(groups = {"slow", "mysql"})
+    @AfterSuite(groups = "slow")
     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 f6d695a..2c2f5de 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
@@ -34,11 +34,10 @@ import com.ning.billing.util.UtilTestSuiteWithEmbeddedDB;
 public class TestMysqlGlobalLocker extends UtilTestSuiteWithEmbeddedDB {
 
     // Used as a manual test to validate the simple DAO by stepping through that locking is done and release correctly
-    @Test(groups = "mysql")
+    @Test(groups = "slow")
     public void testSimpleLocking() throws IOException, LockFailedException {
         final String lockName = UUID.randomUUID().toString();
 
-        final GlobalLocker locker = new MySqlGlobalLocker(dataSource);
         final GlobalLock lock = locker.lockWithNumberOfTries(LockerType.ACCOUNT_FOR_INVOICE_PAYMENTS.toString(), lockName, 3);
 
         dbi.inTransaction(new TransactionCallback<Void>() {

diff --git a/util/src/test/java/com/ning/billing/util/glue/TestUtilModuleWithEmbeddedDB.java b/util/src/test/java/com/ning/billing/util/glue/TestUtilModuleWithEmbeddedDB.java
index 71e6fd5..dd0c9af 100644
--- a/util/src/test/java/com/ning/billing/util/glue/TestUtilModuleWithEmbeddedDB.java
+++ b/util/src/test/java/com/ning/billing/util/glue/TestUtilModuleWithEmbeddedDB.java
@@ -18,7 +18,9 @@ package com.ning.billing.util.glue;
 
 import org.skife.config.ConfigSource;
 
+import com.ning.billing.DBTestingHelper;
 import com.ning.billing.GuicyKillbillTestWithEmbeddedDBModule;
+import com.ning.billing.util.globallocker.TestGlobalLockerModule;
 
 public class TestUtilModuleWithEmbeddedDB extends TestUtilModule {
 
@@ -38,6 +40,6 @@ public class TestUtilModuleWithEmbeddedDB extends TestUtilModule {
         install(new BusModule(configSource));
         install(new NotificationQueueModule(configSource));
         install(new NonEntityDaoModule());
-        install(new GlobalLockerModule());
+        install(new TestGlobalLockerModule(DBTestingHelper.get()));
     }
 }

diff --git a/util/src/test/java/com/ning/billing/util/UtilTestSuiteWithEmbeddedDB.java b/util/src/test/java/com/ning/billing/util/UtilTestSuiteWithEmbeddedDB.java
index ad1e535..ac75097 100644
--- a/util/src/test/java/com/ning/billing/util/UtilTestSuiteWithEmbeddedDB.java
+++ b/util/src/test/java/com/ning/billing/util/UtilTestSuiteWithEmbeddedDB.java
@@ -30,6 +30,7 @@ import com.ning.billing.GuicyKillbillTestSuiteWithEmbeddedDB;
 import com.ning.billing.api.TestApiListener;
 import com.ning.billing.api.TestListenerStatus;
 import com.ning.billing.bus.api.PersistentBus;
+import com.ning.billing.commons.locker.GlobalLocker;
 import com.ning.billing.notificationq.api.NotificationQueueService;
 import com.ning.billing.util.audit.dao.AuditDao;
 import com.ning.billing.util.cache.CacheControllerDispatcher;
@@ -77,6 +78,8 @@ public abstract class UtilTestSuiteWithEmbeddedDB extends GuicyKillbillTestSuite
     @Inject
     protected AuditDao auditDao;
     @Inject
+    protected GlobalLocker locker;
+    @Inject
     protected IDBI idbi;
 
     protected TestApiListener eventsListener;