killbill-aplcache

diff --git a/util/src/test/java/com/ning/billing/util/entity/dao/MockEntityDaoBase.java b/util/src/test/java/com/ning/billing/util/entity/dao/MockEntityDaoBase.java
index 53b8d91..6d32cae 100644
--- a/util/src/test/java/com/ning/billing/util/entity/dao/MockEntityDaoBase.java
+++ b/util/src/test/java/com/ning/billing/util/entity/dao/MockEntityDaoBase.java
@@ -26,19 +26,16 @@ import java.util.concurrent.atomic.AtomicLong;
 import com.ning.billing.BillingExceptionBase;
 import com.ning.billing.util.callcontext.InternalCallContext;
 import com.ning.billing.util.callcontext.InternalTenantContext;
-import com.ning.billing.util.customfield.CustomField;
 import com.ning.billing.util.entity.Entity;
 
 import com.google.common.collect.ImmutableMap;
 
 public class MockEntityDaoBase<T extends Entity, U extends BillingExceptionBase> implements EntityDao<T, U> {
 
-
-    protected final static AtomicLong autoIncrement = new AtomicLong(1);
+    protected static final AtomicLong autoIncrement = new AtomicLong(1);
 
     protected final Map<UUID, Map<Long, T>> entities = new HashMap<UUID, Map<Long, T>>();
 
-
     @Override
     public void create(final T entity, final InternalCallContext context) throws U {
         entities.put(entity.getId(), ImmutableMap.<Long, T>of(autoIncrement.incrementAndGet(), entity));
@@ -51,7 +48,7 @@ public class MockEntityDaoBase<T extends Entity, U extends BillingExceptionBase>
 
     @Override
     public T getByRecordId(final Long recordId, final InternalTenantContext context) {
-        for (Map<Long, T> cur : entities.values()) {
+        for (final Map<Long, T> cur : entities.values()) {
             if (cur.keySet().iterator().next().equals(recordId)) {
                 cur.values().iterator().next();
             }
@@ -66,13 +63,17 @@ public class MockEntityDaoBase<T extends Entity, U extends BillingExceptionBase>
 
     @Override
     public List<T> get(final InternalTenantContext context) {
-        List<T> result = new ArrayList<T>();
-        for (Map<Long, T> cur : entities.values()) {
-             result.add(cur.values().iterator().next());
+        final List<T> result = new ArrayList<T>();
+        for (final Map<Long, T> cur : entities.values()) {
+            result.add(cur.values().iterator().next());
         }
         return result;
     }
 
+    public void delete(final T entity, final InternalCallContext context) {
+        entities.remove(entity.getId());
+    }
+
     @Override
     public void test(final InternalTenantContext context) {
     }