killbill-aplcache

Fixing a build issue that was not coming up in the IDE - it involved …

2/6/2012 7:52:27 PM

moving MockClockModule into test

Martin Westhead

Commit: 06903e1

Tree: a7df6c6

Parents: 7a31fc5

Changes

account/src/test/java/com/ning/billing/account/glue/AccountModuleWithMocks.java 2(+1 -1)

entitlement/src/test/java/com/ning/billing/entitlement/api/migration/TestMigration.java 10(+2 -8)

entitlement/src/test/java/com/ning/billing/entitlement/glue/MockEngineModule.java 3(+2 -1)

util/src/test/java/com/ning/billing/util/clock/MockClockModule.java 4(+1 -3)

util/src/test/java/com/ning/billing/util/tag/TagStoreModuleMock.java 1(+0 -1)

util/src/test/java/com/ning/billing/util/tag/TestTagStore.java 2(+1 -1)

Details

account/src/test/java/com/ning/billing/account/glue/AccountModuleWithMocks.java 2(+1 -1)

diff --git a/account/src/test/java/com/ning/billing/account/glue/AccountModuleWithMocks.java b/account/src/test/java/com/ning/billing/account/glue/AccountModuleWithMocks.java
index 86beaa5..5a2da49 100644
--- a/account/src/test/java/com/ning/billing/account/glue/AccountModuleWithMocks.java
+++ b/account/src/test/java/com/ning/billing/account/glue/AccountModuleWithMocks.java
@@ -18,7 +18,7 @@ package com.ning.billing.account.glue;
 
 import com.ning.billing.account.dao.AccountDao;
 import com.ning.billing.account.dao.MockAccountDao;
-import com.ning.billing.util.glue.MockClockModule;
+import com.ning.billing.util.clock.MockClockModule;
 
 public class AccountModuleWithMocks extends AccountModule {
     @Override

entitlement/src/test/java/com/ning/billing/entitlement/api/migration/TestMigration.java 10(+2 -8)

diff --git a/entitlement/src/test/java/com/ning/billing/entitlement/api/migration/TestMigration.java b/entitlement/src/test/java/com/ning/billing/entitlement/api/migration/TestMigration.java
index 271de3c..7ef459d 100644
--- a/entitlement/src/test/java/com/ning/billing/entitlement/api/migration/TestMigration.java
+++ b/entitlement/src/test/java/com/ning/billing/entitlement/api/migration/TestMigration.java
@@ -28,28 +28,22 @@ import java.util.UUID;
 
 import org.joda.time.DateTime;
 import org.testng.Assert;
-import org.testng.annotations.Test;
 
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-import com.google.inject.Stage;
 import com.ning.billing.catalog.api.BillingPeriod;
 import com.ning.billing.catalog.api.Duration;
 import com.ning.billing.catalog.api.PhaseType;
 import com.ning.billing.catalog.api.PlanPhaseSpecifier;
 import com.ning.billing.catalog.api.PriceListSet;
 import com.ning.billing.catalog.api.ProductCategory;
-import com.ning.billing.entitlement.api.TestApiBase;
 import com.ning.billing.entitlement.api.ApiTestListener.NextEvent;
-import com.ning.billing.entitlement.api.migration.EntitlementMigrationApiException;
+import com.ning.billing.entitlement.api.TestApiBase;
 import com.ning.billing.entitlement.api.migration.EntitlementMigrationApi.EntitlementAccountMigration;
 import com.ning.billing.entitlement.api.migration.EntitlementMigrationApi.EntitlementBundleMigration;
 import com.ning.billing.entitlement.api.migration.EntitlementMigrationApi.EntitlementSubscriptionMigration;
 import com.ning.billing.entitlement.api.migration.EntitlementMigrationApi.EntitlementSubscriptionMigrationCase;
 import com.ning.billing.entitlement.api.user.Subscription;
-import com.ning.billing.entitlement.api.user.SubscriptionBundle;
 import com.ning.billing.entitlement.api.user.Subscription.SubscriptionState;
-import com.ning.billing.entitlement.glue.MockEngineModuleSql;
+import com.ning.billing.entitlement.api.user.SubscriptionBundle;
 
 public abstract class TestMigration extends TestApiBase {

entitlement/src/test/java/com/ning/billing/entitlement/glue/MockEngineModule.java 3(+2 -1)

diff --git a/entitlement/src/test/java/com/ning/billing/entitlement/glue/MockEngineModule.java b/entitlement/src/test/java/com/ning/billing/entitlement/glue/MockEngineModule.java
index 8ad3ae8..e9033b1 100644
--- a/entitlement/src/test/java/com/ning/billing/entitlement/glue/MockEngineModule.java
+++ b/entitlement/src/test/java/com/ning/billing/entitlement/glue/MockEngineModule.java
@@ -18,8 +18,9 @@ package com.ning.billing.entitlement.glue;
 
 import com.ning.billing.account.glue.AccountModuleWithMocks;
 import com.ning.billing.catalog.glue.CatalogModule;
+import com.ning.billing.util.clock.MockClockModule;
 import com.ning.billing.util.glue.EventBusModule;
-import com.ning.billing.util.glue.MockClockModule;
+import com.ning.billing.entitlement.glue.EntitlementModule;
 
 public class MockEngineModule extends EntitlementModule {

util/src/test/java/com/ning/billing/util/tag/TagStoreModuleMock.java 1(+0 -1)

diff --git a/util/src/test/java/com/ning/billing/util/tag/TagStoreModuleMock.java b/util/src/test/java/com/ning/billing/util/tag/TagStoreModuleMock.java
index 74309b8..7bf9572 100644
--- a/util/src/test/java/com/ning/billing/util/tag/TagStoreModuleMock.java
+++ b/util/src/test/java/com/ning/billing/util/tag/TagStoreModuleMock.java
@@ -21,7 +21,6 @@ import java.io.IOException;
 import org.skife.jdbi.v2.IDBI;
 
 import com.ning.billing.dbi.MysqlTestingHelper;
-import com.ning.billing.util.glue.MockClockModule;
 import com.ning.billing.util.glue.TagStoreModule;
 
 public class TagStoreModuleMock extends TagStoreModule {

util/src/test/java/com/ning/billing/util/tag/TestTagStore.java 2(+1 -1)

diff --git a/util/src/test/java/com/ning/billing/util/tag/TestTagStore.java b/util/src/test/java/com/ning/billing/util/tag/TestTagStore.java
index 0fed7fe..f764e0c 100644
--- a/util/src/test/java/com/ning/billing/util/tag/TestTagStore.java
+++ b/util/src/test/java/com/ning/billing/util/tag/TestTagStore.java
@@ -33,7 +33,7 @@ import com.ning.billing.account.api.ControlTagType;
 import com.ning.billing.util.api.TagDefinitionApiException;
 import com.ning.billing.util.clock.Clock;
 import com.ning.billing.util.clock.DefaultClock;
-import com.ning.billing.util.glue.MockClockModule;
+import com.ning.billing.util.clock.MockClockModule;
 import com.ning.billing.util.tag.dao.TagDefinitionDao;
 import com.ning.billing.util.tag.dao.TagStoreSqlDao;