killbill-memoizeit

Details

diff --git a/invoice/src/main/java/com/ning/billing/invoice/generator/DefaultInvoiceGenerator.java b/invoice/src/main/java/com/ning/billing/invoice/generator/DefaultInvoiceGenerator.java
index 61554e7..ac10e99 100644
--- a/invoice/src/main/java/com/ning/billing/invoice/generator/DefaultInvoiceGenerator.java
+++ b/invoice/src/main/java/com/ning/billing/invoice/generator/DefaultInvoiceGenerator.java
@@ -84,7 +84,7 @@ import com.google.inject.Inject;
  *           -15 (repair)
  *
  * The current version of the code uses partial repair logic but is able to deal with 'full repair' scenarii.
- *           
+ *
  */
 
 public class DefaultInvoiceGenerator implements InvoiceGenerator {
diff --git a/invoice/src/test/java/com/ning/billing/invoice/generator/TestDefaultInvoiceGenerator.java b/invoice/src/test/java/com/ning/billing/invoice/generator/TestDefaultInvoiceGenerator.java
index 2dc57b0..04fd3da 100644
--- a/invoice/src/test/java/com/ning/billing/invoice/generator/TestDefaultInvoiceGenerator.java
+++ b/invoice/src/test/java/com/ning/billing/invoice/generator/TestDefaultInvoiceGenerator.java
@@ -27,7 +27,6 @@ import java.util.UUID;
 import javax.annotation.Nullable;
 
 import org.joda.time.DateTime;
-import org.joda.time.DateTimeZone;
 import org.joda.time.LocalDate;
 import org.mockito.Mockito;
 import org.slf4j.Logger;
@@ -52,8 +51,6 @@ import com.ning.billing.invoice.api.Invoice;
 import com.ning.billing.invoice.api.InvoiceApiException;
 import com.ning.billing.invoice.api.InvoiceItem;
 import com.ning.billing.invoice.api.InvoicePayment.InvoicePaymentType;
-import com.ning.billing.invoice.model.CreditBalanceAdjInvoiceItem;
-import com.ning.billing.invoice.model.DefaultInvoice;
 import com.ning.billing.invoice.model.DefaultInvoicePayment;
 import com.ning.billing.invoice.model.FixedPriceInvoiceItem;
 import com.ning.billing.invoice.model.RecurringInvoiceItem;
@@ -65,7 +62,6 @@ import com.ning.billing.util.svcapi.junction.BillingEventSet;
 import com.ning.billing.util.svcapi.junction.BillingModeType;
 
 import static com.ning.billing.invoice.TestInvoiceHelper.EIGHT;
-import static com.ning.billing.invoice.TestInvoiceHelper.ELEVEN;
 import static com.ning.billing.invoice.TestInvoiceHelper.FIFTEEN;
 import static com.ning.billing.invoice.TestInvoiceHelper.FIVE;
 import static com.ning.billing.invoice.TestInvoiceHelper.FORTY;
@@ -83,7 +79,6 @@ import static com.ning.billing.invoice.TestInvoiceHelper.TWELVE;
 import static com.ning.billing.invoice.TestInvoiceHelper.TWENTY;
 import static com.ning.billing.invoice.TestInvoiceHelper.TWENTY_FIVE;
 import static com.ning.billing.invoice.TestInvoiceHelper.TWENTY_FOUR;
-import static com.ning.billing.invoice.TestInvoiceHelper.TWENTY_SEVEN;
 import static com.ning.billing.invoice.TestInvoiceHelper.TWO;
 import static com.ning.billing.invoice.TestInvoiceHelper.ZERO;
 import static org.testng.Assert.assertEquals;
diff --git a/invoice/src/test/java/com/ning/billing/invoice/generator/TestDefaultInvoiceGeneratorUnit.java b/invoice/src/test/java/com/ning/billing/invoice/generator/TestDefaultInvoiceGeneratorUnit.java
index 08c4b86..c726f0e 100644
--- a/invoice/src/test/java/com/ning/billing/invoice/generator/TestDefaultInvoiceGeneratorUnit.java
+++ b/invoice/src/test/java/com/ning/billing/invoice/generator/TestDefaultInvoiceGeneratorUnit.java
@@ -260,52 +260,4 @@ public class TestDefaultInvoiceGeneratorUnit extends InvoiceTestSuiteNoDB {
 
     }
 
-    @Test(groups = "fast")
-    public void testGenerateCreditsForPastRepairedInvoices() {
-        final LocalDate startDate = clock.getUTCToday();
-        final LocalDate endDate = startDate.plusDays(30);
-        final LocalDate nextEndDate = startDate.plusMonths(1);
-
-        final BigDecimal rate1 = new BigDecimal("10.00");
-        final BigDecimal amount1 = rate1;
-
-        final List<InvoiceItem> existing = new LinkedList<InvoiceItem>();
-        final InvoiceItem item1 = new RecurringInvoiceItem(invoiceId, accountId, bundleId, subscriptionId, planName, phaseName, startDate, endDate, amount1, rate1, currency);
-        existing.add(item1);
-
-        final UUID existingInvoiceId = UUID.randomUUID();
-        final List<Invoice> existingInvoices = new LinkedList<Invoice>();
-        final Invoice existingInvoice = mock(Invoice.class);
-        when(existingInvoice.getId()).thenReturn(existingInvoiceId);
-        when(existingInvoice.getBalance()).thenReturn(BigDecimal.ZERO);
-        when(existingInvoice.getInvoiceItems()).thenReturn(existing);
-
-        final BigDecimal rate2 = new BigDecimal("20.0");
-        final BigDecimal amount2 = rate2;
-
-        final List<InvoiceItem> proposed = new LinkedList<InvoiceItem>();
-        final InvoiceItem reversedItem1 = new RepairAdjInvoiceItem(existingInvoiceId, accountId, startDate, nextEndDate, item1.getAmount().negate(), currency, item1.getId());
-        final InvoiceItem newItem1 = new RecurringInvoiceItem(invoiceId, accountId, bundleId, subscriptionId, planName, phaseName, startDate, endDate, amount2, rate2, currency);
-        proposed.add(reversedItem1);
-        proposed.add(newItem1);
-
-        ((DefaultInvoiceGenerator) generator).generateCBAForExistingInvoices(accountId, existingInvoices, proposed, currency);
-
-        assertEquals(proposed.size(), 3);
-        final InvoiceItem reversedItemCheck1 = proposed.get(0);
-        assertEquals(reversedItemCheck1.getInvoiceId(), existingInvoiceId);
-        assertEquals(reversedItemCheck1.getInvoiceItemType(), InvoiceItemType.REPAIR_ADJ);
-        assertEquals(reversedItemCheck1.getAmount(), item1.getAmount().negate());
-        assertEquals(reversedItemCheck1.getLinkedItemId(), item1.getId());
-
-        final InvoiceItem newItemCheck1 = proposed.get(1);
-        assertEquals(newItemCheck1.getInvoiceId(), invoiceId);
-        assertEquals(newItemCheck1.getInvoiceItemType(), InvoiceItemType.RECURRING);
-        assertEquals(newItemCheck1.getAmount(), amount2);
-
-        final InvoiceItem creditItemCheck = proposed.get(2);
-        assertEquals(creditItemCheck.getInvoiceId(), existingInvoiceId);
-        assertEquals(creditItemCheck.getInvoiceItemType(), InvoiceItemType.CBA_ADJ);
-        assertEquals(creditItemCheck.getAmount(), amount2.add(rate1.negate()));
-    }
 }