[DE-674] Improve test after adding invoice discount fields

maxio-com · Feb 23, 2024 · 2b8f956 · 2b8f956
1 parent bcc067e
commit 2b8f956
Showing 1 changed file with 13 additions and 5 deletions.
diff --git a/...lers/proformainvoices/ProformaInvoicesControllerListSubscriptionProformaInvoicesTest.java b/...lers/proformainvoices/ProformaInvoicesControllerListSubscriptionProformaInvoicesTest.java
@@ -17,6 +17,7 @@
 import com.maxio.advancedbilling.models.Direction;
 import com.maxio.advancedbilling.models.IncludeOption;
 import com.maxio.advancedbilling.models.InvoiceCustomField;
+import com.maxio.advancedbilling.models.InvoiceDiscountBreakout;
 import com.maxio.advancedbilling.models.InvoiceStatus;
 import com.maxio.advancedbilling.models.IssueServiceCredit;
 import com.maxio.advancedbilling.models.IssueServiceCreditRequest;
@@ -28,7 +29,6 @@
 import com.maxio.advancedbilling.models.ProductFamily;
 import com.maxio.advancedbilling.models.ProformaInvoice;
 import com.maxio.advancedbilling.models.ProformaInvoiceDiscount;
-import com.maxio.advancedbilling.models.ProformaInvoiceDiscountBreakout;
 import com.maxio.advancedbilling.models.ResourceType;
 import com.maxio.advancedbilling.models.Subscription;
 import com.maxio.advancedbilling.models.VoidInvoice;
@@ -39,6 +39,7 @@
 import com.maxio.advancedbilling.utils.TestSetup;
 import com.maxio.advancedbilling.utils.TestTeardown;
 import com.maxio.advancedbilling.utils.assertions.CommonAssertions;
+import org.assertj.core.api.recursive.comparison.RecursiveComparisonConfiguration;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
@@ -164,25 +165,32 @@ public void shouldListProformaInvoices() throws IOException, ApiException {
         // discounts
         ProformaInvoiceDiscount.Builder discountBuilder = new ProformaInvoiceDiscount.Builder()
                 .title("Coupon: %s - %s".formatted(coupon.getCode(), coupon.getDescription()))
+                .code(coupon.getCode())
                 .discountAmount("12.5")
                 .discountType("flat_amount")
                 .eligibleAmount("500.0")
                 .sourceType("Coupon");
         assertThat(expectedInvoices).extracting(p -> p.getDiscounts().get(0))
-                .usingRecursiveFieldByFieldElementComparator()
+                .usingRecursiveFieldByFieldElementComparator(RecursiveComparisonConfiguration.builder()
+                        .withIgnoredFields("uid")
+                        // also ignore uid nested in InvoiceDiscountBreakouts list
+                        .withComparatorForType(((o1, o2) -> o1.getDiscountAmount().equals(o2.getDiscountAmount()) &&
+                                        o1.getEligibleAmount().equals(o2.getEligibleAmount()) ? 0 : -1),
+                                 InvoiceDiscountBreakout.class)
+                        .build())
                 .containsOnly(
                         discountBuilder
                                 .lineItemBreakouts(List.of(
-                                        new ProformaInvoiceDiscountBreakout("500.0", "12.5")
+                                        new InvoiceDiscountBreakout(null, "500.0", "12.5")
                                 ))
                                 .build(),
                         discountBuilder
                                 .title(coupon.getDescription())
                                 .eligibleAmount("770.0")
                                 .discountAmount("25.0")
                                 .lineItemBreakouts(List.of(
-                                        new ProformaInvoiceDiscountBreakout("20.0", "12.5"),
-                                        new ProformaInvoiceDiscountBreakout("500.0", "12.5")
+                                        new InvoiceDiscountBreakout(null, "20.0", "12.5"),
+                                        new InvoiceDiscountBreakout(null, "500.0", "12.5")
                                 ))
                                 .build()
                 );