details: https://code.openbravo.com/erp/devel/pi/rev/6700912c8eec changeset: 32571:6700912c8eec user: Mark <markmm82 <at> gmail.com> date: Thu Aug 17 11:57:01 2017 -0400 summary: Fixes issue 36663: TaxesTest junit test does 2.400 junit skip all the time
Refactorized TaxesTest junit test to only run the needed 800 tests and avoid the 2400 skip. To do that, were grouped methods with same logic and possible combinations into an unique Test Case to run it once. details: https://code.openbravo.com/erp/devel/pi/rev/0e986cedf7be changeset: 32572:0e986cedf7be user: Alvaro Ferraz <alvaro.ferraz <at> openbravo.com> date: Fri Aug 18 09:37:27 2017 +0200 summary: Related to issue 36663: Code review improvements Use OBDal.getInstance().getProxy() instead of OBDal.getInstance().get() to avoid initializing the object with a database read when not required. diffstat: src-test/src/org/openbravo/test/taxes/TaxesTest.java | 176 ++---------------- 1 files changed, 26 insertions(+), 150 deletions(-) diffs (262 lines): diff -r eedde20727c8 -r 0e986cedf7be src-test/src/org/openbravo/test/taxes/TaxesTest.java --- a/src-test/src/org/openbravo/test/taxes/TaxesTest.java Thu Aug 17 10:35:39 2017 -0400 +++ b/src-test/src/org/openbravo/test/taxes/TaxesTest.java Fri Aug 18 09:37:27 2017 +0200 @@ -23,8 +23,6 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; -import static org.junit.Assume.assumeFalse; -import static org.junit.Assume.assumeTrue; import java.math.BigDecimal; import java.util.ArrayList; @@ -326,114 +324,22 @@ } @Test - public void test_PurchaseOrderTaxes_PriceIncludingTaxes_DocumentLevelTaxes() { - assumeTrue(this.isPriceIncludingTaxes); - assumeTrue(this.isTaxDocumentLevel); + public void testPurchaseOrderTaxes() { testOrderTaxes(false); } @Test - public void test_SalesOrderTaxes_PriceIncludingTaxes_DocumentLevelTaxes() { - assumeTrue(this.isPriceIncludingTaxes); - assumeTrue(this.isTaxDocumentLevel); + public void testSalesOrderTaxes() { testOrderTaxes(true); } @Test - public void test_PurchaseOrderTaxes_PriceExcludingTaxes_DocumentLevelTaxes() { - assumeFalse(this.isPriceIncludingTaxes); - assumeTrue(this.isTaxDocumentLevel); - testOrderTaxes(false); - } - - @Test - public void test_SalesOrderTaxes_PriceExcludingTaxes_DocumentLevelTaxes() { - assumeFalse(this.isPriceIncludingTaxes); - assumeTrue(this.isTaxDocumentLevel); - testOrderTaxes(true); - } - - @Test - public void test_PurchaseOrderTaxes_PriceIncludingTaxes_LineLevelTaxes() { - assumeTrue(this.isPriceIncludingTaxes); - assumeFalse(this.isTaxDocumentLevel); - testOrderTaxes(false); - } - - @Test - public void test_SalesOrderTaxes_PriceIncludingTaxes_LineLevelTaxes() { - assumeTrue(this.isPriceIncludingTaxes); - assumeFalse(this.isTaxDocumentLevel); - testOrderTaxes(true); - } - - @Test - public void test_PurchaseOrderTaxes_PriceExcludingTaxes_LineLevelTaxes() { - assumeFalse(this.isPriceIncludingTaxes); - assumeFalse(this.isTaxDocumentLevel); - testOrderTaxes(false); - } - - @Test - public void test_SalesOrderTaxes_PriceExcludingTaxes_LineLevelTaxes() { - assumeFalse(this.isPriceIncludingTaxes); - assumeFalse(this.isTaxDocumentLevel); - testOrderTaxes(true); - } - - @Test - public void test_PurchaseInvoiceTaxes_PriceIncludingTaxes_DocumentLevelTaxes() { - assumeTrue(this.isPriceIncludingTaxes); - assumeTrue(this.isTaxDocumentLevel); + public void testPurchaseInvoiceTaxes() { testInvoiceTaxes(false); } @Test - public void test_SalesInvoiceTaxes_PriceIncludingTaxes_DocumentLevelTaxes() { - assumeTrue(this.isPriceIncludingTaxes); - assumeTrue(this.isTaxDocumentLevel); - testInvoiceTaxes(true); - } - - @Test - public void test_PurchaseInvoiceTaxes_PriceExcludingTaxes_DocumentLevelTaxes() { - assumeFalse(this.isPriceIncludingTaxes); - assumeTrue(this.isTaxDocumentLevel); - testInvoiceTaxes(false); - } - - @Test - public void test_SalesInvoiceTaxes_PriceExcludingTaxes_DocumentLevelTaxes() { - assumeFalse(this.isPriceIncludingTaxes); - assumeTrue(this.isTaxDocumentLevel); - testInvoiceTaxes(true); - } - - @Test - public void test_PurchaseInvoiceTaxes_PriceIncludingTaxes_LineLevelTaxes() { - assumeTrue(this.isPriceIncludingTaxes); - assumeFalse(this.isTaxDocumentLevel); - testInvoiceTaxes(false); - } - - @Test - public void test_SalesInvoiceTaxes_PriceIncludingTaxes_LineLevelTaxes() { - assumeTrue(this.isPriceIncludingTaxes); - assumeFalse(this.isTaxDocumentLevel); - testInvoiceTaxes(true); - } - - @Test - public void test_PurchaseInvoiceTaxes_PriceExcludingTaxes_LineLevelTaxes() { - assumeFalse(this.isPriceIncludingTaxes); - assumeFalse(this.isTaxDocumentLevel); - testInvoiceTaxes(false); - } - - @Test - public void test_SalesInvoiceTaxes_PriceExcludingTaxes_LineLevelTaxes() { - assumeFalse(this.isPriceIncludingTaxes); - assumeFalse(this.isTaxDocumentLevel); + public void testSalesInvoiceTaxes() { testInvoiceTaxes(true); } @@ -514,37 +420,21 @@ } private Order createOrder(boolean isSales) { - Order order; - if (isSales) { - order = OBDal.getInstance().get(Order.class, SALESORDER_ID); - } else { - order = OBDal.getInstance().get(Order.class, PURCHASEORDER_ID); - } + Order order = OBDal.getInstance().get(Order.class, isSales ? SALESORDER_ID : PURCHASEORDER_ID); Order testOrder = (Order) DalUtil.copy(order, false); String documentNo = isPriceIncludingTaxes ? "PriceIncludingTaxes" : "PriceExcludingTaxes"; testOrder.setDocumentNo(documentNo + " " + testNumber); - testOrder.setBusinessPartner(OBDal.getInstance().get(BusinessPartner.class, + testOrder.setBusinessPartner(OBDal.getInstance().getProxy(BusinessPartner.class, isSales ? BPartnerDataConstants.CUSTOMER_A : BPartnerDataConstants.VENDOR_A)); testOrder.setSummedLineAmount(BigDecimal.ZERO); testOrder.setGrandTotalAmount(BigDecimal.ZERO); testOrder.setPriceIncludesTax(isPriceIncludingTaxes); - if (isPriceIncludingTaxes) { - if (isSales) { - testOrder.setPriceList(OBDal.getInstance().get(PriceList.class, - PRICEINCLUDINGTAXES_PRICELIST_SALES)); - } else { - testOrder.setPriceList(OBDal.getInstance().get(PriceList.class, - PRICEINCLUDINGTAXES_PRICELIST_PURCHASE)); - } - } else { - if (isSales) { - testOrder.setPriceList(OBDal.getInstance().get(PriceList.class, - PRICEEXCLUDINGTAXES_PRICELIST_SALES)); - } else { - testOrder.setPriceList(OBDal.getInstance().get(PriceList.class, - PRICEEXCLUDINGTAXES_PRICELIST_PURCHASE)); - } - } + testOrder.setPriceList(OBDal.getInstance().getProxy( + PriceList.class, + isPriceIncludingTaxes ? isSales ? PRICEINCLUDINGTAXES_PRICELIST_SALES + : PRICEINCLUDINGTAXES_PRICELIST_PURCHASE + : isSales ? PRICEEXCLUDINGTAXES_PRICELIST_SALES + : PRICEEXCLUDINGTAXES_PRICELIST_PURCHASE)); OBDal.getInstance().save(testOrder); OrderLine orderLine = order.getOrderLineList().get(0); @@ -555,7 +445,7 @@ if (product.getPricingDiscountList().isEmpty()) { OrderLine testOrderLine = (OrderLine) DalUtil.copy(orderLine, false); testOrderLine.setLineNo((i + 1) * 10L); - testOrderLine.setBusinessPartner(OBDal.getInstance().get(BusinessPartner.class, + testOrderLine.setBusinessPartner(OBDal.getInstance().getProxy(BusinessPartner.class, isSales ? BPartnerDataConstants.CUSTOMER_A : BPartnerDataConstants.VENDOR_A)); testOrderLine.setProduct(product); testOrderLine.setUOM(product.getUOM()); @@ -570,7 +460,7 @@ testOrderLine.setListPrice(linesData[i].getPrice()); testOrderLine.setStandardPrice(linesData[i].getPrice()); } - testOrderLine.setTax(OBDal.getInstance().get(TaxRate.class, linesData[i].getTaxid())); + testOrderLine.setTax(OBDal.getInstance().getProxy(TaxRate.class, linesData[i].getTaxid())); testOrderLine.setLineGrossAmount(linesData[i].getQuantity().multiply( linesData[i].getPrice())); testOrderLine @@ -607,38 +497,23 @@ } private Invoice createInvoice(boolean isSales) { - Invoice invoice; - if (isSales) { - invoice = OBDal.getInstance().get(Invoice.class, SALESINVOICE_ID); - } else { - invoice = OBDal.getInstance().get(Invoice.class, PURCHASEINVOICE_ID); - } + Invoice invoice = OBDal.getInstance().get(Invoice.class, + isSales ? SALESINVOICE_ID : PURCHASEINVOICE_ID); Invoice testInvoice = (Invoice) DalUtil.copy(invoice, false); String documentNo = isPriceIncludingTaxes ? "PriceIncludingTaxes" : "PriceExcludingTaxes"; testInvoice.setDocumentNo(documentNo + " " + testNumber); testInvoice.setDescription(testDescription); - testInvoice.setBusinessPartner(OBDal.getInstance().get(BusinessPartner.class, + testInvoice.setBusinessPartner(OBDal.getInstance().getProxy(BusinessPartner.class, isSales ? BPartnerDataConstants.CUSTOMER_A : BPartnerDataConstants.VENDOR_A)); testInvoice.setSummedLineAmount(BigDecimal.ZERO); testInvoice.setGrandTotalAmount(BigDecimal.ZERO); testInvoice.setPriceIncludesTax(isPriceIncludingTaxes); - if (isPriceIncludingTaxes) { - if (isSales) { - testInvoice.setPriceList(OBDal.getInstance().get(PriceList.class, - PRICEINCLUDINGTAXES_PRICELIST_SALES)); - } else { - testInvoice.setPriceList(OBDal.getInstance().get(PriceList.class, - PRICEINCLUDINGTAXES_PRICELIST_PURCHASE)); - } - } else { - if (isSales) { - testInvoice.setPriceList(OBDal.getInstance().get(PriceList.class, - PRICEEXCLUDINGTAXES_PRICELIST_SALES)); - } else { - testInvoice.setPriceList(OBDal.getInstance().get(PriceList.class, - PRICEEXCLUDINGTAXES_PRICELIST_PURCHASE)); - } - } + testInvoice.setPriceList(OBDal.getInstance().getProxy( + PriceList.class, + isPriceIncludingTaxes ? isSales ? PRICEINCLUDINGTAXES_PRICELIST_SALES + : PRICEINCLUDINGTAXES_PRICELIST_PURCHASE + : isSales ? PRICEEXCLUDINGTAXES_PRICELIST_SALES + : PRICEEXCLUDINGTAXES_PRICELIST_PURCHASE)); OBDal.getInstance().save(testInvoice); InvoiceLine invoiceLine = invoice.getInvoiceLineList().get(0); @@ -649,7 +524,7 @@ if (product.getPricingDiscountList().isEmpty()) { InvoiceLine testInvoiceLine = (InvoiceLine) DalUtil.copy(invoiceLine, false); testInvoiceLine.setLineNo((i + 1) * 10L); - testInvoiceLine.setBusinessPartner(OBDal.getInstance().get(BusinessPartner.class, + testInvoiceLine.setBusinessPartner(OBDal.getInstance().getProxy(BusinessPartner.class, isSales ? BPartnerDataConstants.CUSTOMER_A : BPartnerDataConstants.VENDOR_A)); testInvoiceLine.setProduct(product); testInvoiceLine.setUOM(product.getUOM()); @@ -663,7 +538,8 @@ testInvoiceLine.setListPrice(linesData[i].getPrice()); testInvoiceLine.setStandardPrice(linesData[i].getPrice()); } - testInvoiceLine.setTax(OBDal.getInstance().get(TaxRate.class, linesData[i].getTaxid())); + testInvoiceLine + .setTax(OBDal.getInstance().getProxy(TaxRate.class, linesData[i].getTaxid())); testInvoiceLine .setGrossAmount(linesData[i].getQuantity().multiply(linesData[i].getPrice())); testInvoiceLine.setLineNetAmount(linesData[i].getQuantity().multiply( ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
