killbill-memoizeit

diff --git a/entitlement/src/test/java/com/ning/billing/entitlement/DefaultEntitlementTestInitializer.java b/entitlement/src/test/java/com/ning/billing/entitlement/DefaultEntitlementTestInitializer.java
index ac1c357..9e602ac 100644
--- a/entitlement/src/test/java/com/ning/billing/entitlement/DefaultEntitlementTestInitializer.java
+++ b/entitlement/src/test/java/com/ning/billing/entitlement/DefaultEntitlementTestInitializer.java
@@ -152,16 +152,4 @@ public class DefaultEntitlementTestInitializer implements EntitlementTestInitial
     private void stopEntitlementService(final EntitlementService entitlementService) throws Exception {
         ((Engine) entitlementService).stop();
     }
-
-
-    public static void loadSystemPropertiesFromClasspath(final String resource) {
-        final URL url = EntitlementTestSuiteNoDB.class.getResource(resource);
-        assertNotNull(url);
-
-        try {
-            System.getProperties().load(url.openStream());
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
 }

diff --git a/entitlement/src/test/java/com/ning/billing/entitlement/EntitlementTestSuiteNoDB.java b/entitlement/src/test/java/com/ning/billing/entitlement/EntitlementTestSuiteNoDB.java
index 64b95ac..f7cda9f 100644
--- a/entitlement/src/test/java/com/ning/billing/entitlement/EntitlementTestSuiteNoDB.java
+++ b/entitlement/src/test/java/com/ning/billing/entitlement/EntitlementTestSuiteNoDB.java
@@ -16,10 +16,13 @@
 
 package com.ning.billing.entitlement;
 
+import java.net.URL;
+
 import javax.inject.Inject;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
@@ -92,9 +95,17 @@ public class EntitlementTestSuiteNoDB extends GuicyKillbillTestSuiteNoDB {
     protected AccountData accountData;
     protected SubscriptionBundle bundle;
 
+    private void loadSystemPropertiesFromClasspath(final String resource) {
+        final URL url = DefaultEntitlementTestInitializer.class.getResource(resource);
+        Assert.assertNotNull(url);
+
+        configSource.merge(url);
+    }
+
     @BeforeClass(groups = "fast")
     public void beforeClass() throws Exception {
-        DefaultEntitlementTestInitializer.loadSystemPropertiesFromClasspath("/entitlement.properties");
+        loadSystemPropertiesFromClasspath("/entitlement.properties");
+
         final Injector g = Guice.createInjector(Stage.PRODUCTION, new TestEngineModuleNoDB(configSource));
         g.injectMembers(this);
     }

diff --git a/entitlement/src/test/java/com/ning/billing/entitlement/EntitlementTestSuiteWithEmbeddedDB.java b/entitlement/src/test/java/com/ning/billing/entitlement/EntitlementTestSuiteWithEmbeddedDB.java
index a4b084b..1b2815d 100644
--- a/entitlement/src/test/java/com/ning/billing/entitlement/EntitlementTestSuiteWithEmbeddedDB.java
+++ b/entitlement/src/test/java/com/ning/billing/entitlement/EntitlementTestSuiteWithEmbeddedDB.java
@@ -16,10 +16,13 @@
 
 package com.ning.billing.entitlement;
 
+import java.net.URL;
+
 import javax.inject.Inject;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
@@ -90,9 +93,17 @@ public class EntitlementTestSuiteWithEmbeddedDB extends GuicyKillbillTestSuiteWi
     protected AccountData accountData;
     protected SubscriptionBundle bundle;
 
+    private void loadSystemPropertiesFromClasspath(final String resource) {
+        final URL url = DefaultEntitlementTestInitializer.class.getResource(resource);
+        Assert.assertNotNull(url);
+
+        configSource.merge(url);
+    }
+
     @BeforeClass(groups = "slow")
     public void beforeClass() throws Exception {
-        DefaultEntitlementTestInitializer.loadSystemPropertiesFromClasspath("/entitlement.properties");
+        loadSystemPropertiesFromClasspath("/entitlement.properties");
+
         final Injector g = Guice.createInjector(Stage.PRODUCTION, new TestEngineModuleWithEmbeddedDB(configSource));
         g.injectMembers(this);
     }

diff --git a/invoice/src/test/java/com/ning/billing/invoice/InvoiceTestSuiteNoDB.java b/invoice/src/test/java/com/ning/billing/invoice/InvoiceTestSuiteNoDB.java
index f11a650..f6e1194 100644
--- a/invoice/src/test/java/com/ning/billing/invoice/InvoiceTestSuiteNoDB.java
+++ b/invoice/src/test/java/com/ning/billing/invoice/InvoiceTestSuiteNoDB.java
@@ -16,11 +16,11 @@
 
 package com.ning.billing.invoice;
 
-import java.io.IOException;
 import java.net.URL;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
@@ -48,8 +48,6 @@ import com.google.inject.Guice;
 import com.google.inject.Inject;
 import com.google.inject.Injector;
 
-import static org.testng.Assert.assertNotNull;
-
 public abstract class InvoiceTestSuiteNoDB extends GuicyKillbillTestSuiteNoDB {
 
     private static final Logger log = LoggerFactory.getLogger(InvoiceTestSuiteNoDB.class);
@@ -89,10 +87,15 @@ public abstract class InvoiceTestSuiteNoDB extends GuicyKillbillTestSuiteNoDB {
     @Inject
     protected TestInvoiceHelper invoiceUtil;
 
+    private void loadSystemPropertiesFromClasspath(final String resource) {
+        final URL url = InvoiceTestSuiteNoDB.class.getResource(resource);
+        Assert.assertNotNull(url);
+
+        configSource.merge(url);
+    }
 
     @BeforeClass(groups = "fast")
     protected void beforeClass() throws Exception {
-
         loadSystemPropertiesFromClasspath("/resource.properties");
 
         final Injector injector = Guice.createInjector(new TestInvoiceModuleNoDB(configSource));
@@ -108,14 +111,4 @@ public abstract class InvoiceTestSuiteNoDB extends GuicyKillbillTestSuiteNoDB {
     public void afterMethod() {
         bus.stop();
     }
-
-    private static void loadSystemPropertiesFromClasspath(final String resource) {
-        final URL url = InvoiceTestSuiteNoDB.class.getResource(resource);
-        assertNotNull(url);
-        try {
-            System.getProperties().load(url.openStream());
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
 }

diff --git a/invoice/src/test/java/com/ning/billing/invoice/InvoiceTestSuiteWithEmbeddedDB.java b/invoice/src/test/java/com/ning/billing/invoice/InvoiceTestSuiteWithEmbeddedDB.java
index a969367..a1f3bfb 100644
--- a/invoice/src/test/java/com/ning/billing/invoice/InvoiceTestSuiteWithEmbeddedDB.java
+++ b/invoice/src/test/java/com/ning/billing/invoice/InvoiceTestSuiteWithEmbeddedDB.java
@@ -16,11 +16,11 @@
 
 package com.ning.billing.invoice;
 
-import java.io.IOException;
 import java.net.URL;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
@@ -53,13 +53,10 @@ import com.google.inject.Guice;
 import com.google.inject.Inject;
 import com.google.inject.Injector;
 
-import static org.testng.Assert.assertNotNull;
-
 public abstract class InvoiceTestSuiteWithEmbeddedDB extends GuicyKillbillTestSuiteWithEmbeddedDB {
 
     private static final Logger log = LoggerFactory.getLogger(InvoiceTestSuiteWithEmbeddedDB.class);
 
-
     protected static final Currency accountCurrency = Currency.USD;
 
     @Inject
@@ -105,6 +102,12 @@ public abstract class InvoiceTestSuiteWithEmbeddedDB extends GuicyKillbillTestSu
     @Inject
     protected TestInvoiceNotificationQListener testInvoiceNotificationQListener;
 
+    private void loadSystemPropertiesFromClasspath(final String resource) {
+        final URL url = InvoiceTestSuiteNoDB.class.getResource(resource);
+        Assert.assertNotNull(url);
+
+        configSource.merge(url);
+    }
 
     @BeforeClass(groups = "slow")
     protected void beforeClass() throws Exception {
@@ -138,14 +141,4 @@ public abstract class InvoiceTestSuiteWithEmbeddedDB extends GuicyKillbillTestSu
         bus.stop();
         stopInvoiceService(invoiceService);
     }
-
-    private static void loadSystemPropertiesFromClasspath(final String resource) {
-        final URL url = InvoiceTestSuiteWithEmbeddedDB.class.getResource(resource);
-        assertNotNull(url);
-        try {
-            System.getProperties().load(url.openStream());
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
 }